Fix the "sdevtest" testrunner.tcl command so that it correctly enables asan on windows.

FossilOrigin-Name: 6463192369ff22eb15d4e34590ef55cd8a6f2501227835664816277806bf961b

Makefile.in

@@ -414,7 +414,6 @@ TESTSRC = \
   $(TOP)/ext/fts3/fts3_term.c \
   $(TOP)/ext/fts3/fts3_test.c  \
   $(TOP)/ext/session/test_session.c \
-  $(TOP)/ext/session/sqlite3changebatch.c \
   $(TOP)/ext/recover/sqlite3recover.c \
   $(TOP)/ext/recover/dbdata.c \
   $(TOP)/ext/recover/test_recover.c \
@@ -511,9 +510,8 @@ TESTSRC2 = \
   $(TOP)/ext/fts3/fts3_tokenizer.c \
   $(TOP)/ext/fts3/fts3_write.c \
   $(TOP)/ext/async/sqlite3async.c \
-  $(TOP)/ext/misc/stmt.c \
   $(TOP)/ext/session/sqlite3session.c \
-  $(TOP)/ext/session/test_session.c \
+  $(TOP)/ext/misc/stmt.c \
   fts5.c
 
 # Header files used by all library source files.
@@ -1293,11 +1291,17 @@ fulltestonly:	$(TESTPROGS) fuzztest
 	./testfixture$(TEXE) $(TOP)/test/full.test
 
 # Fuzz testing
-fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+#
+# WARNING: When the "fuzztest" target is run by the testrunner.tcl script,
+# it does not actually run this code. Instead, it schedules equivalent 
+# commands. Therefore, if this target is updated, then code in
+# testrunner_data.tcl (search for "trd_fuzztest_data") must also be updated.
+#
+fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE)
 	./fuzzcheck$(TEXE) $(FUZZDATA)
 	./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
 
-valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE)
 	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M $(FUZZDATA)
 	valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
 
@@ -1314,23 +1318,17 @@ testrunner:	testfixture$(TEXE)
 
 # Runs both fuzztest and testrunner, consecutively.
 #
-devtest:	srctree-check testfixture$(TEXE) fuzztest testrunner
+devtest:	testfixture$(TEXE) fuzztest testrunner
 
-mdevtest: srctree-check
+mdevtest:
 	$(TCLSH_CMD) $(TOP)/test/testrunner.tcl mdevtest
 
 sdevtest:
 	$(TCLSH_CMD) $(TOP)/test/testrunner.tcl sdevtest
 
-# Validate that various generated files in the source tree
-# are up-to-date.
-#
-srctree-check:	$(TOP)/tool/srctree-check.tcl
-	$(TCLSH_CMD) $(TOP)/tool/srctree-check.tcl
-
 # Testing for a release
 #
-releasetest: srctree-check testfixture$(TEXE)
+releasetest: testfixture$(TEXE)
 	./testfixture$(TEXE) $(TOP)/test/testrunner.tcl release
 
 # Minimal testing that runs in less than 3 minutes
@@ -1341,7 +1339,7 @@ quicktest:	./testfixture$(TEXE)
 # This is the common case.  Run many tests that do not take too long,
 # including fuzzcheck, sqlite3_analyzer, and sqldiff tests.
 #
-test:	srctree-check fuzztest sourcetest $(TESTPROGS) tcltest
+test:	fuzztest sourcetest $(TESTPROGS) tcltest
 
 # Run a test using valgrind.  This can take a really long time
 # because valgrind is so much slower than a native machine.

Makefile.msc

@@ -1553,8 +1553,7 @@ TESTSRC = \
   $(TOP)\ext\fts3\fts3_term.c \
   $(TOP)\ext\fts3\fts3_test.c \
   $(TOP)\ext\rbu\test_rbu.c \
-  $(TOP)\ext\session\test_session.c \
-  $(TOP)\ext\session\sqlite3changebatch.c 
+  $(TOP)\ext\session\test_session.c
 
 # Statically linked extensions.
 #

VERSION

@@ -1 +1 @@
-3.43.2
+3.43.0

autoconf/tea/configure.ac

@@ -19,7 +19,7 @@ dnl	to configure the system for the local environment.
 # so that we create the export library with the dll.
 #-----------------------------------------------------------------------
 
-AC_INIT([sqlite],[3.43.2])
+AC_INIT([sqlite],[3.43.0])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.43.2.
+# Generated by GNU Autoconf 2.69 for sqlite 3.43.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.43.2'
-PACKAGE_STRING='sqlite 3.43.2'
+PACKAGE_VERSION='3.43.0'
+PACKAGE_STRING='sqlite 3.43.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1470,7 +1470,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sqlite 3.43.2 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.43.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1535,7 +1535,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sqlite 3.43.2:";;
+     short | recursive ) echo "Configuration of sqlite 3.43.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1665,7 +1665,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sqlite configure 3.43.2
+sqlite configure 3.43.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2084,7 +2084,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sqlite $as_me 3.43.2, which was
+It was created by sqlite $as_me 3.43.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -12457,7 +12457,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sqlite $as_me 3.43.2, which was
+This file was extended by sqlite $as_me 3.43.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12523,7 +12523,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sqlite config.status 3.43.2
+sqlite config.status 3.43.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

doc/begin_concurrent.md

@@ -1,106 +0,0 @@
-
-Begin Concurrent
-================
-
-## Overview
-
-Usually, SQLite allows at most one writer to proceed concurrently. The
-BEGIN CONCURRENT enhancement allows multiple writers to process write
-transactions simultanously if the database is in "wal" or "wal2" mode,
-although the system still serializes COMMIT commands.
-
-When a write-transaction is opened with "BEGIN CONCURRENT", actually 
-locking the database is deferred until a COMMIT is executed. This means
-that any number of transactions started with BEGIN CONCURRENT may proceed
-concurrently. The system uses optimistic page-level-locking to prevent
-conflicting concurrent transactions from being committed.
-
-When a BEGIN CONCURRENT transaction is committed, the system checks whether 
-or not any of the database pages that the transaction has read have been
-modified since the BEGIN CONCURRENT was opened. In other words - it asks 
-if the transaction being committed operates on a different set of data than
-all other concurrently executing transactions. If the answer is "yes, this
-transaction did not read or modify any data modified by any concurrent
-transaction", then the transaction is committed as normal. Otherwise, if the
-transaction does conflict, it cannot be committed and an SQLITE_BUSY_SNAPSHOT
-error is returned. At this point, all the client can do is ROLLBACK the
-transaction.
-
-If SQLITE_BUSY_SNAPSHOT is returned, messages are output via the sqlite3_log
-mechanism indicating the page and table or index on which the conflict
-occurred. This can be useful when optimizing concurrency.
-
-## Application Programming Notes
-
-In order to serialize COMMIT processing, SQLite takes a lock on the database
-as part of each COMMIT command and releases it before returning. At most one
-writer may hold this lock at any one time. If a writer cannot obtain the lock,
-it uses SQLite's busy-handler to pause and retry for a while:
-
-  <a href=https://www.sqlite.org/c3ref/busy_handler.html>
-      https://www.sqlite.org/c3ref/busy_handler.html
-  </a>
-
-If there is significant contention for the writer lock, this mechanism can be
-inefficient. In this case it is better for the application to use a mutex or
-some other mechanism that supports blocking to ensure that at most one writer
-is attempting to COMMIT a BEGIN CONCURRENT transaction at a time. This is
-usually easier if all writers are part of the same operating system process.
-
-If all database clients (readers and writers) are located in the same OS
-process, and if that OS is a Unix variant, then it can be more efficient to
-the built-in VFS "unix-excl" instead of the default "unix". This is because it
-uses more efficient locking primitives.
-
-The key to maximizing concurrency using BEGIN CONCURRENT is to ensure that
-there are a large number of non-conflicting transactions. In SQLite, each
-table and each index is stored as a separate b-tree, each of which is
-distributed over a discrete set of database pages. This means that:
-
-  * Two transactions that write to different sets of tables never 
-    conflict, and that
-
-  * Two transactions that write to the same tables or indexes only 
-    conflict if the values of the keys (either primary keys or indexed 
-    rows) are fairly close together. For example, given a large 
-    table with the schema:
-
-      <pre>     CREATE TABLE t1(a INTEGER PRIMARY KEY, b BLOB);</pre>
-
-    writing two rows with adjacent values for "a" probably will cause a
-    conflict (as the two keys are stored on the same page), but writing two
-    rows with vastly different values for "a" will not (as the keys will likly
-    be stored on different pages).
-
-Note that, in SQLite, if values are not explicitly supplied for an INTEGER
-PRIMARY KEY, as for example in:
-
->
-     INSERT INTO t1(b) VALUES(<blob-value>);
-
-then monotonically increasing values are assigned automatically. This is
-terrible for concurrency, as it all but ensures that all new rows are 
-added to the same database page. In such situations, it is better to
-explicitly assign random values to INTEGER PRIMARY KEY fields.
-
-This problem also comes up for non-WITHOUT ROWID tables that do not have an
-explicit INTEGER PRIMARY KEY column. In these cases each table has an implicit
-INTEGER PRIMARY KEY column that is assigned increasing values, leading to the
-same problem as omitting to assign a value to an explicit INTEGER PRIMARY KEY
-column.
-
-For both explicit and implicit INTEGER PRIMARY KEYs, it is possible to have
-SQLite assign values at random (instead of the monotonically increasing
-values) by writing a row with a rowid equal to the largest possible signed
-64-bit integer to the table. For example:
-
-     INSERT INTO t1(a) VALUES(9223372036854775807);
-
-Applications should take care not to malfunction due to the presence of such
-rows.
-
-The nature of some types of indexes, for example indexes on timestamp fields,
-can also cause problems (as concurrent transactions may assign similar
-timestamps that will be stored on the same db page to new records). In these
-cases the database schema may need to be rethought to increase the concurrency
-provided by page-level-locking.

doc/testrunner.md

@@ -0,0 +1,284 @@
+
+
+# The testrunner.tcl Script
+
+# 1. Overview
+
+testrunner.tcl is a Tcl script used to run multiple SQLite tests using 
+multiple jobs. It supports the following types of tests:
+
+  *  Tcl test scripts.
+
+  *  Tests run with [make] commands. Specifically, at time of writing, 
+     [make fuzztest], [make mptest], [make sourcetest] and [make threadtest].
+
+testrunner.tcl pipes the output of all tests and builds run into log file
+**testrunner.log**, created in the cwd directory. Searching this file for
+"failed" is a good way to find the output of a failed test.
+
+testrunner.tcl also populates SQLite database **testrunner.db**. This database
+contains details of all tests run, running and to be run. A useful query
+might be:
+
+```
+  SELECT * FROM script WHERE state='failed'
+```
+
+Running the command:
+
+```
+  ./testfixture $(TESTDIR)/testrunner.tcl status
+```
+
+in the directory containing the testrunner.db database runs various queries
+to produce a succinct report on the state of a running testrunner.tcl script.
+Running:
+
+```
+  watch ./testfixture $(TESTDIR)/testrunner.tcl status
+```
+
+in another terminal is a good way to keep an eye on a long running test.
+
+Sometimes testrunner.tcl uses the [testfixture] binary that it is run with
+to run tests (see "Binary Tests" below). Sometimes it builds testfixture and
+other binaries in specific configurations to test (see "Source Tests").
+
+# 2. Binary Tests
+
+The commands described in this section all run various combinations of the Tcl
+test scripts using the [testfixture] binary used to run the testrunner.tcl
+script (i.e. they do not invoke the compiler to build new binaries, or the
+[make] command to run tests that are not Tcl scripts). The procedure to run
+these tests is therefore:
+
+  1. Build the "testfixture" (or "testfixture.exe" for windows) binary using
+     whatever method seems convenient.
+
+  2. Test the binary built in step 1 by running testrunner.tcl with it, 
+     perhaps with various options.
+
+The following sub-sections describe the various options that can be
+passed to testrunner.tcl to test binary testfixture builds.
+
+## 2.1. Organization of Tcl Tests
+
+Tcl tests are stored in files that match the pattern *\*.test*. They are
+found in both the $TOP/test/ directory, and in the various sub-directories
+of the $TOP/ext/ directory of the source tree. Not all *\*.test* files
+contain Tcl tests - a handful are Tcl scripts designed to invoke other
+*\*.test* files.
+
+The **veryquick** set of tests is a subset of all Tcl test scripts in the
+source tree. In includes most tests, but excludes some that are very slow.
+Almost all fault-injection tests (those that test the response of the library
+to OOM or IO errors) are excluded. It is defined in source file 
+*test/permutations.test*.
+
+The **full** set of tests includes all Tcl test scripts in the source tree.
+To run a "full" test is to run all Tcl test scripts that can be found in the
+source tree.
+
+File *permutations.test* defines various test "permutations". A permutation
+consists of:
+
+  *  A subset of Tcl test scripts, and 
+
+  *  Runtime configuration to apply before running each test script 
+     (e.g. enabling auto-vacuum, or disable lookaside).
+
+Running **all** tests is to run all tests in the full test set, plus a dozen
+or so permutations. The specific permutations that are run as part of "all"
+are defined in file *testrunner_data.tcl*.
+
+## 2.2. Commands to Run Tests
+
+To run the "veryquick" test set, use either of the following:
+
+```
+  ./testfixture $TESTDIR/testrunner.tcl
+  ./testfixture $TESTDIR/testrunner.tcl veryquick
+```
+
+To run the "full" test suite:
+
+```
+  ./testfixture $TESTDIR/testrunner.tcl full
+```
+
+To run the subset of the "full" test suite for which the test file name matches
+a specified pattern (e.g. all tests that start with "fts5"), either of:
+
+```
+  ./testfixture $TESTDIR/testrunner.tcl fts5%
+  ./testfixture $TESTDIR/testrunner.tcl 'fts5*'
+```
+
+To run "all" tests (full + permutations):
+
+```
+  ./testfixture $TESTDIR/testrunner.tcl all
+```
+
+<a name=binary_test_failures></a>
+## 2.3. Investigating Binary Test Failures
+
+If a test fails, testrunner.tcl reports name of the Tcl test script and, if
+applicable, the name of the permutation, to stdout. This information can also
+be retrieved from either *testrunner.log* or *testrunner.db*.
+
+If there is no permutation, the individual test script may be run with:
+
+```
+  ./testfixture $PATH_TO_SCRIPT
+```
+
+Or, if the failure occured as part of a permutation:
+
+```
+  ./testfixture $TESTDIR/testrunner.tcl $PERMUTATION $PATH_TO_SCRIPT
+```
+
+TODO: An example instead of "$PERMUTATION" and $PATH\_TO\_SCRIPT?
+
+# 3. Source Code Tests
+
+The commands described in this section invoke the C compiler to build 
+binaries from the source tree, then use those binaries to run Tcl and
+other tests. The advantages of this are that:
+
+  *  it is possible to test multiple build configurations with a single
+     command, and 
+
+  *  it ensures that tests are always run using binaries created with the
+     same set of compiler options.
+
+The testrunner.tcl commands described in this section may be run using
+either a *testfixture* (or testfixture.exe) build, or with any other Tcl
+shell that supports SQLite 3.31.1 or newer via "package require sqlite3".
+
+TODO: ./configure + Makefile.msc build systems.
+
+## Commands to Run SQLite Tests
+
+The **mdevtest** command is equivalent to running the veryquick tests and
+the [make fuzztest] target once for each of two --enable-all builds - one 
+with debugging enabled and one without:
+
+```
+  tclsh $TESTDIR/testrunner.tcl mdevtest
+```
+
+In other words, it is equivalent to running:
+
+```
+  $TOP/configure --enable-all --enable-debug
+  make fuzztest
+  make testfixture
+  ./testfixture $TOP/test/testrunner.tcl veryquick
+
+  # Then, after removing files created by the tests above:
+  $TOP/configure --enable-all OPTS="-O0"
+  make fuzztest
+  make testfixture
+  ./testfixture $TOP/test/testrunner.tcl veryquick
+```
+
+The **sdevtest** command is identical to the mdevtest command, except that the
+second of the two builds is a sanitizer build. Specifically, this means that
+OPTS="-fsanitize=address,undefined" is specified instead of OPTS="-O0":
+
+```
+  tclsh $TESTDIR/testrunner.tcl sdevtest
+```
+
+The **release** command runs lots of tests under lots of builds. It runs
+different combinations of builds and tests depending on whether it is run
+on Linux, Windows or OSX. Refer to *testrunner\_data.tcl* for the details
+of the specific tests run.
+
+```
+  tclsh $TESTDIR/testrunner.tcl release
+```
+
+## Running ZipVFS Tests
+
+testrunner.tcl can build a zipvfs-enabled testfixture and use it to run
+tests from the Zipvfs project with the following command:
+
+```
+  tclsh $TESTDIR/testrunner.tcl --zipvfs $PATH_TO_ZIPVFS
+```
+
+This can be combined with any of "mdevtest", "sdevtest" or "release" to
+test both SQLite and Zipvfs with a single command:
+
+```
+  tclsh $TESTDIR/testrunner.tcl --zipvfs $PATH_TO_ZIPVFS mdevtest
+```
+
+## Investigating Source Code Test Failures
+
+Investigating a test failure that occurs during source code testing is a
+two step process:
+
+  1. Recreating the build configuration in which the test failed, and
+
+  2. Re-running the actual test.
+
+To recreate a build configuration, use the testrunner.tcl **script** command
+to create a build script. A build script is a bash script on Linux or OSX, or
+a dos \*.bat file on windows. For example:
+
+```
+  # Create a script that recreates build configuration "Device-One" on 
+  # Linux or OSX:
+  tclsh $TESTDIR/testrunner.tcl script Device-One > make.sh 
+
+  # Create a script that recreates build configuration "Have-Not" on Windows:
+  tclsh $TESTDIR/testrunner.tcl script Have-Not > make.bat 
+```
+
+The generated bash or \*.bat file script accepts a single argument - a makefile
+target to build. This may be used either to run a [make] command test directly,
+or else to build a testfixture (or testfixture.exe) binary with which to
+run a Tcl test script, as <a href=#binary_test_failures>described above</a>.
+
+
+
+# 4. Controlling CPU Core Utilization
+
+When running either binary or source code tests, testrunner.tcl reports the
+number of jobs it intends to use to stdout. e.g.
+
+```
+  $ ./testfixture $TESTDIR/testrunner.tcl
+  splitting work across 16 jobs
+  ... more output ...
+```
+
+By default, testfixture.tcl attempts to set the number of jobs to the number 
+of real cores on the machine. This can be overridden using the "--jobs" (or -j)
+switch:
+
+```
+  $ ./testfixture $TESTDIR/testrunner.tcl --jobs 8
+  splitting work across 8 jobs
+  ... more output ...
+```
+
+The number of jobs may also be changed while an instance of testrunner.tcl is
+running by exucuting the following command from the directory containing the
+testrunner.log and testrunner.db files:
+
+```
+  $ ./testfixture $TESTDIR/testrunner.tcl njob $NEW_NUMBER_OF_JOBS
+```
+
+
+
+
+
+
+
+

ext/fts3/fts3_write.c

@@ -5218,7 +5218,7 @@ static u64 fts3ChecksumIndex(
   int rc;
   u64 cksum = 0;
 
-  if( *pRc ) return 0;
+  assert( *pRc==SQLITE_OK );
 
   memset(&filter, 0, sizeof(filter));
   memset(&csr, 0, sizeof(csr));

ext/fts5/fts5_index.c

@@ -5057,6 +5057,7 @@ static void fts5DoSecureDelete(
   int iIdx = 0;
   int iStart = 0;
   int iKeyOff = 0;
+  int iPrevKeyOff = 0;
   int iDelKeyOff = 0;       /* Offset of deleted key, if any */
 
   nIdx = nPg-iPgIdx;
@@ -5197,79 +5198,80 @@ static void fts5DoSecureDelete(
       }
     }
   }else if( iStart==4 ){
-    int iPgno;
+      int iPgno;
 
-    assert_nc( pSeg->iLeafPgno>pSeg->iTermLeafPgno );
-    /* The entry being removed may be the only position list in
-    ** its doclist. */
-    for(iPgno=pSeg->iLeafPgno-1; iPgno>pSeg->iTermLeafPgno; iPgno-- ){
-      Fts5Data *pPg = fts5DataRead(p, FTS5_SEGMENT_ROWID(iSegid, iPgno));
-      int bEmpty = (pPg && pPg->nn==4);
-      fts5DataRelease(pPg);
-      if( bEmpty==0 ) break;
-    }
-
-    if( iPgno==pSeg->iTermLeafPgno ){
-      i64 iId = FTS5_SEGMENT_ROWID(iSegid, pSeg->iTermLeafPgno);
-      Fts5Data *pTerm = fts5DataRead(p, iId);
-      if( pTerm && pTerm->szLeaf==pSeg->iTermLeafOffset ){
-        u8 *aTermIdx = &pTerm->p[pTerm->szLeaf];
-        int nTermIdx = pTerm->nn - pTerm->szLeaf;
-        int iTermIdx = 0;
-        int iTermOff = 0;
-
-        while( 1 ){
-          u32 iVal = 0;
-          int nByte = fts5GetVarint32(&aTermIdx[iTermIdx], iVal);
-          iTermOff += iVal;
-          if( (iTermIdx+nByte)>=nTermIdx ) break;
-          iTermIdx += nByte;
-        }
-        nTermIdx = iTermIdx;
-
-        memmove(&pTerm->p[iTermOff], &pTerm->p[pTerm->szLeaf], nTermIdx);
-        fts5PutU16(&pTerm->p[2], iTermOff);
-
-        fts5DataWrite(p, iId, pTerm->p, iTermOff+nTermIdx);
-        if( nTermIdx==0 ){
-          fts5SecureDeleteIdxEntry(p, iSegid, pSeg->iTermLeafPgno);
-        }
+      assert_nc( pSeg->iLeafPgno>pSeg->iTermLeafPgno );
+      /* The entry being removed may be the only position list in
+      ** its doclist. */
+      for(iPgno=pSeg->iLeafPgno-1; iPgno>pSeg->iTermLeafPgno; iPgno-- ){
+        Fts5Data *pPg = fts5DataRead(p, FTS5_SEGMENT_ROWID(iSegid, iPgno));
+        int bEmpty = (pPg && pPg->nn==4);
+        fts5DataRelease(pPg);
+        if( bEmpty==0 ) break;
       }
-      fts5DataRelease(pTerm);
-    }
-  }
 
-  if( p->rc==SQLITE_OK ){
-    const int nMove = nPg - iNextOff;     /* Number of bytes to move */
-    int nShift = iNextOff - iOff;         /* Distance to move them */
+      if( iPgno==pSeg->iTermLeafPgno ){
+        i64 iId = FTS5_SEGMENT_ROWID(iSegid, pSeg->iTermLeafPgno);
+        Fts5Data *pTerm = fts5DataRead(p, iId);
+        if( pTerm && pTerm->szLeaf==pSeg->iTermLeafOffset ){
+          u8 *aTermIdx = &pTerm->p[pTerm->szLeaf];
+          int nTermIdx = pTerm->nn - pTerm->szLeaf;
+          int iTermIdx = 0;
+          int iTermOff = 0;
 
-    int iPrevKeyOut = 0;
-    int iKeyIn = 0;
+          while( 1 ){
+            u32 iVal = 0;
+            int nByte = fts5GetVarint32(&aTermIdx[iTermIdx], iVal);
+            iTermOff += iVal;
+            if( (iTermIdx+nByte)>=nTermIdx ) break;
+            iTermIdx += nByte;
+          }
+          nTermIdx = iTermIdx;
 
-    memmove(&aPg[iOff], &aPg[iNextOff], nMove);
-    iPgIdx -= nShift;
-    nPg = iPgIdx;
-    fts5PutU16(&aPg[2], iPgIdx);
+          memmove(&pTerm->p[iTermOff], &pTerm->p[pTerm->szLeaf], nTermIdx);
+          fts5PutU16(&pTerm->p[2], iTermOff);
 
-    for(iIdx=0; iIdx<nIdx; /* no-op */){
-      u32 iVal = 0;
-      iIdx += fts5GetVarint32(&aIdx[iIdx], iVal);
-      iKeyIn += iVal;
-      if( iKeyIn!=iDelKeyOff ){
-        int iKeyOut = (iKeyIn - (iKeyIn>iOff ? nShift : 0));
-        nPg += sqlite3Fts5PutVarint(&aPg[nPg], iKeyOut - iPrevKeyOut);
-        iPrevKeyOut = iKeyOut;
+          fts5DataWrite(p, iId, pTerm->p, iTermOff+nTermIdx);
+          if( nTermIdx==0 ){
+            fts5SecureDeleteIdxEntry(p, iSegid, pSeg->iTermLeafPgno);
+          }
+        }
+        fts5DataRelease(pTerm);
       }
     }
 
-    if( iPgIdx==nPg && nIdx>0 && pSeg->iLeafPgno!=1 ){
-      fts5SecureDeleteIdxEntry(p, iSegid, pSeg->iLeafPgno);
-    }
+    if( p->rc==SQLITE_OK ){
+      const int nMove = nPg - iNextOff;
+      int nShift = 0;
 
-    assert_nc( nPg>4 || fts5GetU16(aPg)==0 );
-    fts5DataWrite(p, FTS5_SEGMENT_ROWID(iSegid,pSeg->iLeafPgno), aPg, nPg);
-  }
-  sqlite3_free(aIdx);
+      memmove(&aPg[iOff], &aPg[iNextOff], nMove);
+      iPgIdx -= (iNextOff - iOff);
+      nPg = iPgIdx;
+      fts5PutU16(&aPg[2], iPgIdx);
+
+      nShift = iNextOff - iOff;
+      for(iIdx=0, iKeyOff=0, iPrevKeyOff=0; iIdx<nIdx; /* no-op */){
+        u32 iVal = 0;
+        iIdx += fts5GetVarint32(&aIdx[iIdx], iVal);
+        iKeyOff += iVal;
+        if( iKeyOff!=iDelKeyOff ){
+          if( iKeyOff>iOff ){
+            iKeyOff -= nShift;
+            nShift = 0;
+          }
+          nPg += sqlite3Fts5PutVarint(&aPg[nPg], iKeyOff - iPrevKeyOff);
+          iPrevKeyOff = iKeyOff;
+        }
+      }
+
+      if( iPgIdx==nPg && nIdx>0 && pSeg->iLeafPgno!=1 ){
+        fts5SecureDeleteIdxEntry(p, iSegid, pSeg->iLeafPgno);
+      }
+
+      assert_nc( nPg>4 || fts5GetU16(aPg)==0 );
+      fts5DataWrite(p, FTS5_SEGMENT_ROWID(iSegid,pSeg->iLeafPgno), aPg,nPg);
+    }
+    sqlite3_free(aIdx);
 }
 
 /*

ext/fts5/fts5_main.c

@@ -1329,9 +1329,6 @@ static int fts5FilterMethod(
     pCsr->iFirstRowid = fts5GetRowidLimit(pRowidGe, SMALLEST_INT64);
   }
 
-  rc = sqlite3Fts5IndexLoadConfig(pTab->p.pIndex);
-  if( rc!=SQLITE_OK ) goto filter_out;
-
   if( pTab->pSortCsr ){
     /* If pSortCsr is non-NULL, then this call is being made as part of 
     ** processing for a "... MATCH <expr> ORDER BY rank" query (ePlan is
@@ -1354,9 +1351,7 @@ static int fts5FilterMethod(
     pCsr->pExpr = pTab->pSortCsr->pExpr;
     rc = fts5CursorFirst(pTab, pCsr, bDesc);
   }else if( pCsr->pExpr ){
-    if( rc==SQLITE_OK ){
-      rc = fts5CursorParseRank(pConfig, pCsr, pRank);
-    }
+    rc = fts5CursorParseRank(pConfig, pCsr, pRank);
     if( rc==SQLITE_OK ){
       if( bOrderByRank ){
         pCsr->ePlan = FTS5_PLAN_SORTED_MATCH;

ext/fts5/test/fts5misc.test

@@ -44,12 +44,12 @@ do_catchsql_test 1.2.2 {
 
 do_catchsql_test 1.3.1 { 
   SELECT highlight(t1, 4, '<b>', '</b>') FROM t1('*reads'); 
-} {1 {no such cursor: 2}}
+} {1 {no such cursor: 1}}
 
 do_catchsql_test 1.3.2 {
   SELECT a FROM t1
     WHERE rank = (SELECT highlight(t1, 4, '<b>', '</b>') FROM t1('*reads'));
-} {1 {no such cursor: 2}}
+} {1 {no such cursor: 1}}
 
 db close
 sqlite3 db test.db

ext/fts5/test/fts5optimize2.test

@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# TESTRUNNER: slow
+# TESTRUNNER: superslow
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
@@ -42,23 +42,4 @@ do_execsql_test 1.2 {
   SELECT count(*) FROM t1('mno')
 } $nLoop
 
-do_execsql_test 2.0 {
-  CREATE VIRTUAL TABLE t2 USING fts5(x);
-  INSERT INTO t2(t2, rank) VALUES('pgsz', 32);
-}
-
-do_test 2.1 {
-  for {set ii 0} {$ii < $nLoop} {incr ii} {
-    execsql {
-      INSERT INTO t2 VALUES('abc def ghi');
-      INSERT INTO t2 VALUES('jkl mno pqr');
-      INSERT INTO t2(t2, rank) VALUES('merge', -1);
-    }
-  }
-} {}
-
-do_execsql_test 2.2 {
-  SELECT count(*) FROM t2('mno')
-} $nLoop
-
 finish_test

ext/fts5/test/fts5optimize3.test

@@ -0,0 +1,45 @@
+# 2023 Aug 27
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# TESTRUNNER: superslow
+#
+
+source [file join [file dirname [info script]] fts5_common.tcl]
+set testprefix fts5optimize2
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
+set nLoop 2500
+
+do_execsql_test 1.0 {
+  CREATE VIRTUAL TABLE t2 USING fts5(x);
+  INSERT INTO t2(t2, rank) VALUES('pgsz', 32);
+}
+
+do_test 1.1 {
+  for {set ii 0} {$ii < $nLoop} {incr ii} {
+    execsql {
+      INSERT INTO t2 VALUES('abc def ghi');
+      INSERT INTO t2 VALUES('jkl mno pqr');
+      INSERT INTO t2(t2, rank) VALUES('merge', -1);
+    }
+  }
+} {}
+
+do_execsql_test 1.2 {
+  SELECT count(*) FROM t2('mno')
+} $nLoop
+
+finish_test

ext/fts5/test/fts5rank.test

@@ -180,28 +180,4 @@ do_execsql_test 6.1 {
   {table table table} {the table names.} {rank on an fts5 table}
 }
 
-
-#-------------------------------------------------------------------------
-# forum post: https://sqlite.org/forum/forumpost/a2dd636330
-#
-reset_db
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE t USING fts5 (a, b);  
-  INSERT INTO t (a, b) VALUES ('data1', 'sentence1'), ('data2', 'sentence2'); 
-  INSERT INTO t(t, rank) VALUES ('rank', 'bm25(10.0,1.0)');
-}
-
-sqlite3 db2 test.db 
-do_execsql_test -db db2 1.1 {
-  SELECT *, rank<0.0 FROM t('data*') ORDER BY RANK;
-} {data1 sentence1 1 data2 sentence2 1}
-
-do_execsql_test 1.2 {
-  INSERT INTO t(t, rank) VALUES ('rank', 'bm25(10.0,1.0)');
-}
-do_execsql_test -db db2 1.3 {
-  SELECT *, rank<0.0 FROM t('data*') ORDER BY RANK;
-} {data1 sentence1 1 data2 sentence2 1}
-db2 close
-
 finish_test

ext/fts5/test/fts5secure.test

@@ -273,19 +273,6 @@ do_execsql_test 5.3 {
 do_execsql_test 5.4 { SELECT rowid FROM t1('abc'); } 2
 do_execsql_test 5.5 { SELECT rowid FROM t1('aa'); } 2
 
-#-------------------------------------------------------------------------
-reset_db
-
-do_execsql_test 6.0 {
-  CREATE VIRTUAL TABLE fts USING fts5(content);
-  INSERT INTO fts(fts, rank) VALUES ('secure-delete', 1);
-  INSERT INTO fts(rowid, content) VALUES
-    (3407, 'profile profile profile profile profile profile profile profile pull pulling pulling really');
-  DELETE FROM fts WHERE rowid IS 3407;
-  INSERT INTO fts(fts) VALUES ('integrity-check');
-}
-
-
 
 finish_test
 

ext/jni/GNUmakefile

@@ -6,9 +6,10 @@ JAVA_HOME ?= $(HOME)/jdk/current
 # e.g. /usr/lib/jvm/default-javajava-19-openjdk-amd64
 JDK_HOME ?= $(JAVA_HOME)
 # ^^^ JDK_HOME is not as widely used as JAVA_HOME
-bin.javac := $(JDK_HOME)/bin/javac
-bin.java  := $(JDK_HOME)/bin/java
-bin.jar   := $(JDK_HOME)/bin/jar
+bin.jar     := $(JDK_HOME)/bin/jar
+bin.java    := $(JDK_HOME)/bin/java
+bin.javac   := $(JDK_HOME)/bin/javac
+bin.javadoc := $(JDK_HOME)/bin/javadoc
 ifeq (,$(wildcard $(JDK_HOME)))
 $(error set JDK_HOME to the top-most dir of your JDK installation.)
 endif
@@ -17,18 +18,18 @@ $(MAKEFILE):
 
 package.jar := sqlite3-jni.jar
 
-dir.top := ../..
-dir.tool := ../../tool
-dir.jni := $(patsubst %/,%,$(dir $(MAKEFILE)))
-
+dir.top     := ../..
+dir.tool    := ../../tool
+dir.jni     := $(patsubst %/,%,$(dir $(MAKEFILE)))
 dir.src     := $(dir.jni)/src
 dir.src.c   := $(dir.src)/c
 dir.bld     := $(dir.jni)/bld
 dir.bld.c   := $(dir.bld)
 dir.src.jni := $(dir.src)/org/sqlite/jni
 dir.src.jni.tester := $(dir.src.jni)/tester
+mkdir       := mkdir -p
 $(dir.bld.c):
-	mkdir -p $@
+	$(mkdir) $@
 
 classpath := $(dir.src)
 CLEAN_FILES := $(package.jar)
@@ -58,25 +59,36 @@ $(bin.version-info): $(dir.tool)/version-info.c $(sqlite3.h) $(dir.top)/Makefile
 # Be explicit about which Java files to compile so that we can work on
 # in-progress files without requiring them to be in a compilable statae.
 JAVA_FILES.main := $(patsubst %,$(dir.src.jni)/%,\
-  BusyHandler.java \
-  Collation.java \
-  CollationNeeded.java \
-  CommitHook.java \
+  AggregateFunction.java \
+  AuthorizerCallback.java \
+  AutoExtensionCallback.java \
+  BusyHandlerCallback.java \
+  CollationCallback.java \
+  CollationNeededCallback.java \
+  CommitHookCallback.java \
+  ConfigSqllogCallback.java \
   NativePointerHolder.java \
+  NotNull.java \
+  Nullable.java \
   OutputPointer.java \
-  ProgressHandler.java \
+  PreupdateHookCallback.java \
+  ProgressHandlerCallback.java \
   ResultCode.java \
-  RollbackHook.java \
+  RollbackHookCallback.java \
+  ScalarFunction.java \
   SQLFunction.java \
-  sqlite3_context.java \
-  sqlite3.java \
   SQLite3Jni.java \
+  Tester1.java \
+  TraceV2Callback.java \
+  UpdateHookCallback.java \
+  ValueHolder.java \
+  WindowFunction.java \
+  XDestroyCallback.java \
+  package-info.java \
+  sqlite3.java \
+  sqlite3_context.java \
   sqlite3_stmt.java \
   sqlite3_value.java \
-  Tester1.java \
-  Tracer.java \
-  UpdateHook.java \
-  ValueHolder.java \
 )
 ifeq (1,$(enable.fts5))
   JAVA_FILES.main += $(patsubst %,$(dir.src.jni)/%,\
@@ -152,6 +164,7 @@ $(sqlite3.h):
 	$(MAKE) -C $(dir.top) sqlite3.c
 $(sqlite3.c): $(sqlite3.h)
 
+opt.threadsafe ?= 1
 SQLITE_OPT = \
   -DSQLITE_ENABLE_RTREE \
   -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
@@ -160,17 +173,17 @@ SQLITE_OPT = \
   -DSQLITE_ENABLE_DBSTAT_VTAB \
   -DSQLITE_ENABLE_BYTECODE_VTAB \
   -DSQLITE_ENABLE_OFFSET_SQL_FUNC \
+  -DSQLITE_ENABLE_PREUPDATE_HOOK \
+  -DSQLITE_ENABLE_SQLLOG \
   -DSQLITE_OMIT_LOAD_EXTENSION \
   -DSQLITE_OMIT_DEPRECATED \
   -DSQLITE_OMIT_SHARED_CACHE \
-  -DSQLITE_THREADSAFE=0 \
+  -DSQLITE_THREADSAFE=$(opt.threadsafe) \
   -DSQLITE_TEMP_STORE=2 \
   -DSQLITE_USE_URI=1 \
-  -DSQLITE_C=$(sqlite3.c)
-#  -DSQLITE_DEBUG
-# -DSQLITE_DEBUG is just to work around a -Wall warning
-# for a var which gets set in all builds but only read
-# via assert().
+  -DSQLITE_C=$(sqlite3.c) \
+  -DSQLITE_JNI_FATAL_OOM=0 \
+  -DSQLITE_DEBUG
 
 SQLITE_OPT += -g -DDEBUG -UNDEBUG
 
@@ -216,7 +229,7 @@ sqlite3-jni.dll.cflags = \
 # include path for client-level code.
 ########################################################################
 ifeq (1,$(enable.tester))
-  sqlite3-jni.dll.cflags += -DS3JNI_ENABLE_SQLTester
+  sqlite3-jni.dll.cflags += -DSQLITE_JNI_ENABLE_SQLTester
 endif
 $(sqlite3-jni.h): $(sqlite3-jni.h.in) $(MAKEFILE)
 	cat $(sqlite3-jni.h.in) > $@
@@ -226,12 +239,23 @@ $(sqlite3-jni.dll): $(dir.bld.c) $(sqlite3-jni.c) $(SQLite3Jni.java) $(MAKEFILE)
 			$(sqlite3-jni.c) -shared -o $@
 all: $(sqlite3-jni.dll)
 
-.PHONY: test
-test.flags ?= -v
-test: $(SQLite3Jni.class) $(sqlite3-jni.dll)
-	$(bin.java) -ea -Djava.library.path=$(dir.bld.c) \
-		$(java.flags) -cp $(classpath) \
-		org.sqlite.jni.Tester1 $(if $(test.flags),-- $(test.flags),)
+.PHONY: test test-one
+test.flags ?=
+test.main.flags = -ea -Djava.library.path=$(dir.bld.c) \
+                  $(java.flags) -cp $(classpath) \
+                  org.sqlite.jni.Tester1
+test.deps := $(SQLite3Jni.class) $(sqlite3-jni.dll)
+test-one: $(test.deps)
+	$(bin.java) $(test.main.flags) $(test.flags)
+test-sqllog: $(test.deps)
+	@echo "Testing with -sqllog..."
+	$(bin.java) $(test.main.flags) -sqllog
+test-mt: $(test.deps)
+	@echo "Testing in multi-threaded mode:";
+	$(bin.java) $(test.main.flags) -t 5 -r 20 -shuffle $(test.flags)
+
+test: test-one test-mt
+tests: test test-sqllog
 
 tester.scripts := $(sort $(wildcard $(dir.src)/tests/*.test))
 tester.flags ?= # --verbose
@@ -267,13 +291,23 @@ endif
 
 tester-ext: tester-local
 tester: tester-ext
-tests: test tester
+tests: tester
+
+########################################################################
+# Build each SQLITE_THREADMODE variant and run all tests against them.
+multitest: clean
+	$(MAKE) opt.threadsafe=0 tests clean
+	$(MAKE) opt.threadsafe=1 tests clean
+	$(MAKE) opt.threadsafe=2 tests clean
+
+
+########################################################################
+# jar bundle...
 package.jar.in := $(abspath $(dir.src)/jar.in)
 CLEAN_FILES += $(package.jar.in)
 $(package.jar.in): $(MAKEFILE) $(CLASS_FILES.main)
 	cd $(dir.src); ls -1 org/sqlite/jni/*.java org/sqlite/jni/*.class > $@
-	@ls -la $@
-	@echo "To use this jar you will need the -Djava.library.path=DIR/WITH/libsqlite3-jni.so flag."
+	@echo "To use this jar you will need the -Djava.library.path=DIR/CONTAINING/libsqlite3-jni.so flag."
 	@echo "e.g. java -jar $@ -Djava.library.path=bld"
 
 $(package.jar): $(CLASS_FILES) $(MAKEFILE) $(package.jar.in)
@@ -282,6 +316,27 @@ $(package.jar): $(CLASS_FILES) $(MAKEFILE) $(package.jar.in)
 
 jar: $(package.jar)
 
+########################################################################
+# javadoc...
+dir.doc   := $(dir.jni)/javadoc
+doc.index := $(dir.doc)/index.html
+$(doc.index): $(JAVA_FILES.main) $(MAKEFILE)
+	@if [ -d $(dir.doc) ]; then rm -fr $(dir.doc)/*; fi
+	$(bin.javadoc) -cp $(classpath) -d $(dir.doc) -quiet org.sqlite.jni
+	@echo "javadoc output is in $@"
+
+.PHONY: doc javadoc docserve
+.FORCE: doc
+doc: $(doc.index)
+javadoc: $(doc.index)
+# Force rebild of docs
+redoc:
+	@rm -f $(doc.index)
+	@$(MAKE) doc
+docserve: $(doc.index)
+	cd $(dir.doc) && althttpd -max-age 1 -page index.html
+########################################################################
+# Clean up...
 CLEAN_FILES += $(dir.bld.c)/* \
   $(dir.src.jni)/*.class \
   $(dir.src.jni.tester)/*.class \
@@ -293,7 +348,7 @@ clean:
 	-rm -f $(CLEAN_FILES)
 distclean: clean
 	-rm -f $(DISTCLEAN_FILES)
-	-rm -fr $(dir.bld.c)
+	-rm -fr $(dir.bld.c) $(dir.doc)
 
 ########################################################################
 # disttribution bundle rules...
@@ -317,6 +372,10 @@ dist: \
     $(bin.version-info) $(sqlite3.canonical.c) \
     $(package.jar) $(MAKEFILE)
 	@echo "Making end-user deliverables..."
+	@echo "****************************************************************************"; \
+	echo  "*** WARNING: be sure to build this with JDK8 (javac 1.8) for compatibility."; \
+	echo  "*** reasons!"; $$($(bin.javac) -version); \
+	echo  "****************************************************************************"
 	@rm -fr $(dist-dir.top)
 	@mkdir -p $(dist-dir.src)
 	@cp -p $(dist.top.extras) $(dist-dir.top)/.

ext/jni/README.md

@@ -15,7 +15,10 @@ Technical support is available in the forum:
 
 > **FOREWARNING:** this subproject is very much in development and
   subject to any number of changes. Please do not rely on any
-  information about its API until this disclaimer is removed.
+  information about its API until this disclaimer is removed.  The JNI
+  bindings released with version 3.43 are a "tech preview" and 3.44
+  will be "final," at which point strong backward compatibility
+  guarantees will apply.
 
 Project goals/requirements:
 
@@ -40,13 +43,41 @@ Non-goals:
 - Creation of high-level OO wrapper APIs. Clients are free to create
   them off of the C-style API.
 
+- Support for mixed-mode operation, where client code accesses SQLite
+  both via the Java-side API and the C API via their own native
+  code. In such cases, proxy functionalities (primarily callback
+  handler wrappers of all sorts) may fail because the C-side use of
+  the SQLite APIs will bypass those proxies.
 
-Significant TODOs
-========================================================================
 
-- The initial beta release with version 3.43 has severe threading
-  limitations.  Namely, two threads cannot call into the JNI-bound API
-  at once. This limitation will be remove in a subsequent release.
+Hello World
+-----------------------------------------------------------------------
+
+```java
+import org.sqlite.jni.*;
+import static SQLite3Jni.*;
+
+...
+
+final sqlite3 db = sqlite3_open(":memory:");
+try {
+  final int rc = sqlite3_errcode(db);
+  if( 0 != rc ){
+    if( null != db ){
+      System.out.print("Error opening db: "+sqlite3_errmsg(db));
+    }else{
+      System.out.print("Error opening db: rc="+rc);
+    }
+    ... handle error ...
+  }
+  // ... else use the db ...
+}finally{
+  // ALWAYS close databases using sqlite3_close() or sqlite3_close_v2()
+  // when done with them. All of their active statement handles must
+  // first have been passed to sqlite3_finalize().
+  sqlite3_close_v2(db);
+}
+```
 
 
 Building
@@ -60,55 +91,97 @@ The canonical builds assumes a Linux-like environment and requires:
 
 Put simply:
 
-```
+```console
 $ export JAVA_HOME=/path/to/jdk/root
 $ make
 $ make test
 $ make clean
 ```
 
+The jar distribution can be created with `make jar`, but note that it
+does not contain the binary DLL file. A different DLL is needed for
+each target platform.
+
+
 <a id='1to1ish'></a>
 One-to-One(-ish) Mapping to C
 ========================================================================
 
 This JNI binding aims to provide as close to a 1-to-1 experience with
-the C API as cross-language semantics allow. Exceptions are
+the C API as cross-language semantics allow. Interface changes are
 necessarily made where cross-language semantics do not allow a 1-to-1,
 and judiciously made where a 1-to-1 mapping would be unduly cumbersome
-to use in Java.
+to use in Java. In all cases, this binding makes every effort to
+provide semantics compatible with the C API documentation even if the
+interface to those semantics is slightly different.  Any cases which
+deviate from those semantics (either removing or adding semantics) are
+clearly documented.
 
-Golden Rule: _Never_ Throw from Callbacks
+Where it makes sense to do so for usability, Java-side overloads are
+provided which accept or return data in alternative forms or provide
+sensible default argument values. In all such cases they are thin
+proxies around the corresponding C APIs and do not introduce new
+semantics.
+
+In some very few cases, Java-specific capabilities have been added in
+new APIs, all of which have "_java" somewhere in their names.
+Examples include:
+
+- `sqlite3_result_java_object()`
+- `sqlite3_column_java_object()`
+- `sqlite3_column_java_casted()`
+- `sqlite3_value_java_object()`
+- `sqlite3_value_java_casted()`
+
+which, as one might surmise, collectively enable the passing of
+arbitrary Java objects from user-defined SQL functions through to the
+caller.
+
+
+Golden Rule: Garbage Collection Cannot Free SQLite Resources
 ------------------------------------------------------------------------
 
-JNI bindings which accept client-defined functions _must never throw
-exceptions_ unless _very explicitly documented_ as being
-throw-safe. Exceptions are generally reserved for higher-level
-bindings which are constructed to specifically deal with them and
-ensure that they do not leak C-level resources. Some of the JNI
-bindings are provided as Java functions which expect this rule to
-always hold.
+It is important that all databases and prepared statement handles get
+cleaned up by client code. A database cannot be closed if it has open
+statement handles. `sqlite3_close()` fails if the db cannot be closed
+whereas `sqlite3_close_v2()` recognizes that case and marks the db as
+a "zombie," pending finalization when the library detects that all
+pending statements have been closed. Be aware that Java garbage
+collection _cannot_ close a database or finalize a prepared statement.
+Those things require explicit API calls.
 
-UTF-8(-ish)
+
+Golden Rule #2: _Never_ Throw from Callbacks (Unless...)
 ------------------------------------------------------------------------
 
-SQLite internally uses UTF-8 encoding, whereas Java natively uses
-UTF-16.  Java JNI has routines for converting to and from UTF-8, _but_
-Java uses what its docs call "[modified UTF-8][modutf8]." Care must be
-taken when converting Java strings to UTF-8 to ensure that the proper
-conversion is performed. In short,
-`String.getBytes(StandardCharsets.UTF_8)` performs the proper
-conversion in Java, and there is no JNI C API for that conversion
-(JNI's `NewStringUTF()` returns MUTF-8).
+All routines in this API, barring explicitly documented exceptions,
+retain C-like semantics. For example, they are not permitted to throw
+or propagate exceptions and must return error information (if any) via
+result codes or `null`. The only cases where the C-style APIs may
+throw is through client-side misuse, e.g. passing in a null where it
+shouldn't be used. The APIs clearly mark function parameters which
+should not be null, but does not actively defend itself against such
+misuse. Some C-style APIs explicitly accept `null` as a no-op for
+usability's sake, and some of the JNI APIs deliberately return an
+error code, instead of segfaulting, when passed a `null`.
 
-Known consequences and limitations of this discrepancy include:
+Client-defined callbacks _must never throw exceptions_ unless _very
+explicitly documented_ as being throw-safe. Exceptions are generally
+reserved for higher-level bindings which are constructed to
+specifically deal with them and ensure that they do not leak C-level
+resources. In some cases, callback handlers are permitted to throw, in
+which cases they get translated to C-level result codes and/or
+messages. If a callback which is not permitted to throw throws, its
+exception may trigger debug output but will otherwise be suppressed.
 
-- Names of databases, tables, and collations must not contain
-  characters which differ in MUTF-8 and UTF-8, or certain APIs will
-  mis-translate them on their way between languages. APIs which
-  transfer other client-side data to Java take extra care to
-  convert the data at the cost of performance.
-
-[modutf8]: https://docs.oracle.com/javase/8/docs/api/java/io/DataInput.html#modified-utf-8
+The reason some callbacks are permitted to throw and others not is
+because all such callbacks act as proxies for C function callback
+interfaces and some of those interfaces have no error-reporting
+mechanism. Those which are capable of propagating errors back through
+the library convert exceptions from callbacks into corresponding
+C-level error information. Those which cannot propagate errors
+necessarily suppress any exceptions in order to maintain the C-style
+semantics of the APIs.
 
 
 Unwieldy Constructs are Re-mapped
@@ -126,7 +199,7 @@ A prime example of where interface changes for Java are necessary for
 usability is [registration of a custom
 collation](https://sqlite.org/c3ref/create_collation.html):
 
-```
+```c
 // C:
 int sqlite3_create_collation(sqlite3 * db, const char * name, int eTextRep,
                              void *pUserData,
@@ -145,7 +218,7 @@ passed that object as their first argument. That data is passed around
 bind that part as-is to Java, the result would be awkward to use (^Yes,
 we tried this.):
 
-```
+```java
 // Java:
 int sqlite3_create_collation(sqlite3 db, String name, int eTextRep,
                              Object pUserData, xCompareType xCompare);
@@ -160,20 +233,20 @@ for callbacks and (B) having their internal state provided separately,
 which is ill-fitting in Java. For the sake of usability, C APIs which
 follow that pattern use a slightly different Java interface:
 
-```
+```java
 int sqlite3_create_collation(sqlite3 db, String name, int eTextRep,
-                             Collation collation);
+                             SomeCallbackType collation);
 ```
 
-Where the `Collation` class has an abstract `xCompare()` method and
+Where the `Collation` class has an abstract `call()` method and
 no-op `xDestroy()` method which can be overridden if needed, leading to
 a much more Java-esque usage:
 
-```
-int rc = sqlite3_create_collation(db, "mycollation", SQLITE_UTF8, new Collation(){
+```java
+int rc = sqlite3_create_collation(db, "mycollation", SQLITE_UTF8, new SomeCallbackType(){
 
   // Required comparison function:
-  @Override public int xCompare(byte[] lhs, byte[] rhs){ ... }
+  @Override public int call(byte[] lhs, byte[] rhs){ ... }
 
   // Optional finalizer function:
   @Override public void xDestroy(){ ... }
@@ -188,8 +261,8 @@ int rc = sqlite3_create_collation(db, "mycollation", SQLITE_UTF8, new Collation(
 
 Noting that:
 
-- It is still possible to bind in call-scope-local state via closures,
-  if desired.
+- It is possible to bind in call-scope-local state via closures, if
+  desired, as opposed to packing it into the Collation object.
 
 - No capabilities of the C API are lost or unduly obscured via the
   above API reshaping, so power users need not make any compromises.
@@ -200,6 +273,7 @@ Noting that:
   overriding the `xDestroy()` method effectively gives it v2
   semantics.
 
+
 ### User-defined SQL Functions (a.k.a. UDFs)
 
 The [`sqlite3_create_function()`](https://sqlite.org/c3ref/create_function.html)
@@ -207,12 +281,13 @@ family of APIs make heavy use of function pointers to provide
 client-defined callbacks, necessitating interface changes in the JNI
 binding. The Java API has only one core function-registration function:
 
-```
+```java
 int sqlite3_create_function(sqlite3 db, String funcName, int nArgs,
                             int encoding, SQLFunction func);
 ```
 
-> Design question: does the encoding argument serve any purpose in JS?
+> Design question: does the encoding argument serve any purpose in
+  Java? That's as-yet undetermined. If not, it will be removed.
 
 `SQLFunction` is not used directly, but is instead instantiated via
 one of its three subclasses:
@@ -230,5 +305,9 @@ Search [`Tester1.java`](/file/ext/jni/src/org/sqlite/jni/Tester1.java) for
 Reminder: see the disclaimer at the top of this document regarding the
 in-flux nature of this API.
 
-[jsrc]: /file/
-[www]: https://sqlite.org
+### And so on...
+
+Various APIs which accept callbacks, e.g. `sqlite3_trace_v2()` and
+`sqlite3_update_hook()`, use interfaces similar to those shown above.
+Despite the changes in signature, the JNI layer makes every effort to
+provide the same semantics as the C API documentation suggests.

ext/jni/jar-dist.make

@@ -6,7 +6,9 @@
 # proper top-level JDK directory and, depending on the platform, add a
 # platform-specific -I directory. It should build as-is with any
 # 2020s-era version of gcc or clang. It requires JDK version 8 or
-# higher.
+# higher and that JAVA_HOME points to the top-most installation
+# directory of that JDK. On Ubuntu-style systems the JDK is typically
+# installed under /usr/lib/jvm/java-VERSION-PLATFORM.
 
 default: all
 
@@ -31,10 +33,11 @@ SQLITE_OPT = \
   -DSQLITE_OMIT_LOAD_EXTENSION \
   -DSQLITE_OMIT_DEPRECATED \
   -DSQLITE_OMIT_SHARED_CACHE \
-  -DSQLITE_THREADSAFE=0 \
+  -DSQLITE_THREADSAFE=1 \
   -DSQLITE_TEMP_STORE=2 \
   -DSQLITE_USE_URI=1 \
-  -DSQLITE_ENABLE_FTS5
+  -DSQLITE_ENABLE_FTS5 \
+  -DSQLITE_DEBUG
 
 sqlite3-jni.dll = libsqlite3-jni.so
 $(sqlite3-jni.dll):
@@ -46,8 +49,10 @@ $(sqlite3-jni.dll):
 		src/sqlite3-jni.c -shared -o $@
 	@echo "Now try running it with: make test"
 
+test.flags = -Djava.library.path=. sqlite3-jni-*.jar
 test: $(sqlite3-jni.dll)
-	java -jar -Djava.library.path=. sqlite3-jni-*.jar
+	java -jar $(test.flags)
+	java -jar $(test.flags) -t 7 -r 10 -shuffle
 
 clean:
 	-rm -f $(sqlite3-jni.dll)

ext/jni/src/c/sqlite3-jni.h

@@ -765,16 +765,24 @@ JNIEXPORT void JNICALL Java_org_sqlite_jni_SQLite3Jni_init
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    uncacheJniEnv
+ * Method:    sqlite3_java_uncache_thread
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_org_sqlite_jni_SQLite3Jni_uncacheJniEnv
+JNIEXPORT jboolean JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1java_1uncache_1thread
   (JNIEnv *, jclass);
 
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_aggregate_context
+ * Signature: (Lorg/sqlite/jni/sqlite3_context;Z)J
+ */
+JNIEXPORT jlong JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1aggregate_1context
+  (JNIEnv *, jclass, jobject, jboolean);
+
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_auto_extension
- * Signature: (Lorg/sqlite/jni/AutoExtension;)I
+ * Signature: (Lorg/sqlite/jni/AutoExtensionCallback;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1auto_1extension
   (JNIEnv *, jclass, jobject);
@@ -843,6 +851,14 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1bind_1parameter_1
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1bind_1text
   (JNIEnv *, jclass, jobject, jint, jbyteArray, jint);
 
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_bind_text16
+ * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I[BI)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1bind_1text16
+  (JNIEnv *, jclass, jobject, jint, jbyteArray, jint);
+
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_bind_zeroblob
@@ -862,7 +878,7 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1bind_1zeroblob64
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_busy_handler
- * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/BusyHandler;)I
+ * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/BusyHandlerCallback;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1busy_1handler
   (JNIEnv *, jclass, jobject, jobject);
@@ -878,7 +894,7 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1busy_1timeout
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_cancel_auto_extension
- * Signature: (Lorg/sqlite/jni/AutoExtension;)Z
+ * Signature: (Lorg/sqlite/jni/AutoExtensionCallback;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1cancel_1auto_1extension
   (JNIEnv *, jclass, jobject);
@@ -1013,18 +1029,18 @@ JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1table_
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_column_text16
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I)Ljava/lang/String;
+ * Method:    sqlite3_column_text_utf8
+ * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I)[B
  */
-JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1text16
+JNIEXPORT jbyteArray JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1text_1utf8
   (JNIEnv *, jclass, jobject, jint);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_column_text
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I)[B
+ * Method:    sqlite3_column_text16
+ * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I)Ljava/lang/String;
  */
-JNIEXPORT jbyteArray JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1text
+JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1text16
   (JNIEnv *, jclass, jobject, jint);
 
 /*
@@ -1046,7 +1062,7 @@ JNIEXPORT jobject JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1value
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_collation_needed
- * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/CollationNeeded;)I
+ * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/CollationNeededCallback;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1collation_1needed
   (JNIEnv *, jclass, jobject, jobject);
@@ -1062,7 +1078,7 @@ JNIEXPORT jobject JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1context_1db_1h
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_commit_hook
- * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/CommitHook;)Lorg/sqlite/jni/CommitHook;
+ * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/CommitHookCallback;)Lorg/sqlite/jni/CommitHookCallback;
  */
 JNIEXPORT jobject JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1commit_1hook
   (JNIEnv *, jclass, jobject, jobject);
@@ -1083,10 +1099,26 @@ JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1compileoption_
 JNIEXPORT jboolean JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1compileoption_1used
   (JNIEnv *, jclass, jstring);
 
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_config
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1config__I
+  (JNIEnv *, jclass, jint);
+
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_config
+ * Signature: (Lorg/sqlite/jni/ConfigSqllogCallback;)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1config__Lorg_sqlite_jni_ConfigSqllogCallback_2
+  (JNIEnv *, jclass, jobject);
+
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_create_collation
- * Signature: (Lorg/sqlite/jni/sqlite3;Ljava/lang/String;ILorg/sqlite/jni/Collation;)I
+ * Signature: (Lorg/sqlite/jni/sqlite3;Ljava/lang/String;ILorg/sqlite/jni/CollationCallback;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1create_1collation
   (JNIEnv *, jclass, jobject, jstring, jint, jobject);
@@ -1107,14 +1139,6 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1create_1function
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1data_1count
   (JNIEnv *, jclass, jobject);
 
-/*
- * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_db_filename
- * Signature: (Lorg/sqlite/jni/sqlite3;Ljava/lang/String;)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1db_1filename
-  (JNIEnv *, jclass, jobject, jstring);
-
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_db_config
@@ -1131,6 +1155,22 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1db_1config__Lorg_
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1db_1config__Lorg_sqlite_jni_sqlite3_2ILjava_lang_String_2
   (JNIEnv *, jclass, jobject, jint, jstring);
 
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_db_filename
+ * Signature: (Lorg/sqlite/jni/sqlite3;Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1db_1filename
+  (JNIEnv *, jclass, jobject, jstring);
+
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_db_handle
+ * Signature: (Lorg/sqlite/jni/sqlite3_stmt;)Lorg/sqlite/jni/sqlite3;
+ */
+JNIEXPORT jobject JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1db_1handle
+  (JNIEnv *, jclass, jobject);
+
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_db_status
@@ -1211,6 +1251,22 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1finalize
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1initialize
   (JNIEnv *, jclass);
 
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_interrupt
+ * Signature: (Lorg/sqlite/jni/sqlite3;)V
+ */
+JNIEXPORT void JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1interrupt
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_is_interrupted
+ * Signature: (Lorg/sqlite/jni/sqlite3;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1is_1interrupted
+  (JNIEnv *, jclass, jobject);
+
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_last_insert_rowid
@@ -1275,10 +1331,58 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1prepare_1v2
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1prepare_1v3
   (JNIEnv *, jclass, jobject, jbyteArray, jint, jint, jobject, jobject);
 
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_preupdate_blobwrite
+ * Signature: (Lorg/sqlite/jni/sqlite3;)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1preupdate_1blobwrite
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_preupdate_count
+ * Signature: (Lorg/sqlite/jni/sqlite3;)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1preupdate_1count
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_preupdate_depth
+ * Signature: (Lorg/sqlite/jni/sqlite3;)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1preupdate_1depth
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_preupdate_hook
+ * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/PreupdateHookCallback;)Lorg/sqlite/jni/PreupdateHookCallback;
+ */
+JNIEXPORT jobject JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1preupdate_1hook
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_preupdate_new
+ * Signature: (Lorg/sqlite/jni/sqlite3;ILorg/sqlite/jni/OutputPointer/sqlite3_value;)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1preupdate_1new
+  (JNIEnv *, jclass, jobject, jint, jobject);
+
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_preupdate_old
+ * Signature: (Lorg/sqlite/jni/sqlite3;ILorg/sqlite/jni/OutputPointer/sqlite3_value;)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1preupdate_1old
+  (JNIEnv *, jclass, jobject, jint, jobject);
+
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_progress_handler
- * Signature: (Lorg/sqlite/jni/sqlite3;ILorg/sqlite/jni/ProgressHandler;)V
+ * Signature: (Lorg/sqlite/jni/sqlite3;ILorg/sqlite/jni/ProgressHandlerCallback;)V
  */
 JNIEXPORT void JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1progress_1handler
   (JNIEnv *, jclass, jobject, jint, jobject);
@@ -1427,26 +1531,10 @@ JNIEXPORT void JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1result_1text
 JNIEXPORT void JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1result_1text64
   (JNIEnv *, jclass, jobject, jbyteArray, jlong, jint);
 
-/*
- * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_status
- * Signature: (ILorg/sqlite/jni/OutputPointer/Int32;Lorg/sqlite/jni/OutputPointer/Int32;Z)I
- */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1status
-  (JNIEnv *, jclass, jint, jobject, jobject, jboolean);
-
-/*
- * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_status64
- * Signature: (ILorg/sqlite/jni/OutputPointer/Int64;Lorg/sqlite/jni/OutputPointer/Int64;Z)I
- */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1status64
-  (JNIEnv *, jclass, jint, jobject, jobject, jboolean);
-
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_rollback_hook
- * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/RollbackHook;)Lorg/sqlite/jni/RollbackHook;
+ * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/RollbackHookCallback;)Lorg/sqlite/jni/RollbackHookCallback;
  */
 JNIEXPORT jobject JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1rollback_1hook
   (JNIEnv *, jclass, jobject, jobject);
@@ -1454,7 +1542,7 @@ JNIEXPORT jobject JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1rollback_1hook
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_set_authorizer
- * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/Authorizer;)I
+ * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/AuthorizerCallback;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1set_1authorizer
   (JNIEnv *, jclass, jobject, jobject);
@@ -1467,6 +1555,14 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1set_1authorizer
 JNIEXPORT void JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1set_1last_1insert_1rowid
   (JNIEnv *, jclass, jobject, jlong);
 
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_shutdown
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1shutdown
+  (JNIEnv *, jclass);
+
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_sleep
@@ -1491,6 +1587,22 @@ JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1sourceid
 JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1sql
   (JNIEnv *, jclass, jobject);
 
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_status
+ * Signature: (ILorg/sqlite/jni/OutputPointer/Int32;Lorg/sqlite/jni/OutputPointer/Int32;Z)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1status
+  (JNIEnv *, jclass, jint, jobject, jobject, jboolean);
+
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_status64
+ * Signature: (ILorg/sqlite/jni/OutputPointer/Int64;Lorg/sqlite/jni/OutputPointer/Int64;Z)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1status64
+  (JNIEnv *, jclass, jint, jobject, jobject, jboolean);
+
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_step
@@ -1542,7 +1654,7 @@ JNIEXPORT jlong JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1total_1changes64
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_trace_v2
- * Signature: (Lorg/sqlite/jni/sqlite3;ILorg/sqlite/jni/Tracer;)I
+ * Signature: (Lorg/sqlite/jni/sqlite3;ILorg/sqlite/jni/TraceV2Callback;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1trace_1v2
   (JNIEnv *, jclass, jobject, jint, jobject);
@@ -1550,7 +1662,7 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1trace_1v2
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_update_hook
- * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/UpdateHook;)Lorg/sqlite/jni/UpdateHook;
+ * Signature: (Lorg/sqlite/jni/sqlite3;Lorg/sqlite/jni/UpdateHookCallback;)Lorg/sqlite/jni/UpdateHookCallback;
  */
 JNIEXPORT jobject JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1update_1hook
   (JNIEnv *, jclass, jobject, jobject);
@@ -1635,14 +1747,6 @@ JNIEXPORT jlong JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1int64
 JNIEXPORT jobject JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1java_1object
   (JNIEnv *, jclass, jobject);
 
-/*
- * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_value_text
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1text
-  (JNIEnv *, jclass, jobject);
-
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_value_text_utf8
@@ -1659,22 +1763,6 @@ JNIEXPORT jbyteArray JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1text
 JNIEXPORT jbyteArray JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1text16
   (JNIEnv *, jclass, jobject);
 
-/*
- * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_value_text16le
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)[B
- */
-JNIEXPORT jbyteArray JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1text16le
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_value_text16be
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)[B
- */
-JNIEXPORT jbyteArray JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1text16be
-  (JNIEnv *, jclass, jobject);
-
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_value_type
@@ -1717,18 +1805,10 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1subtype
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_shutdown
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1shutdown
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_do_something_for_developer
+ * Method:    sqlite3_jni_internal_details
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1do_1something_1for_1developer
+JNIEXPORT void JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1jni_1internal_1details
   (JNIEnv *, jclass);
 
 #ifdef __cplusplus
@@ -1891,7 +1971,7 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_Fts5ExtensionApi_xSetAuxdata
 /*
  * Class:     org_sqlite_jni_Fts5ExtensionApi
  * Method:    xTokenize
- * Signature: (Lorg/sqlite/jni/Fts5Context;[BLorg/sqlite/jni/Fts5/xTokenizeCallback;)I
+ * Signature: (Lorg/sqlite/jni/Fts5Context;[BLorg/sqlite/jni/Fts5/xTokenize_callback;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_Fts5ExtensionApi_xTokenize
   (JNIEnv *, jobject, jobject, jbyteArray, jobject);
@@ -1949,7 +2029,7 @@ extern "C" {
 /*
  * Class:     org_sqlite_jni_fts5_tokenizer
  * Method:    xTokenize
- * Signature: (Lorg/sqlite/jni/Fts5Tokenizer;I[BLorg/sqlite/jni/Fts5/xTokenizeCallback;)I
+ * Signature: (Lorg/sqlite/jni/Fts5Tokenizer;I[BLorg/sqlite/jni/Fts5/xTokenize_callback;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_fts5_1tokenizer_xTokenize
   (JNIEnv *, jobject, jobject, jint, jbyteArray, jobject);

ext/jni/src/org/sqlite/jni/AggregateFunction.java

@@ -0,0 +1,72 @@
+/*
+** 2023-08-25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file is part of the JNI bindings for the sqlite3 C API.
+*/
+package org.sqlite.jni;
+
+
+/**
+   SQLFunction subclass for creating aggregate functions.  Its T is
+   the data type of its "accumulator" state, an instance of which is
+   intended to be be managed using the getAggregateState() and
+   takeAggregateState() methods.
+*/
+public abstract class AggregateFunction<T> extends SQLFunction {
+
+  /**
+     As for the xStep() argument of the C API's
+     sqlite3_create_function().  If this function throws, the
+     exception is not propagated and a warning might be emitted to a
+     debugging channel.
+  */
+  public abstract void xStep(sqlite3_context cx, sqlite3_value[] args);
+
+  /**
+     As for the xFinal() argument of the C API's sqlite3_create_function().
+     If this function throws, it is translated into an sqlite3_result_error().
+  */
+  public abstract void xFinal(sqlite3_context cx);
+
+  /**
+     Optionally override to be notified when the UDF is finalized by
+     SQLite.
+  */
+  public void xDestroy() {}
+
+  /** Per-invocation state for the UDF. */
+  private final SQLFunction.PerContextState<T> map =
+    new SQLFunction.PerContextState<>();
+
+  /**
+     To be called from the implementation's xStep() method, as well
+     as the xValue() and xInverse() methods of the Window<T>
+     subclass, to fetch the current per-call UDF state. On the
+     first call to this method for any given sqlite3_context
+     argument, the context is set to the given initial value. On all other
+     calls, the 2nd argument is ignored.
+
+     @see SQLFunction.PerContextState#getAggregateState
+  */
+  protected final ValueHolder<T> getAggregateState(sqlite3_context cx, T initialValue){
+    return map.getAggregateState(cx, initialValue);
+  }
+
+  /**
+     To be called from the implementation's xFinal() method to fetch
+     the final state of the UDF and remove its mapping.
+
+     see SQLFunction.PerContextState#takeAggregateState
+  */
+  protected final T takeAggregateState(sqlite3_context cx){
+    return map.takeAggregateState(cx);
+  }
+}

ext/jni/src/org/sqlite/jni/Authorizer.java

@@ -1,32 +0,0 @@
-/*
-** 2023-08-05
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This file is part of the JNI bindings for the sqlite3 C API.
-*/
-package org.sqlite.jni;
-
-/**
-   A callback for use with sqlite3_set_authorizer().
-*/
-public interface Authorizer {
-  /**
-     Must functions as described for the sqlite3_set_authorizer()
-     callback, with one caveat: the string values passed here were
-     initially (at the C level) encoded in standard UTF-8. If they
-     contained any constructs which are not compatible with MUTF-8,
-     these strings will not have the expected values. For further
-     details, see the documentation for the SQLite3Jni class.
-
-     Must not throw.
-  */
-  int xAuth(int opId, @Nullable String s1, @Nullable String s2,
-            @Nullable String s3, @Nullable String s4);
-}

ext/jni/src/org/sqlite/jni/AuthorizerCallback.java

@@ -0,0 +1,29 @@
+/*
+** 2023-08-25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file is part of the JNI bindings for the sqlite3 C API.
+*/
+package org.sqlite.jni;
+
+/**
+   Callback for use with sqlite3_set_authorizer().
+*/
+public interface AuthorizerCallback extends SQLite3CallbackProxy {
+  /**
+     Must function as described for the C-level
+     sqlite3_set_authorizer() callback.
+
+     Must not throw.
+  */
+  int call(int opId, @Nullable String s1, @Nullable String s2,
+           @Nullable String s3, @Nullable String s4);
+
+}

ext/jni/src/org/sqlite/jni/AutoExtension.java

@@ -1,31 +0,0 @@
-/*
-** 2023-08-05
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This file is part of the JNI bindings for the sqlite3 C API.
-*/
-package org.sqlite.jni;
-
-/**
-   A callback for use with sqlite3_auto_extension().
-*/
-public interface AutoExtension {
-  /**
-     Must function as described for the sqlite3_auto_extension(),
-     with the caveat that the signature is more limited.
-
-     As an exception (as it were) to the callbacks-must-not-throw
-     rule, AutoExtensions may do so and the exception's error message
-     will be set as the db's error string.
-
-     Results are undefined if db is closed by an auto-extension.
-  */
-  int xEntryPoint(sqlite3 db);
-}

ext/jni/src/org/sqlite/jni/AutoExtensionCallback.java

@@ -0,0 +1,41 @@
+/*
+** 2023-08-25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file is part of the JNI bindings for the sqlite3 C API.
+*/
+package org.sqlite.jni;
+
+/**
+   A callback for use with the sqlite3_auto_extension() family of
+   APIs.
+*/
+public interface AutoExtensionCallback extends SQLite3CallbackProxy {
+  /**
+     Must function as described for a C-level
+     sqlite3_auto_extension() callback, with the caveat that the
+     signature is shorter.
+
+     This callback may throw and the exception's error message will
+     be set as the db's error string.
+
+     Tips for implementations:
+
+     - Opening a database from an auto-extension handler will lead to
+     an endless recursion of the auto-handler triggering itself
+     indirectly for each newly-opened database.
+
+     - If this routine is stateful, it may be useful to make the
+     overridden method synchronized.
+
+     - Results are undefined if db is closed by an auto-extension.
+  */
+  int call(sqlite3 db);
+}

ext/jni/src/org/sqlite/jni/BusyHandler.java

@@ -1,45 +0,0 @@
-/*
-** 2023-07-22
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This file is part of the JNI bindings for the sqlite3 C API.
-*/
-package org.sqlite.jni;
-
-/**
-   Callback proxy for use with sqlite3_busy_handler().
-*/
-public abstract class BusyHandler {
-  /**
-     Must function as documented for the sqlite3_busy_handler()
-     callback argument, minus the (void*) argument the C-level
-     function requires.
-
-     Any exceptions thrown by this callback are suppressed in order to
-     retain the C-style API semantics of the JNI bindings.
-  */
-  public abstract int xCallback(int n);
-
-  /**
-     Optionally override to perform any cleanup when this busy
-     handler is destroyed. It is destroyed when:
-
-     - The associated db is passed to sqlite3_close() or
-       sqlite3_close_v2().
-
-     - sqlite3_busy_handler() is called to replace the handler,
-       whether it's passed a null handler or any other instance of
-       this class.
-
-     - sqlite3_busy_timeout() is called, which implicitly installs
-       a busy handler.
-  */
-  public void xDestroy(){}
-}

ext/jni/src/org/sqlite/jni/BusyHandlerCallback.java

@@ -0,0 +1,30 @@
+/*
+** 2023-08-25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file is part of the JNI bindings for the sqlite3 C API.
+*/
+package org.sqlite.jni;
+
+
+/**
+   Callback for use with sqlite3_busy_handler()
+*/
+public abstract class BusyHandlerCallback implements SQLite3CallbackProxy {
+  /**
+     Must function as documented for the C-level
+     sqlite3_busy_handler() callback argument, minus the (void*)
+     argument the C-level function requires.
+
+     Any exceptions thrown by this callback are suppressed in order to
+     retain the C-style API semantics of the JNI bindings.
+  */
+  public abstract int call(int n);
+}

ext/jni/src/org/sqlite/jni/CollationCallback.java

@@ -1,5 +1,5 @@
 /*
-** 2023-07-22
+** 2023-08-25
 **
 ** The author disclaims copyright to this source code.  In place of
 ** a legal notice, here is a blessing:
@@ -14,15 +14,18 @@
 package org.sqlite.jni;
 
 /**
+   Callback for use with sqlite3_create_collation()
 */
-public abstract class Collation {
+public abstract class CollationCallback
+  implements SQLite3CallbackProxy, XDestroyCallback {
   /**
      Must compare the given byte arrays using memcmp() semantics.
   */
-  public abstract int xCompare(byte[] lhs, byte[] rhs);
+  public abstract int call(byte[] lhs, byte[] rhs);
+
   /**
-     Called by SQLite when the collation is destroyed. If a Collation
+     Called by SQLite when the collation is destroyed. If a collation
      requires custom cleanup, override this method.
   */
-  public void xDestroy() {}
+  public void xDestroy(){}
 }

ext/jni/src/org/sqlite/jni/CollationNeededCallback.java

@@ -1,5 +1,5 @@
 /*
-** 2023-07-30
+** 2023-08-25
 **
 ** The author disclaims copyright to this source code.  In place of
 ** a legal notice, here is a blessing:
@@ -14,15 +14,15 @@
 package org.sqlite.jni;
 
 /**
-   Callback proxy for use with sqlite3_collation_needed().
+   Callback for use with sqlite3_collation_needed().
 */
-public interface CollationNeeded {
+public interface CollationNeededCallback extends SQLite3CallbackProxy {
   /**
      Has the same semantics as the C-level sqlite3_create_collation()
      callback.
 
-     If it throws, the exception message is passed on to the db and
+     <p>If it throws, the exception message is passed on to the db and
      the exception is suppressed.
   */
-  int xCollationNeeded(sqlite3 db, int eTextRep, String collationName);
+  int call(sqlite3 db, int eTextRep, String collationName);
 }

ext/jni/src/org/sqlite/jni/CommitHookCallback.java

@@ -1,5 +1,5 @@
 /*
-** 2023-07-22
+** 2023-08-25
 **
 ** The author disclaims copyright to this source code.  In place of
 ** a legal notice, here is a blessing:
@@ -14,12 +14,12 @@
 package org.sqlite.jni;
 
 /**
-   Callback proxy for use with sqlite3_commit_hook().
+   Callback for use with sqlite3_commit_hook()
 */
-public interface CommitHook {
+public interface CommitHookCallback extends SQLite3CallbackProxy {
   /**
-     Works as documented for the sqlite3_commit_hook() callback.
-     Must not throw.
+     Works as documented for the C-level sqlite3_commit_hook()
+     callback.  Must not throw.
   */
-  int xCommitHook();
+  int call();
 }

ext/jni/src/org/sqlite/jni/ConfigSqllogCallback.java

@@ -0,0 +1,25 @@
+/*
+** 2023-08-23
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file is part of the JNI bindings for the sqlite3 C API.
+*/
+package org.sqlite.jni;
+
+/**
+   A callback for use with sqlite3_config().
+*/
+public interface ConfigSqllogCallback {
+  /**
+     Must function as described for a C-level callback for
+     {@link SQLite3Jni#sqlite3_config(ConfigSqllogCallback)}, with the slight signature change.
+  */
+  void call(sqlite3 db, String msg, int msgType );
+}

ext/jni/src/org/sqlite/jni/Fts5.java

@@ -25,9 +25,11 @@ public final class Fts5 {
   /* Not used */
   private Fts5(){}
 
-  //! Callback type for use with xTokenize() variants
-  public static interface xTokenizeCallback {
-    int xToken(int tFlags, byte txt[], int iStart, int iEnd);
+  /**
+     Callback type for use with xTokenize() variants
+  */
+  public static interface xTokenize_callback {
+    int call(int tFlags, byte[] txt, int iStart, int iEnd);
   }
 
   public static final int FTS5_TOKENIZE_QUERY    = 0x0001;

ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java

@@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets;
 public final class Fts5ExtensionApi extends NativePointerHolder<Fts5ExtensionApi> {
   //! Only called from JNI
   private Fts5ExtensionApi(){}
-  private int iVersion = 2;
+  private final int iVersion = 2;
 
   /* Callback type for used by xQueryPhrase(). */
   public static interface xQueryPhraseCallback {
@@ -33,54 +33,54 @@ public final class Fts5ExtensionApi extends NativePointerHolder<Fts5ExtensionApi
   /**
      Returns the singleton instance of this class.
   */
-  public static synchronized native Fts5ExtensionApi getInstance();
+  public static native Fts5ExtensionApi getInstance();
 
-  public synchronized native int xColumnCount(@NotNull Fts5Context fcx);
-  public synchronized native int xColumnSize(@NotNull Fts5Context cx, int iCol,
+  public native int xColumnCount(@NotNull Fts5Context fcx);
+  public native int xColumnSize(@NotNull Fts5Context cx, int iCol,
                                 @NotNull OutputPointer.Int32 pnToken);
-  public synchronized native int xColumnText(@NotNull Fts5Context cx, int iCol,
+  public native int xColumnText(@NotNull Fts5Context cx, int iCol,
                                 @NotNull OutputPointer.String txt);
-  public synchronized native int xColumnTotalSize(@NotNull Fts5Context fcx, int iCol,
+  public native int xColumnTotalSize(@NotNull Fts5Context fcx, int iCol,
                                      @NotNull OutputPointer.Int64 pnToken);
-  public synchronized native Object xGetAuxdata(@NotNull Fts5Context cx, boolean clearIt);
-  public synchronized native int xInst(@NotNull Fts5Context cx, int iIdx,
+  public native Object xGetAuxdata(@NotNull Fts5Context cx, boolean clearIt);
+  public native int xInst(@NotNull Fts5Context cx, int iIdx,
                           @NotNull OutputPointer.Int32 piPhrase,
                           @NotNull OutputPointer.Int32 piCol,
                           @NotNull OutputPointer.Int32 piOff);
-  public synchronized native int xInstCount(@NotNull Fts5Context fcx,
+  public native int xInstCount(@NotNull Fts5Context fcx,
                                @NotNull OutputPointer.Int32 pnInst);
-  public synchronized native int xPhraseCount(@NotNull Fts5Context fcx);
-  public synchronized native int xPhraseFirst(@NotNull Fts5Context cx, int iPhrase,
+  public native int xPhraseCount(@NotNull Fts5Context fcx);
+  public native int xPhraseFirst(@NotNull Fts5Context cx, int iPhrase,
                                  @NotNull Fts5PhraseIter iter,
                                  @NotNull OutputPointer.Int32 iCol,
                                  @NotNull OutputPointer.Int32 iOff);
-  public synchronized native int xPhraseFirstColumn(@NotNull Fts5Context cx, int iPhrase,
+  public native int xPhraseFirstColumn(@NotNull Fts5Context cx, int iPhrase,
                                        @NotNull Fts5PhraseIter iter,
                                        @NotNull OutputPointer.Int32 iCol);
-  public synchronized native void xPhraseNext(@NotNull Fts5Context cx,
+  public native void xPhraseNext(@NotNull Fts5Context cx,
                                  @NotNull Fts5PhraseIter iter,
                                  @NotNull OutputPointer.Int32 iCol,
                                  @NotNull OutputPointer.Int32 iOff);
-  public synchronized native void xPhraseNextColumn(@NotNull Fts5Context cx,
+  public native void xPhraseNextColumn(@NotNull Fts5Context cx,
                                        @NotNull Fts5PhraseIter iter,
                                        @NotNull OutputPointer.Int32 iCol);
-  public synchronized native int xPhraseSize(@NotNull Fts5Context fcx, int iPhrase);
-  public synchronized native int xQueryPhrase(@NotNull Fts5Context cx, int iPhrase,
+  public native int xPhraseSize(@NotNull Fts5Context fcx, int iPhrase);
+  public native int xQueryPhrase(@NotNull Fts5Context cx, int iPhrase,
                                  @NotNull xQueryPhraseCallback callback);
-  public synchronized native int xRowCount(@NotNull Fts5Context fcx,
+  public native int xRowCount(@NotNull Fts5Context fcx,
                               @NotNull OutputPointer.Int64 nRow);
-  public synchronized native long xRowid(@NotNull Fts5Context cx);
+  public native long xRowid(@NotNull Fts5Context cx);
   /* Note that the JNI binding lacks the C version's xDelete()
      callback argument. Instead, if pAux has an xDestroy() method, it
      is called if the FTS5 API finalizes the aux state (including if
      allocation of storage for the auxdata fails). Any reference to
      pAux held by the JNI layer will be relinquished regardless of
      whether pAux has an xDestroy() method. */
-  public synchronized native int xSetAuxdata(@NotNull Fts5Context cx, @Nullable Object pAux);
-  public synchronized native int xTokenize(@NotNull Fts5Context cx, @NotNull byte pText[],
-                              @NotNull Fts5.xTokenizeCallback callback);
+  public native int xSetAuxdata(@NotNull Fts5Context cx, @Nullable Object pAux);
+  public native int xTokenize(@NotNull Fts5Context cx, @NotNull byte[] pText,
+                              @NotNull Fts5.xTokenize_callback callback);
 
-  public synchronized native Object xUserData(Fts5Context cx);
+  public native Object xUserData(Fts5Context cx);
   //^^^ returns the pointer passed as the 3rd arg to the C-level
-  // fts5_api::xCreateFunction.
+  // fts5_api::xCreateFunction().
 }

ext/jni/src/org/sqlite/jni/NativePointerHolder.java

@@ -23,11 +23,11 @@ package org.sqlite.jni;
    NativePointerHolder is not inadvertently passed to an incompatible
    function signature.
 
-   These objects do not _own_ the pointer they refer to.  They are
+   These objects do not own the pointer they refer to.  They are
    intended simply to communicate that pointer between C and Java.
 */
 public class NativePointerHolder<ContextType> {
   //! Only set from JNI, where access permissions don't matter.
-  private long nativePointer = 0;
+  private volatile long nativePointer = 0;
   public final long getNativePointer(){ return nativePointer; }
 }

ext/jni/src/org/sqlite/jni/NotNull.java

@@ -0,0 +1,23 @@
+package org.sqlite.jni;
+
+/**
+   This annotation is for flagging parameters which may not legally be
+   null. Note that the C-style API does not throw any exceptions on
+   its own because it has a no-throw policy in order to retain its
+   C-style semantics, but it may trigger NullPointerExceptions (or
+   similar) if passed a null for a parameter flagged with this
+   annotation.
+
+   <p>This annotation is informational only. No policy is in place to
+   programmatically ensure that NotNull is conformed to in client
+   code.
+
+   <p>This annotation is solely for the use by the classes in this
+   package but is made public so that javadoc will link to it from the
+   annotated functions. It is not part of the public API and
+   client-level code must not rely on it.
+*/
+@java.lang.annotation.Documented
+@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE)
+@java.lang.annotation.Target(java.lang.annotation.ElementType.PARAMETER)
+public @interface NotNull{}

ext/jni/src/org/sqlite/jni/Nullable.java

@@ -0,0 +1,16 @@
+package org.sqlite.jni;
+
+/**
+   This annotation is for flagging parameters which may legally be
+   null, noting that they may behave differently if passed null but
+   are prepared to expect null as a value.
+
+   <p>This annotation is solely for the use by the classes in this
+   package but is made public so that javadoc will link to it from the
+   annotated functions. It is not part of the public API and
+   client-level code must not rely on it.
+*/
+@java.lang.annotation.Documented
+@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE)
+@java.lang.annotation.Target(java.lang.annotation.ElementType.PARAMETER)
+public @interface Nullable{}

ext/jni/src/org/sqlite/jni/OutputPointer.java

@@ -16,13 +16,13 @@ package org.sqlite.jni;
 /**
    Helper classes for handling JNI output pointers.
 
-   We do not use a generic OutputPointer<T> because working with those
+   <p>We do not use a generic OutputPointer<T> because working with those
    from the native JNI code is unduly quirky due to a lack of
    autoboxing at that level.
 
-   The usage is similar for all of thes types:
+   <p>The usage is similar for all of thes types:
 
-   ```
+   <pre>{@code
    OutputPointer.sqlite3 out = new OutputPointer.sqlite3();
    assert( null==out.get() );
    int rc = sqlite3_open(":memory:", out);
@@ -30,12 +30,15 @@ package org.sqlite.jni;
    assert( null!=out.get() );
    sqlite3 db = out.take();
    assert( null==out.get() );
-   ```
+   }</pre>
 
-   With the minor exception that the primitive types permit direct
+   <p>With the minor exception that the primitive types permit direct
    access to the object's value via the `value` property, whereas the
    JNI-level opaque types do not permit client-level code to set that
    property.
+
+   <p>Warning: do not share instances of these classes across
+   threads. Doing so may lead to corrupting sqlite3-internal state.
 */
 public final class OutputPointer {
 
@@ -47,13 +50,13 @@ public final class OutputPointer {
   */
   public static final class sqlite3 {
     private org.sqlite.jni.sqlite3 value;
-    //! Initializes with a null value.
+    /** Initializes with a null value. */
     public sqlite3(){value = null;}
-    //! Sets the current value to null.
+    /** Sets the current value to null. */
     public void clear(){value = null;}
-    //! Returns the current value.
+    /** Returns the current value. */
     public final org.sqlite.jni.sqlite3 get(){return value;}
-    //! Equivalent to calling get() then clear().
+    /** Equivalent to calling get() then clear(). */
     public final org.sqlite.jni.sqlite3 take(){
       final org.sqlite.jni.sqlite3 v = value;
       value = null;
@@ -69,13 +72,13 @@ public final class OutputPointer {
   */
   public static final class sqlite3_stmt {
     private org.sqlite.jni.sqlite3_stmt value;
-    //! Initializes with a null value.
+    /** Initializes with a null value. */
     public sqlite3_stmt(){value = null;}
-    //! Sets the current value to null.
+    /** Sets the current value to null. */
     public void clear(){value = null;}
-    //! Returns the current value.
+    /** Returns the current value. */
     public final org.sqlite.jni.sqlite3_stmt get(){return value;}
-    //! Equivalent to calling get() then clear().
+    /** Equivalent to calling get() then clear(). */
     public final org.sqlite.jni.sqlite3_stmt take(){
       final org.sqlite.jni.sqlite3_stmt v = value;
       value = null;
@@ -83,6 +86,28 @@ public final class OutputPointer {
     }
   }
 
+  /**
+     Output pointer for use with routines, such as sqlite3_prepupdate_new(),
+     which return a sqlite3_value handle via an output pointer. These
+     pointers can only be set by the JNI layer, not by client-level
+     code.
+  */
+  public static final class sqlite3_value {
+    private org.sqlite.jni.sqlite3_value value;
+    /** Initializes with a null value. */
+    public sqlite3_value(){value = null;}
+    /** Sets the current value to null. */
+    public void clear(){value = null;}
+    /** Returns the current value. */
+    public final org.sqlite.jni.sqlite3_value get(){return value;}
+    /** Equivalent to calling get() then clear(). */
+    public final org.sqlite.jni.sqlite3_value take(){
+      final org.sqlite.jni.sqlite3_value v = value;
+      value = null;
+      return v;
+    }
+  }
+
   /**
      Output pointer for use with native routines which return integers via
      output pointers.
@@ -93,13 +118,13 @@ public final class OutputPointer {
        consistency with the higher-level types.
     */
     public int value;
-    //! Initializes with the value 0.
+    /** Initializes with the value 0. */
     public Int32(){this(0);}
-    //! Initializes with the value v.
+    /** Initializes with the value v. */
     public Int32(int v){value = v;}
-    //! Returns the current value.
+    /** Returns the current value. */
     public final int get(){return value;}
-    //! Sets the current value to v.
+    /** Sets the current value to v. */
     public final void set(int v){value = v;}
   }
 
@@ -113,13 +138,13 @@ public final class OutputPointer {
        consistency with the higher-level types.
     */
     public long value;
-    //! Initializes with the value 0.
+    /** Initializes with the value 0. */
     public Int64(){this(0);}
-    //! Initializes with the value v.
+    /** Initializes with the value v. */
     public Int64(long v){value = v;}
-    //! Returns the current value.
+    /** Returns the current value. */
     public final long get(){return value;}
-    //! Sets the current value.
+    /** Sets the current value. */
     public final void set(long v){value = v;}
   }
 
@@ -133,13 +158,13 @@ public final class OutputPointer {
        consistency with the higher-level types.
     */
     public java.lang.String value;
-    //! Initializes with a null value.
+    /** Initializes with a null value. */
     public String(){this(null);}
-    //! Initializes with the value v.
+    /** Initializes with the value v. */
     public String(java.lang.String v){value = v;}
-    //! Returns the current value.
+    /** Returns the current value. */
     public final java.lang.String get(){return value;}
-    //! Sets the current value.
+    /** Sets the current value. */
     public final void set(java.lang.String v){value = v;}
   }
 
@@ -153,13 +178,13 @@ public final class OutputPointer {
        consistency with the higher-level types.
     */
     public byte[] value;
-    //! Initializes with the value null.
+    /** Initializes with the value null. */
     public ByteArray(){this(null);}
-    //! Initializes with the value v.
+    /** Initializes with the value v. */
     public ByteArray(byte[] v){value = v;}
-    //! Returns the current value.
+    /** Returns the current value. */
     public final byte[] get(){return value;}
-    //! Sets the current value.
+    /** Sets the current value. */
     public final void set(byte[] v){value = v;}
   }
 }

ext/jni/src/org/sqlite/jni/PreupdateHookCallback.java

@@ -0,0 +1,26 @@
+/*
+** 2023-08-25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file is part of the JNI bindings for the sqlite3 C API.
+*/
+package org.sqlite.jni;
+
+/**
+   Callback for use with sqlite3_preupdate_hook().
+*/
+public interface PreupdateHookCallback extends SQLite3CallbackProxy {
+  /**
+     Must function as described for the C-level sqlite3_preupdate_hook()
+     callback.  Must not throw.
+  */
+  void call(sqlite3 db, int op, String dbName, String dbTable,
+            long iKey1, long iKey2 );
+}

ext/jni/src/org/sqlite/jni/ProgressHandlerCallback.java

@@ -1,5 +1,5 @@
 /*
-** 2023-07-22
+** 2023-08-25
 **
 ** The author disclaims copyright to this source code.  In place of
 ** a legal notice, here is a blessing:
@@ -14,14 +14,14 @@
 package org.sqlite.jni;
 
 /**
-   Callback proxy for use with sqlite3_progress_handler().
+   Callback for use with sqlite3_progress_handler()
 */
-public interface ProgressHandler {
+public interface ProgressHandlerCallback extends SQLite3CallbackProxy {
   /**
-     Works as documented for the sqlite3_progress_handler() callback.
+     Works as documented for the C-level sqlite3_progress_handler() callback.
 
      If it throws, the exception message is passed on to the db and
      the exception is suppressed.
   */
-  int xCallback();
+  int call();
 }

ext/jni/src/org/sqlite/jni/RollbackHookCallback.java

@@ -1,5 +1,5 @@
 /*
-** 2023-07-22
+** 2023-08-25
 **
 ** The author disclaims copyright to this source code.  In place of
 ** a legal notice, here is a blessing:
@@ -14,12 +14,12 @@
 package org.sqlite.jni;
 
 /**
-   Callback proxy for use with sqlite3_rollback_hook().
+   Callback for use with sqlite3_rollback_hook()
 */
-public interface RollbackHook {
+public interface RollbackHookCallback extends SQLite3CallbackProxy {
   /**
-     Works as documented for the sqlite3_rollback_hook() callback.
-     Must not throw.
+     Works as documented for the C-level sqlite3_rollback_hook()
+     callback.  Must not throw.
   */
-  void xRollbackHook();
+  void call();
 }

ext/jni/src/org/sqlite/jni/SQLFunction.java

@@ -19,34 +19,41 @@ package org.sqlite.jni;
    access to the callback functions needed in order to implement SQL
    functions in Java.
 
+   <p>
+
    This class is not used by itself, but is a marker base class. The
    three UDF types are modelled by the inner classes Scalar,
-   Aggregate<T>, and Window<T>. Most simply, clients may create
-   anonymous classes from those to implement UDFs. Clients are free to
-   create their own classes for use with UDFs, so long as they conform
-   to the public interfaces defined by those three classes. The JNI
-   layer only actively relies on the SQLFunction base class.
+   Aggregate<T>, and Window<T>. Most simply, clients may subclass
+   those, or create anonymous classes from them, to implement
+   UDFs. Clients are free to create their own classes for use with
+   UDFs, so long as they conform to the public interfaces defined by
+   those three classes. The JNI layer only actively relies on the
+   SQLFunction base class and the method names and signatures used by
+   the UDF callback interfaces.
 */
 public abstract class SQLFunction {
 
   /**
      PerContextState assists aggregate and window functions in
-     managinga their accumulator state across calls to the UDF's
+     managing their accumulator state across calls to the UDF's
      callbacks.
 
-     If a given aggregate or window function is called multiple times
+     <p>T must be of a type which can be legally stored as a value in
+     java.util.HashMap<KeyType,T>.
+
+     <p>If a given aggregate or window function is called multiple times
      in a single SQL statement, e.g. SELECT MYFUNC(A), MYFUNC(B)...,
      then the clients need some way of knowing which call is which so
      that they can map their state between their various UDF callbacks
      and reset it via xFinal(). This class takes care of such
      mappings.
 
-     This class works by mapping
+     <p>This class works by mapping
      sqlite3_context.getAggregateContext() to a single piece of
      state, of a client-defined type (the T part of this class), which
      persists across a "matching set" of the UDF's callbacks.
 
-     This class is a helper providing commonly-needed functionality -
+     <p>This class is a helper providing commonly-needed functionality -
      it is not required for use with aggregate or window functions.
      Client UDFs are free to perform such mappings using custom
      approaches. The provided Aggregate<T> and Window<T> classes
@@ -60,20 +67,20 @@ public abstract class SQLFunction {
        Should be called from a UDF's xStep(), xValue(), and xInverse()
        methods, passing it that method's first argument and an initial
        value for the persistent state. If there is currently no
-       mapping for cx.getAggregateContext() within the map, one is
-       created using the given initial value, else the existing one is
-       used and the 2nd argument is ignored.  It returns a
-       ValueHolder<T> which can be used to modify that state directly
-       without requiring that the client update the underlying map's
-       entry.
+       mapping for the given context within the map, one is created
+       using the given initial value, else the existing one is used
+       and the 2nd argument is ignored.  It returns a ValueHolder<T>
+       which can be used to modify that state directly without
+       requiring that the client update the underlying map's entry.
 
-       T must be of a type which can be legally stored as a value in
-       java.util.HashMap<KeyType,T>.
+       <p>The caller is obligated to eventually call
+       takeAggregateState() to clear the mapping.
     */
     public ValueHolder<T> getAggregateState(sqlite3_context cx, T initialValue){
-      ValueHolder<T> rc = map.get(cx.getAggregateContext());
-      if(null == rc){
-        map.put(cx.getAggregateContext(), rc = new ValueHolder<>(initialValue));
+      final Long key = cx.getAggregateContext(true);
+      ValueHolder<T> rc = null==key ? null : map.get(key);
+      if( null==rc ){
+        map.put(key, rc = new ValueHolder<>(initialValue));
       }
       return rc;
     }
@@ -88,85 +95,9 @@ public abstract class SQLFunction {
        rows.
     */
     public T takeAggregateState(sqlite3_context cx){
-      final ValueHolder<T> h = map.remove(cx.getAggregateContext());
+      final ValueHolder<T> h = map.remove(cx.getAggregateContext(false));
       return null==h ? null : h.value;
     }
   }
 
-  //! Subclass for creating scalar functions.
-  public static abstract class Scalar extends SQLFunction {
-
-    //! As for the xFunc() argument of the C API's sqlite3_create_function()
-    public abstract void xFunc(sqlite3_context cx, sqlite3_value[] args);
-
-    /**
-       Optionally override to be notified when the UDF is finalized by
-       SQLite.
-    */
-    public void xDestroy() {}
-  }
-
-  /**
-     SQLFunction Subclass for creating aggregate functions.  Its T is
-     the data type of its "accumulator" state, an instance of which is
-     intended to be be managed using the getAggregateState() and
-     takeAggregateState() methods.
-  */
-  public static abstract class Aggregate<T> extends SQLFunction {
-
-    //! As for the xStep() argument of the C API's sqlite3_create_function()
-    public abstract void xStep(sqlite3_context cx, sqlite3_value[] args);
-
-    //! As for the xFinal() argument of the C API's sqlite3_create_function()
-    public abstract void xFinal(sqlite3_context cx);
-
-    /**
-       Optionally override to be notified when the UDF is finalized by
-       SQLite.
-    */
-    public void xDestroy() {}
-
-    //! Per-invocation state for the UDF.
-    private final PerContextState<T> map = new PerContextState<>();
-
-    /**
-       To be called from the implementation's xStep() method, as well
-       as the xValue() and xInverse() methods of the Window<T>
-       subclass, to fetch the current per-call UDF state. On the
-       first call to this method for any given sqlite3_context
-       argument, the context is set to the given initial value. On all other
-       calls, the 2nd argument is ignored.
-
-       @see PerContextState<T>#takeAggregateState()
-    */
-    protected final ValueHolder<T> getAggregateState(sqlite3_context cx, T initialValue){
-      return map.getAggregateState(cx, initialValue);
-    }
-
-    /**
-       To be called from the implementation's xFinal() method to fetch
-       the final state of the UDF and remove its mapping.
-
-       @see PerContextState<T>#takeAggregateState()
-    */
-    protected final T takeAggregateState(sqlite3_context cx){
-      return map.takeAggregateState(cx);
-    }
-  }
-
-  /**
-     An SQLFunction subclass for creating window functions.  Note that
-     Window<T> inherits from Aggregate<T> and each instance is
-     required to implement the inherited abstract methods from that
-     class. See Aggregate<T> for information on managing the UDF's
-     invocation-specific state.
-  */
-  public static abstract class Window<T> extends Aggregate<T> {
-
-    //! As for the xInverse() argument of the C API's sqlite3_create_window_function()
-    public abstract void xInverse(sqlite3_context cx, sqlite3_value[] args);
-
-    //! As for the xValue() argument of the C API's sqlite3_create_window_function()
-    public abstract void xValue(sqlite3_context cx);
-  }
 }

ext/jni/src/org/sqlite/jni/SQLite3CallbackProxy.java

@@ -0,0 +1,34 @@
+/*
+** 2023-08-25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file is part of the JNI bindings for the sqlite3 C API.
+*/
+package org.sqlite.jni;
+/**
+   This marker interface exists soley for use as a documentation and
+   class-grouping tool. It should be applied to interfaces or
+   classes which have a call() method implementing some specific
+   callback interface on behalf of the C library.
+
+   <p>Callbacks of this style follow a common naming convention:
+
+   <p>1) They use the UpperCamelCase form of the C function they're
+   proxying for, minus the sqlite3_ prefix, plus a Callback
+   suffix. e.g. sqlite3_busy_handler()'s callback is named
+   BusyHandlerCallback. Exceptions are made where that would
+   potentially be ambiguous, e.g. ConfigSqllogCallback instead of
+   config_callback because the sqlite3_config() interface may need to
+   support more callback types in the future.
+
+   <p>2) They all have a call() method but its signature is
+   callback-specific.
+*/
+public interface SQLite3CallbackProxy {}

ext/jni/src/org/sqlite/jni/ScalarFunction.java

@@ -0,0 +1,33 @@
+/*
+** 2023-08-25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file is part of the JNI bindings for the sqlite3 C API.
+*/
+package org.sqlite.jni;
+
+
+/**
+   SQLFunction subclass for creating scalar functions.
+*/
+public abstract class ScalarFunction extends SQLFunction {
+  /**
+     As for the xFunc() argument of the C API's
+     sqlite3_create_function(). If this function throws, it is
+     translated into an sqlite3_result_error().
+  */
+  public abstract void xFunc(sqlite3_context cx, sqlite3_value[] args);
+
+  /**
+     Optionally override to be notified when the UDF is finalized by
+     SQLite.
+  */
+  public void xDestroy() {}
+}

ext/jni/src/org/sqlite/jni/TesterFts5.java

@@ -72,16 +72,18 @@ public class TesterFts5 {
     affirm( xDestroyCalled.value );
   }
 
-  public TesterFts5(){
-    int oldAffirmCount = Tester1.affirmCount;
-    Tester1.affirmCount = 0;
-    final long timeStart = System.nanoTime();
-    test1();
-    final long timeEnd = System.nanoTime();
-    outln("FTS5 Tests done. Metrics:");
-    outln("\tAssertions checked: "+Tester1.affirmCount);
-    outln("\tTotal time = "
-          +((timeEnd - timeStart)/1000000.0)+"ms");
-    Tester1.affirmCount = oldAffirmCount;
+  public TesterFts5(boolean verbose){
+    if(verbose){
+      final long timeStart = System.currentTimeMillis();
+      final int oldAffirmCount = Tester1.affirmCount;
+      test1();
+      final int affirmCount = Tester1.affirmCount - oldAffirmCount;
+      final long timeEnd = System.currentTimeMillis();
+      outln("FTS5 Tests done. Assertions checked = ",affirmCount,
+            ", Total time = ",(timeEnd - timeStart),"ms");
+    }else{
+      test1();
+    }
   }
+  public TesterFts5(){ this(false); }
 }

ext/jni/src/org/sqlite/jni/TraceV2Callback.java

@@ -0,0 +1,49 @@
+/*
+** 2023-08-25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file is part of the JNI bindings for the sqlite3 C API.
+*/
+package org.sqlite.jni;
+
+/**
+   Callback proxy for use with sqlite3_trace_v2().
+*/
+public interface TraceV2Callback extends SQLite3CallbackProxy {
+  /**
+     Called by sqlite3 for various tracing operations, as per
+     sqlite3_trace_v2(). Note that this interface elides the 2nd
+     argument to the native trace callback, as that role is better
+     filled by instance-local state.
+
+     These callbacks may throw, in which case their exceptions are
+     converted to C-level error information.
+
+     <p>The 2nd argument to this function, if non-null, will be a an
+     sqlite3 or sqlite3_stmt object, depending on the first argument
+     (see below).
+
+     <p>The final argument to this function is the "X" argument
+     documented for sqlite3_trace() and sqlite3_trace_v2(). Its type
+     depends on value of the first argument:
+
+     <p>- SQLITE_TRACE_STMT: pNative is a sqlite3_stmt. pX is a String
+     containing the prepared SQL.
+
+     <p>- SQLITE_TRACE_PROFILE: pNative is a sqlite3_stmt. pX is a Long
+     holding an approximate number of nanoseconds the statement took
+     to run.
+
+     <p>- SQLITE_TRACE_ROW: pNative is a sqlite3_stmt. pX is null.
+
+     <p>- SQLITE_TRACE_CLOSE: pNative is a sqlite3. pX is null.
+  */
+  int call(int traceFlag, Object pNative, Object pX);
+}

ext/jni/src/org/sqlite/jni/Tracer.java

@@ -1,62 +0,0 @@
-/*
-** 2023-07-22
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This file is part of the JNI bindings for the sqlite3 C API.
-*/
-package org.sqlite.jni;
-
-/**
-   Callback proxy for use with sqlite3_trace_v2().
-*/
-public interface Tracer {
-  /**
-     Achtung: this interface is subject to change because the current
-     approach to mapping the passed-in natives back to Java is
-     uncomfortably quirky.
-
-     Called by sqlite3 for various tracing operations, as per
-     sqlite3_trace_v2(). Note that this interface elides the 2nd
-     argument to the native trace callback, as that role is better
-     filled by instance-local state.
-
-     The 2nd argument to this function, if non-0, will be a native
-     pointer to either an sqlite3 or sqlite3_stmt object, depending on
-     the first argument (see below). Client code can pass it to the
-     sqlite3 resp. sqlite3_stmt constructor to create a wrapping
-     object, if necessary. This API does not do so by default because
-     tracing can be called frequently, creating such a wrapper for
-     each call is comparatively expensive, and the objects are
-     probably only seldom useful.
-
-     The final argument to this function is the "X" argument
-     documented for sqlite3_trace() and sqlite3_trace_v2(). Its type
-     depends on value of the first argument:
-
-     - SQLITE_TRACE_STMT: pNative is a sqlite3_stmt. pX is a string
-       containing the prepared SQL, with one caveat: JNI only provides
-       us with the ability to convert that string to MUTF-8, as
-       opposed to standard UTF-8, and is cannot be ruled out that that
-       difference may be significant for certain inputs. The
-       alternative would be that we first convert it to UTF-16 before
-       passing it on, but there's no readily-available way to do that
-       without calling back into the db to peform the conversion
-       (which would lead to further tracing).
-
-     - SQLITE_TRACE_PROFILE: pNative is a sqlite3_stmt. pX is a Long
-       holding an approximate number of nanoseconds the statement took
-       to run.
-
-     - SQLITE_TRACE_ROW: pNative is a sqlite3_stmt. pX is null.
-
-     - SQLITE_TRACE_CLOSE: pNative is a sqlite3. pX is null.
-  */
-  int xCallback(int traceFlag, Object pNative, Object pX);
-}

ext/jni/src/org/sqlite/jni/UpdateHookCallback.java

@@ -1,5 +1,5 @@
 /*
-** 2023-07-22
+** 2023-08-25
 **
 ** The author disclaims copyright to this source code.  In place of
 ** a legal notice, here is a blessing:
@@ -14,12 +14,12 @@
 package org.sqlite.jni;
 
 /**
-   Callback proxy for use with sqlite3_update_hook().
+   Callback for use with sqlite3_update_hook().
 */
-public interface UpdateHook {
+public interface UpdateHookCallback extends SQLite3CallbackProxy {
   /**
-     Works as documented for the sqlite3_update_hook() callback.
-     Must not throw.
+     Must function as described for the C-level sqlite3_update_hook()
+     callback.  Must not throw.
   */
-  void xUpdateHook(int opId, String dbName, String tableName, long rowId);
+  void call(int opId, String dbName, String tableName, long rowId);
 }

ext/jni/src/org/sqlite/jni/WindowFunction.java

@@ -0,0 +1,39 @@
+/*
+** 2023-08-25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file is part of the JNI bindings for the sqlite3 C API.
+*/
+package org.sqlite.jni;
+
+
+/**
+   An SQLFunction subclass for creating window functions.  Note that
+   Window<T> inherits from Aggregate<T> and each instance is
+   required to implement the inherited abstract methods from that
+   class. See Aggregate<T> for information on managing the UDF's
+   invocation-specific state.
+*/
+public abstract class WindowFunction<T> extends AggregateFunction<T> {
+
+  /**
+     As for the xInverse() argument of the C API's
+     sqlite3_create_window_function(). If this function throws, the
+     exception is not propagated and a warning might be emitted
+     to a debugging channel.
+  */
+  public abstract void xInverse(sqlite3_context cx, sqlite3_value[] args);
+
+  /**
+     As for the xValue() argument of the C API's sqlite3_create_window_function().
+     See xInverse() for the fate of any exceptions this throws.
+  */
+  public abstract void xValue(sqlite3_context cx);
+}

ext/jni/src/org/sqlite/jni/XDestroyCallback.java

@@ -0,0 +1,29 @@
+/*
+** 2023-07-21
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file declares JNI bindings for the sqlite3 C API.
+*/
+package org.sqlite.jni;
+
+/**
+   Callback for a hook called by SQLite when certain client-provided
+   state are destroyed. It gets its name from the pervasive use of
+   the symbol name xDestroy() for this purpose in the C API
+   documentation.
+*/
+public interface XDestroyCallback {
+  /**
+     Must perform any cleanup required by this object. Must not
+     throw. Must not call back into the sqlite3 API, else it might
+     invoke a deadlock.
+  */
+  public void xDestroy();
+}

ext/jni/src/org/sqlite/jni/fts5_tokenizer.java

@@ -30,7 +30,7 @@ public final class fts5_tokenizer extends NativePointerHolder<fts5_tokenizer> {
 
   public native int xTokenize(@NotNull Fts5Tokenizer t, int tokFlags,
                               @NotNull byte pText[],
-                              @NotNull Fts5.xTokenizeCallback callback);
+                              @NotNull Fts5.xTokenize_callback callback);
 
 
   // int (*xTokenize)(Fts5Tokenizer*,

ext/jni/src/org/sqlite/jni/package-info.java

@@ -0,0 +1,43 @@
+/**
+   This package houses a JNI binding to the SQLite3 C API.
+
+   <p>The docs are in progress.
+
+   <p>The primary interfaces are in {@link org.sqlite.jni.SQLite3Jni}.
+
+   <h1>Threading Considerations</h1>
+
+   <p>This API is, if built with SQLITE_THREADSAFE set to 1 or 2,
+   thread-safe, insofar as the C API guarantees, with some addenda:
+
+   <ul>
+
+     <li>It is not legal to use Java-facing SQLite3 resource handles
+     (sqlite3, sqlite3_stmt, etc) from multiple threads concurrently,
+     nor to use any database-specific resources concurrently in a
+     thread separate from the one the database is currently in use
+     in. i.e. do not use a sqlite3_stmt in thread #2 when thread #1 is
+     using the database which prepared that handle.
+
+     <br>Violating this will eventually corrupt the JNI-level bindings
+     between Java's and C's view of the database. This is a limitation
+     of the JNI bindings, not the lower-level library.
+     </li>
+
+     <li>It is legal to use a given handle, and database-specific
+     resources, across threads, so long as no two threads pass
+     resources owned by the same database into the library
+     concurrently.
+     </li>
+
+   </ul>
+
+   <p>Any number of threads may, of course, create and use any number
+   of database handles they wish. Care only needs to be taken when
+   those handles or their associated resources cross threads, or...
+
+   <p>When built with SQLITE_THREADSAFE=0 then no threading guarantees
+   are provided and multi-threaded use of the library will provoke
+   undefined behavior.
+*/
+package org.sqlite.jni;

ext/jni/src/org/sqlite/jni/sqlite3_context.java

@@ -18,34 +18,43 @@ package org.sqlite.jni;
    SQL functions (a.k.a. UDFs).
 */
 public final class sqlite3_context extends NativePointerHolder<sqlite3_context> {
-  /**
-     For use only by the JNI layer. It's permitted to set this even
-     though it's private.
-  */
-  private long aggregateContext = 0;
+  private Long aggregateContext = null;
 
   /**
      getAggregateContext() corresponds to C's
      sqlite3_aggregate_context(), with a slightly different interface
      to account for cross-language differences. It serves the same
      purposes in a slightly different way: it provides a key which is
-     stable across invocations of "matching sets" of a UDF's callbacks,
-     such that all calls into those callbacks can determine which "set"
-     of those calls they belong to.
+     stable across invocations of a UDF's callbacks, such that all
+     calls into those callbacks can determine which "set" of those
+     calls they belong to.
 
-     If this object is being used in the context of an aggregate or
+     <p>Note that use of this method is not a requirement for proper use
+     of this class. sqlite3_aggregate_context() can also be used.
+
+     <p>If the argument is true and the aggregate context has not yet
+     been set up, it will be initialized and fetched on demand, else it
+     won't. The intent is that xStep(), xValue(), and xInverse()
+     methods pass true and xFinal() methods pass false.
+
+     <p>This function treats numeric 0 as null, always returning null instead
+     of 0.
+
+     <p>If this object is being used in the context of an aggregate or
      window UDF, this function returns a non-0 value which is distinct
      for each set of UDF callbacks from a single invocation of the
      UDF, otherwise it returns 0. The returned value is only only
      valid within the context of execution of a single SQL statement,
-     and may be re-used by future invocations of the UDF in different
-     SQL statements.
+     and must not be re-used by future invocations of the UDF in
+     different SQL statements.
 
-     Consider this SQL, where MYFUNC is a user-defined aggregate function:
+     <p>Consider this SQL, where MYFUNC is a user-defined aggregate function:
 
+     <pre>{@code
      SELECT MYFUNC(A), MYFUNC(B) FROM T;
+     }</pre>
 
-     The xStep() and xFinal() methods of the callback need to be able
+     <p>The xStep() and xFinal() methods of the callback need to be able
      to differentiate between those two invocations in order to
      perform their work properly. The value returned by
      getAggregateContext() will be distinct for each of those
@@ -53,14 +62,18 @@ public final class sqlite3_context extends NativePointerHolder<sqlite3_context>
      key for mapping callback invocations to whatever client-defined
      state is needed by the UDF.
 
-     There is one case where this will return 0 in the context of an
-     aggregate or window function: if the result set has no rows,
-     the UDF's xFinal() will be called without any other x...() members
-     having been called. In that one case, no aggregate context key will
-     have been generated. xFinal() implementations need to be prepared to
-     accept that condition as legal.
+     <p>There is one case where this will return null in the context
+     of an aggregate or window function: if the result set has no
+     rows, the UDF's xFinal() will be called without any other x...()
+     members having been called. In that one case, no aggregate
+     context key will have been generated. xFinal() implementations
+     need to be prepared to accept that condition as legal.
   */
-  public long getAggregateContext(){
-    return aggregateContext;
+  public synchronized Long getAggregateContext(boolean initIfNeeded){
+      if( aggregateContext==null ){
+        aggregateContext = SQLite3Jni.sqlite3_aggregate_context(this, initIfNeeded);
+        if( !initIfNeeded && null==aggregateContext ) aggregateContext = 0L;
+      }
+      return (null==aggregateContext || 0!=aggregateContext) ? aggregateContext : null;
   }
 }

ext/jni/src/org/sqlite/jni/tester/SQLTester.java

@@ -250,14 +250,14 @@ public class SQLTester {
   }
 
   public void runTests() throws Exception {
-    final long tStart = System.nanoTime();
+    final long tStart = System.currentTimeMillis();
     for(String f : listInFiles){
       reset();
       ++nTestFile;
       final TestScript ts = new TestScript(f);
       outln(nextStartEmoji(), " starting [",f,"]");
       boolean threw = false;
-      final long timeStart = System.nanoTime();
+      final long timeStart = System.currentTimeMillis();
       try{
         ts.run(this);
       }catch(SQLTesterException e){
@@ -267,14 +267,14 @@ public class SQLTester {
         if( keepGoing ) outln("Continuing anyway becaure of the keep-going option.");
         else if( e.isFatal() ) throw e;
       }finally{
-        final long timeEnd = System.nanoTime();
+        final long timeEnd = System.currentTimeMillis();
         outln("🏁",(threw ? "❌" : "✅")," ",nTest," test(s) in ",
-              ((timeEnd-timeStart)/1000000.0),"ms.");
+              (timeEnd-timeStart),"ms.");
         //ts.getFilename());
       }
     }
-    final long tEnd = System.nanoTime();
-    outln("Total run-time: ",((tEnd-tStart)/1000000.0),"ms");
+    final long tEnd = System.currentTimeMillis();
+    outln("Total run-time: ",(tEnd-tStart),"ms");
     Util.unlink(initialDbName);
   }
 
@@ -609,9 +609,9 @@ public class SQLTester {
       }
       t.addTestScript(a);
     }
-    final AutoExtension ax = new AutoExtension() {
+    final AutoExtensionCallback ax = new AutoExtensionCallback() {
         private final SQLTester tester = t;
-        public int xEntryPoint(sqlite3 db){
+        @Override public int call(sqlite3 db){
           final String init = tester.getDbInitSql();
           if( !init.isEmpty() ){
             tester.execSql(db, true, ResultBufferMode.NONE, null, init);
@@ -629,7 +629,7 @@ public class SQLTester {
         t.outln("Aborted ",t.nAbortedScript," script(s).");
       }
       if( dumpInternals ){
-        sqlite3_do_something_for_developer();
+        sqlite3_jni_internal_details();
       }
     }
   }

ext/session/changebatch1.test

@@ -1,222 +0,0 @@
-# 2016 August 23
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-# This file implements regression tests for SQLite library.
-#
-
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
-source $testdir/tester.tcl
-ifcapable !session {finish_test; return}
-
-set testprefix changebatch1
-
-
-proc sql_to_changeset {method sql} {
-  sqlite3session S db main
-  S attach *
-  execsql $sql
-  set ret [S $method]
-  S delete
-  return $ret
-}
-
-proc do_changebatch_test {tn method args} {
-  set C [list]
-  foreach a $args {
-    lappend C [sql_to_changeset $method $a]
-  }
-
-  sqlite3changebatch cb db
-  set i 1
-  foreach ::cs [lrange $C 0 end-1] {
-    set rc [cb add $::cs]
-    if {$rc!="SQLITE_OK"} { error "expected SQLITE_OK, got $rc (i=$i)" }
-    incr i
-  }
-
-  set ::cs [lindex $C end]
-  do_test $tn { cb add [set ::cs] } SQLITE_CONSTRAINT
-  cb delete
-}
-
-proc do_changebatch_test1 {tn args} {
-  uplevel do_changebatch_test $tn changeset $args
-}
-proc do_changebatch_test2 {tn args} {
-  uplevel do_changebatch_test $tn fullchangeset $args
-}
-
-#-------------------------------------------------------------------------
-# The body of the following loop contains tests for database schemas
-# that do not feature multi-column UNIQUE constraints. In this case
-# it doesn't matter if the changesets are generated using
-# sqlite3session_changeset() or sqlite3session_fullchangeset().
-#
-foreach {tn testfunction} {
-  1 do_changebatch_test1
-  2 do_changebatch_test2
-} {
-  reset_db
-
-  #-------------------------------------------------------------------------
-  #
-  do_execsql_test $tn.1.0 {
-    CREATE TABLE t1(a PRIMARY KEY, b);
-  }
-  
-  $testfunction $tn.1.1 {
-    INSERT INTO t1 VALUES(1, 1);
-  } {
-    DELETE FROM t1 WHERE a=1;
-  }
-  
-  do_execsql_test $tn.1.2.0 {
-    INSERT INTO t1 VALUES(1, 1);
-    INSERT INTO t1 VALUES(2, 2);
-    INSERT INTO t1 VALUES(3, 3);
-  }
-  $testfunction $tn.1.2.1 {
-    DELETE FROM t1 WHERE a=2;
-  } {
-    INSERT INTO t1 VALUES(2, 2);
-  }
-  
-  #-------------------------------------------------------------------------
-  #
-  do_execsql_test $tn.2.0 {
-    CREATE TABLE x1(a, b PRIMARY KEY, c UNIQUE);
-    CREATE TABLE x2(a PRIMARY KEY, b UNIQUE, c UNIQUE);
-    CREATE INDEX x1a ON x1(a);
-  
-    INSERT INTO x1 VALUES(1, 1, 'a');
-    INSERT INTO x1 VALUES(1, 2, 'b');
-    INSERT INTO x1 VALUES(1, 3, 'c');
-  }
-  
-  $testfunction $tn.2.1 {
-    DELETE FROM x1 WHERE b=2;
-  } {
-    UPDATE x1 SET c='b' WHERE b=3;
-  }
-  
-  $testfunction $tn.2.2 {
-    DELETE FROM x1 WHERE b=1;
-  } {
-    INSERT INTO x1 VALUES(1, 5, 'a');
-  }
-
-  set L [list]
-  for {set i 1000} {$i < 10000} {incr i} {
-    lappend L "INSERT INTO x2 VALUES($i, $i, 'x' || $i)"
-  }
-  lappend L "DELETE FROM x2 WHERE b=1005"
-  $testfunction $tn.2.3 {*}$L
-
-  execsql { INSERT INTO x1 VALUES('f', 'f', 'f') }
-  $testfunction $tn.2.4 {
-    INSERT INTO x2 VALUES('f', 'f', 'f');
-  } {
-    INSERT INTO x1 VALUES('g', 'g', 'g');
-  } {
-    DELETE FROM x1 WHERE b='f';
-  } {
-    INSERT INTO x2 VALUES('g', 'g', 'g');
-  } {
-    INSERT INTO x1 VALUES('f', 'f', 'f');
-  }
-
-  execsql {
-    DELETE FROM x1;
-    INSERT INTO x1 VALUES(1.5, 1.5, 1.5);
-  }
-  $testfunction $tn.2.5 {
-    DELETE FROM x1 WHERE b BETWEEN 1 AND 2;
-  } {
-    INSERT INTO x1 VALUES(2.5, 2.5, 2.5);
-  } {
-    INSERT INTO x1 VALUES(1.5, 1.5, 1.5);
-  }
-
-  execsql {
-    DELETE FROM x2;
-    INSERT INTO x2 VALUES(X'abcd', X'1234', X'7890');
-    INSERT INTO x2 VALUES(X'0000', X'0000', X'0000');
-  }
-  breakpoint
-  $testfunction $tn.2.6 {
-    UPDATE x2 SET c = X'1234' WHERE a=X'abcd';
-    INSERT INTO x2 VALUES(X'1234', X'abcd', X'7890');
-  } {
-    DELETE FROM x2 WHERE b=X'0000';
-  } {
-    INSERT INTO x2 VALUES(1, X'0000', NULL);
-  }
-}
-
-#-------------------------------------------------------------------------
-# Test some multi-column UNIQUE constraints. First Using _changeset() to
-# demonstrate the problem, then using _fullchangeset() to show that it has
-# been fixed.
-#
-reset_db
-do_execsql_test 3.0 {
-  CREATE TABLE y1(a PRIMARY KEY, b, c, UNIQUE(b, c));
-  INSERT INTO y1 VALUES(1, 1, 1);
-  INSERT INTO y1 VALUES(2, 2, 2);
-  INSERT INTO y1 VALUES(3, 3, 3);
-  INSERT INTO y1 VALUES(4, 3, 4);
-  BEGIN;
-}
-
-do_test 3.1.1 {
-  set c1 [sql_to_changeset changeset { DELETE FROM y1 WHERE a=4    }]
-  set c2 [sql_to_changeset changeset { UPDATE y1 SET c=4 WHERE a=3 }]
-  sqlite3changebatch cb db
-  cb add $c1
-  cb add $c2
-} {SQLITE_OK}
-do_test 3.1.2 {
-  cb delete
-  execsql ROLLBACK
-} {}
-
-do_test 3.1.1 {
-  set c1 [sql_to_changeset fullchangeset { DELETE FROM y1 WHERE a=4    }]
-  set c2 [sql_to_changeset fullchangeset { UPDATE y1 SET c=4 WHERE a=3 }]
-  sqlite3changebatch cb db
-  cb add $c1
-  cb add $c2
-} {SQLITE_OK}
-do_test 3.1.2 {
-  cb delete
-} {}
-
-#-------------------------------------------------------------------------
-#
-reset_db
-do_execsql_test 4.0 {
-  CREATE TABLE t1(x, y, z, PRIMARY KEY(x, y), UNIQUE(z));
-}
-
-do_test 4.1 {
-  set c1 [sql_to_changeset fullchangeset { INSERT INTO t1 VALUES(1, 2, 3) }]
-  execsql {
-    DROP TABLE t1;
-    CREATE TABLE t1(w, x, y, z, PRIMARY KEY(x, y), UNIQUE(z));
-  }
-  sqlite3changebatch cb db
-  list [catch { cb add $c1 } msg] $msg
-} {1 SQLITE_RANGE}
-
-cb delete
-
-finish_test

ext/session/changebatchfault.test

@@ -1,42 +0,0 @@
-# 2011 Mar 21
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-#
-# The focus of this file is testing the session module.
-#
-
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
-source [file join [file dirname [info script]] session_common.tcl]
-source $testdir/tester.tcl
-ifcapable !session {finish_test; return}
-set testprefix changebatchfault
-
-do_execsql_test 1.0 {
-  CREATE TABLE t1(a, b, c PRIMARY KEY, UNIQUE(a, b));
-  INSERT INTO t1 VALUES('a', 'a', 'a');
-  INSERT INTO t1 VALUES('b', 'b', 'b');
-}
-
-set ::c1 [changeset_from_sql { delete from t1 where c='a' }]
-set ::c2 [changeset_from_sql { insert into t1 values('c', 'c', 'c') }]
-
-do_faultsim_test 1 -faults oom-* -body {
-  sqlite3changebatch cb db
-  cb add $::c1
-  cb add $::c2
-} -test {
-  faultsim_test_result {0 SQLITE_OK} {1 SQLITE_NOMEM}
-  catch { cb delete }
-}
-
-
-finish_test

ext/session/sessionH.test

@@ -29,7 +29,7 @@ do_test 1.0 {
     WITH s(i) AS (
       VALUES(1) UNION ALL SELECT i+1 FROM s WHERe i<10000
     )
-    INSERT INTO t1 SELECT 'abcde', randomblob(18), i FROM s;
+    INSERT INTO t1 SELECT 'abcde', randomblob(16), i FROM s;
   }
   compare_db db db2
 } {}

ext/session/sqlite3changebatch.c

@@ -1,485 +0,0 @@
-
-#if !defined(SQLITE_TEST) || (defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK))
-
-#include "sqlite3session.h"
-#include "sqlite3changebatch.h"
-
-#include <assert.h>
-#include <string.h>
-
-typedef struct BatchTable BatchTable;
-typedef struct BatchIndex BatchIndex;
-typedef struct BatchIndexEntry BatchIndexEntry;
-typedef struct BatchHash BatchHash;
-
-struct sqlite3_changebatch {
-  sqlite3 *db;                    /* Database handle used to read schema */
-  BatchTable *pTab;               /* First in linked list of tables */
-  int iChangesetId;               /* Current changeset id */
-  int iNextIdxId;                 /* Next available index id */
-  int nEntry;                     /* Number of entries in hash table */
-  int nHash;                      /* Number of hash buckets */
-  BatchIndexEntry **apHash;       /* Array of hash buckets */
-};
-
-struct BatchTable {
-  BatchIndex *pIdx;               /* First in linked list of UNIQUE indexes */
-  BatchTable *pNext;              /* Next table */
-  char zTab[1];                   /* Table name */
-};
-
-struct BatchIndex {
-  BatchIndex *pNext;              /* Next index on same table */
-  int iId;                        /* Index id (assigned internally) */
-  int bPk;                        /* True for PK index */
-  int nCol;                       /* Size of aiCol[] array */
-  int *aiCol;                     /* Array of columns that make up index */
-};
-
-struct BatchIndexEntry {
-  BatchIndexEntry *pNext;         /* Next colliding hash table entry */
-  int iChangesetId;               /* Id of associated changeset */
-  int iIdxId;                     /* Id of index this key is from */
-  int szRecord;
-  char aRecord[1];
-};
-
-/*
-** Allocate and zero a block of nByte bytes. Must be freed using cbFree().
-*/
-static void *cbMalloc(int *pRc, int nByte){
-  void *pRet;
-
-  if( *pRc ){
-    pRet = 0;
-  }else{
-    pRet = sqlite3_malloc(nByte);
-    if( pRet ){
-      memset(pRet, 0, nByte);
-    }else{
-      *pRc = SQLITE_NOMEM;
-    }
-  }
-
-  return pRet;
-}
-
-/*
-** Free an allocation made by cbMalloc().
-*/
-static void cbFree(void *p){
-  sqlite3_free(p);
-}
-
-/*
-** Return the hash bucket that pEntry belongs in.
-*/
-static int cbHash(sqlite3_changebatch *p, BatchIndexEntry *pEntry){
-  unsigned int iHash = (unsigned int)pEntry->iIdxId;
-  unsigned char *pEnd = (unsigned char*)&pEntry->aRecord[pEntry->szRecord];
-  unsigned char *pIter;
-
-  for(pIter=(unsigned char*)pEntry->aRecord; pIter<pEnd; pIter++){
-    iHash += (iHash << 7) + *pIter;
-  }
-
-  return (int)(iHash % p->nHash);
-}
-
-/*
-** Resize the hash table.
-*/
-static int cbHashResize(sqlite3_changebatch *p){
-  int rc = SQLITE_OK;
-  BatchIndexEntry **apNew;
-  int nNew = (p->nHash ? p->nHash*2 : 512);
-  int i;
-
-  apNew = cbMalloc(&rc, sizeof(BatchIndexEntry*) * nNew);
-  if( rc==SQLITE_OK ){
-    int nHash = p->nHash;
-    p->nHash = nNew;
-    for(i=0; i<nHash; i++){
-      BatchIndexEntry *pEntry;
-      while( (pEntry=p->apHash[i])!=0 ){
-        int iHash = cbHash(p, pEntry);
-        p->apHash[i] = pEntry->pNext;
-        pEntry->pNext = apNew[iHash];
-        apNew[iHash] = pEntry;
-      }
-    }
-
-    cbFree(p->apHash);
-    p->apHash = apNew;
-  }
-
-  return rc;
-}
-
-
-/*
-** Allocate a new sqlite3_changebatch object.
-*/
-int sqlite3changebatch_new(sqlite3 *db, sqlite3_changebatch **pp){
-  sqlite3_changebatch *pRet;
-  int rc = SQLITE_OK;
-  *pp = pRet = (sqlite3_changebatch*)cbMalloc(&rc, sizeof(sqlite3_changebatch));
-  if( pRet ){
-    pRet->db = db;
-  }
-  return rc;
-}
-
-/*
-** Add a BatchIndex entry for index zIdx to table pTab.
-*/
-static int cbAddIndex(
-  sqlite3_changebatch *p, 
-  BatchTable *pTab, 
-  const char *zIdx, 
-  int bPk
-){
-  int nCol = 0;
-  sqlite3_stmt *pIndexInfo = 0;
-  BatchIndex *pNew = 0;
-  int rc;
-  char *zIndexInfo;
-
-  zIndexInfo = (char*)sqlite3_mprintf("PRAGMA main.index_info = %Q", zIdx);
-  if( zIndexInfo ){
-    rc = sqlite3_prepare_v2(p->db, zIndexInfo, -1, &pIndexInfo, 0);
-    sqlite3_free(zIndexInfo);
-  }else{
-    rc = SQLITE_NOMEM;
-  }
-
-  if( rc==SQLITE_OK ){
-    while( SQLITE_ROW==sqlite3_step(pIndexInfo) ){ nCol++; }
-    rc = sqlite3_reset(pIndexInfo);
-  }
-
-  pNew = (BatchIndex*)cbMalloc(&rc, sizeof(BatchIndex) + sizeof(int) * nCol);
-  if( rc==SQLITE_OK ){
-    pNew->nCol = nCol;
-    pNew->bPk = bPk;
-    pNew->aiCol = (int*)&pNew[1];
-    pNew->iId = p->iNextIdxId++;
-    while( SQLITE_ROW==sqlite3_step(pIndexInfo) ){ 
-      int i = sqlite3_column_int(pIndexInfo, 0);
-      int j = sqlite3_column_int(pIndexInfo, 1);
-      pNew->aiCol[i] = j;
-    }
-    rc = sqlite3_reset(pIndexInfo);
-  }
-
-  if( rc==SQLITE_OK ){
-    pNew->pNext = pTab->pIdx;
-    pTab->pIdx = pNew;
-  }else{
-    cbFree(pNew);
-  }
-  sqlite3_finalize(pIndexInfo);
-
-  return rc;
-}
-
-/*
-** Free the object passed as the first argument.
-*/
-static void cbFreeTable(BatchTable *pTab){
-  BatchIndex *pIdx;
-  BatchIndex *pIdxNext;
-  for(pIdx=pTab->pIdx; pIdx; pIdx=pIdxNext){
-    pIdxNext = pIdx->pNext;
-    cbFree(pIdx);
-  }
-  cbFree(pTab);
-}
-
-/*
-** Find or create the BatchTable object named zTab.
-*/
-static int cbFindTable(
-  sqlite3_changebatch *p, 
-  const char *zTab, 
-  BatchTable **ppTab
-){
-  BatchTable *pRet = 0;
-  int rc = SQLITE_OK;
-
-  for(pRet=p->pTab; pRet; pRet=pRet->pNext){
-    if( 0==sqlite3_stricmp(zTab, pRet->zTab) ) break;
-  }
-
-  if( pRet==0 ){
-    int nTab = strlen(zTab);
-    pRet = (BatchTable*)cbMalloc(&rc, nTab + sizeof(BatchTable));
-    if( pRet ){
-      sqlite3_stmt *pIndexList = 0;
-      char *zIndexList = 0;
-      int rc2;
-      memcpy(pRet->zTab, zTab, nTab);
-
-      zIndexList = sqlite3_mprintf("PRAGMA main.index_list = %Q", zTab);
-      if( zIndexList==0 ){
-        rc = SQLITE_NOMEM;
-      }else{
-        rc = sqlite3_prepare_v2(p->db, zIndexList, -1, &pIndexList, 0);
-        sqlite3_free(zIndexList);
-      }
-
-      while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pIndexList) ){
-        if( sqlite3_column_int(pIndexList, 2) ){
-          const char *zIdx = (const char*)sqlite3_column_text(pIndexList, 1);
-          const char *zTyp = (const char*)sqlite3_column_text(pIndexList, 3);
-          rc = cbAddIndex(p, pRet, zIdx, (zTyp[0]=='p'));
-        }
-      }
-      rc2 = sqlite3_finalize(pIndexList);
-      if( rc==SQLITE_OK ) rc = rc2;
-
-      if( rc==SQLITE_OK ){
-        pRet->pNext = p->pTab;
-        p->pTab = pRet;
-      }else{
-        cbFreeTable(pRet);
-        pRet = 0;
-      }
-    }
-  }
-
-  *ppTab = pRet;
-  return rc;
-}
-
-/*
-** Extract value iVal from the changeset iterator passed as the first
-** argument. Set *ppVal to point to the value before returning.
-**
-** This function attempts to extract the value using function xVal
-** (which is always either sqlite3changeset_new or sqlite3changeset_old).
-** If the call returns SQLITE_OK but does not supply an sqlite3_value*
-** pointer, an attempt to extract the value is made using the xFallback 
-** function.
-*/
-static int cbGetChangesetValue(
-  sqlite3_changeset_iter *pIter, 
-  int (*xVal)(sqlite3_changeset_iter*,int,sqlite3_value**),
-  int (*xFallback)(sqlite3_changeset_iter*,int,sqlite3_value**),
-  int iVal,
-  sqlite3_value **ppVal
-){
-  int rc = xVal(pIter, iVal, ppVal);
-  if( rc==SQLITE_OK && *ppVal==0 && xFallback ){
-    rc = xFallback(pIter, iVal, ppVal);
-  }
-  return rc;
-}
-
-static int cbAddToHash(
-  sqlite3_changebatch *p, 
-  sqlite3_changeset_iter *pIter, 
-  BatchIndex *pIdx, 
-  int (*xVal)(sqlite3_changeset_iter*,int,sqlite3_value**),
-  int (*xFallback)(sqlite3_changeset_iter*,int,sqlite3_value**),
-  int *pbConf
-){
-  BatchIndexEntry *pNew;
-  int sz = pIdx->nCol;
-  int i;
-  int iOut = 0;
-  int rc = SQLITE_OK;
-
-  for(i=0; rc==SQLITE_OK && i<pIdx->nCol; i++){
-    sqlite3_value *pVal;
-    rc = cbGetChangesetValue(pIter, xVal, xFallback, pIdx->aiCol[i], &pVal);
-    if( rc==SQLITE_OK ){
-      int eType = 0;
-      if( pVal ) eType = sqlite3_value_type(pVal);
-      switch( eType ){
-        case 0:
-        case SQLITE_NULL:
-          return SQLITE_OK;
-
-        case SQLITE_INTEGER:
-          sz += 8;
-          break;
-        case SQLITE_FLOAT:
-          sz += 8;
-          break;
-
-        default:
-          assert( eType==SQLITE_TEXT || eType==SQLITE_BLOB );
-          sz += sqlite3_value_bytes(pVal);
-          break;
-      }
-    }
-  }
-
-  pNew = cbMalloc(&rc, sizeof(BatchIndexEntry) + sz);
-  if( pNew ){
-    pNew->iChangesetId = p->iChangesetId;
-    pNew->iIdxId = pIdx->iId;
-    pNew->szRecord = sz;
-
-    for(i=0; i<pIdx->nCol; i++){
-      int eType;
-      sqlite3_value *pVal;
-      rc = cbGetChangesetValue(pIter, xVal, xFallback, pIdx->aiCol[i], &pVal);
-      if( rc!=SQLITE_OK ) break;  /* coverage: condition is never true */
-      eType = sqlite3_value_type(pVal);
-      pNew->aRecord[iOut++] = eType;
-      switch( eType ){
-        case SQLITE_INTEGER: {
-          sqlite3_int64 i64 = sqlite3_value_int64(pVal);
-          memcpy(&pNew->aRecord[iOut], &i64, 8);
-          iOut += 8;
-          break;
-        }
-        case SQLITE_FLOAT: {
-          double d64 = sqlite3_value_double(pVal);
-          memcpy(&pNew->aRecord[iOut], &d64, sizeof(double));
-          iOut += sizeof(double);
-          break;
-        }
-
-        default: {
-          int nByte = sqlite3_value_bytes(pVal);
-          const char *z = (const char*)sqlite3_value_blob(pVal);
-          memcpy(&pNew->aRecord[iOut], z, nByte);
-          iOut += nByte;
-          break;
-        }
-      }
-    }
-  }
-
-  if( rc==SQLITE_OK && p->nEntry>=(p->nHash/2) ){
-    rc = cbHashResize(p);
-  }
-
-  if( rc==SQLITE_OK ){
-    BatchIndexEntry *pIter;
-    int iHash = cbHash(p, pNew);
-
-    assert( iHash>=0 && iHash<p->nHash );
-    for(pIter=p->apHash[iHash]; pIter; pIter=pIter->pNext){
-      if( pNew->szRecord==pIter->szRecord 
-       && 0==memcmp(pNew->aRecord, pIter->aRecord, pNew->szRecord)
-      ){
-        if( pNew->iChangesetId!=pIter->iChangesetId ){
-          *pbConf = 1;
-        }
-        cbFree(pNew);
-        pNew = 0;
-        break;
-      }
-    }
-
-    if( pNew ){
-      pNew->pNext = p->apHash[iHash];
-      p->apHash[iHash] = pNew;
-      p->nEntry++;
-    }
-  }else{
-    cbFree(pNew);
-  }
-
-  return rc;
-}
-
-
-/*
-** Add a changeset to the current batch.
-*/
-int sqlite3changebatch_add(sqlite3_changebatch *p, void *pBuf, int nBuf){
-  sqlite3_changeset_iter *pIter;  /* Iterator opened on pBuf/nBuf */
-  int rc;                         /* Return code */
-  int bConf = 0;                  /* Conflict was detected */
-
-  rc = sqlite3changeset_start(&pIter, nBuf, pBuf);
-  if( rc==SQLITE_OK ){
-    int rc2;
-    for(rc2 = sqlite3changeset_next(pIter);
-        rc2==SQLITE_ROW;
-        rc2 = sqlite3changeset_next(pIter)
-    ){
-      BatchTable *pTab;
-      BatchIndex *pIdx;
-      const char *zTab;           /* Table this change applies to */
-      int nCol;                   /* Number of columns in table */
-      int op;                     /* UPDATE, INSERT or DELETE */
-
-      sqlite3changeset_op(pIter, &zTab, &nCol, &op, 0);
-      assert( op==SQLITE_INSERT || op==SQLITE_UPDATE || op==SQLITE_DELETE );
-
-      rc = cbFindTable(p, zTab, &pTab);
-      assert( pTab || rc!=SQLITE_OK );
-      if( pTab ){
-        for(pIdx=pTab->pIdx; pIdx && rc==SQLITE_OK; pIdx=pIdx->pNext){
-          if( op==SQLITE_UPDATE && pIdx->bPk ) continue;
-          if( op==SQLITE_UPDATE || op==SQLITE_DELETE ){
-            rc = cbAddToHash(p, pIter, pIdx, sqlite3changeset_old, 0, &bConf);
-          }
-          if( op==SQLITE_UPDATE || op==SQLITE_INSERT ){
-            rc = cbAddToHash(p, pIter, pIdx, 
-                sqlite3changeset_new, sqlite3changeset_old, &bConf
-            );
-          }
-        }
-      }
-      if( rc!=SQLITE_OK ) break;
-    }
-
-    rc2 = sqlite3changeset_finalize(pIter);
-    if( rc==SQLITE_OK ) rc = rc2;
-  }
-
-  if( rc==SQLITE_OK && bConf ){
-    rc = SQLITE_CONSTRAINT;
-  }
-  p->iChangesetId++;
-  return rc;
-}
-
-/*
-** Zero an existing changebatch object.
-*/
-void sqlite3changebatch_zero(sqlite3_changebatch *p){
-  int i;
-  for(i=0; i<p->nHash; i++){
-    BatchIndexEntry *pEntry;
-    BatchIndexEntry *pNext;
-    for(pEntry=p->apHash[i]; pEntry; pEntry=pNext){
-      pNext = pEntry->pNext;
-      cbFree(pEntry);
-    }
-  }
-  cbFree(p->apHash);
-  p->nHash = 0;
-  p->apHash = 0;
-}
-
-/*
-** Delete a changebatch object.
-*/
-void sqlite3changebatch_delete(sqlite3_changebatch *p){
-  BatchTable *pTab;
-  BatchTable *pTabNext;
-
-  sqlite3changebatch_zero(p);
-  for(pTab=p->pTab; pTab; pTab=pTabNext){
-    pTabNext = pTab->pNext;
-    cbFreeTable(pTab);
-  }
-  cbFree(p);
-}
-
-/*
-** Return the db handle.
-*/
-sqlite3 *sqlite3changebatch_db(sqlite3_changebatch *p){
-  return p->db;
-}
-
-#endif /* SQLITE_ENABLE_SESSION && SQLITE_ENABLE_PREUPDATE_HOOK */

ext/session/sqlite3changebatch.h

@@ -1,82 +0,0 @@
-
-#if !defined(SQLITECHANGEBATCH_H_) 
-#define SQLITECHANGEBATCH_H_ 1
-
-typedef struct sqlite3_changebatch sqlite3_changebatch;
-
-/*
-** Create a new changebatch object for detecting conflicts between
-** changesets associated with a schema equivalent to that of the "main"
-** database of the open database handle db passed as the first
-** parameter. It is the responsibility of the caller to ensure that
-** the database handle is not closed until after the changebatch
-** object has been deleted.
-**
-** A changebatch object is used to detect batches of non-conflicting
-** changesets. Changesets that do not conflict may be applied to the 
-** target database in any order without affecting the final state of 
-** the database.
-**
-** The changebatch object only works reliably if PRIMARY KEY and UNIQUE
-** constraints on tables affected by the changesets use collation
-** sequences that are equivalent to built-in collation sequence 
-** BINARY for the == operation.
-**
-** If successful, SQLITE_OK is returned and (*pp) set to point to
-** the new changebatch object. If an error occurs, an SQLite error
-** code is returned and the final value of (*pp) is undefined.
-*/
-int sqlite3changebatch_new(sqlite3 *db, sqlite3_changebatch **pp);
-
-/*
-** Argument p points to a buffer containing a changeset n bytes in
-** size. Assuming no error occurs, this function returns SQLITE_OK
-** if the changeset does not conflict with any changeset passed 
-** to an sqlite3changebatch_add() call made on the same 
-** sqlite3_changebatch* handle since the most recent call to
-** sqlite3changebatch_zero(). If the changeset does conflict with 
-** an earlier such changeset, SQLITE_CONSTRAINT is returned. Or, 
-** if an error occurs, some other SQLite error code may be returned.
-**
-** One changeset is said to conflict with another if
-** either:
-**
-**   * the two changesets contain operations (INSERT, UPDATE or 
-**     DELETE) on the same row, identified by primary key, or
-**
-**   * the two changesets contain operations (INSERT, UPDATE or 
-**     DELETE) on rows with identical values in any combination 
-**     of fields constrained by a UNIQUE constraint.
-**
-** Even if this function returns SQLITE_CONFLICT, the current
-** changeset is added to the internal data structures - so future
-** calls to this function may conflict with it. If this function
-** returns any result code other than SQLITE_OK or SQLITE_CONFLICT,
-** the result of any future call to sqlite3changebatch_add() is
-** undefined.
-**
-** Only changesets may be passed to this function. Passing a 
-** patchset to this function results in an SQLITE_MISUSE error.
-*/
-int sqlite3changebatch_add(sqlite3_changebatch*, void *p, int n);
-
-/*
-** Zero a changebatch object. This causes the records of all earlier 
-** calls to sqlite3changebatch_add() to be discarded.
-*/
-void sqlite3changebatch_zero(sqlite3_changebatch*);
-
-/*
-** Return a copy of the first argument passed to the sqlite3changebatch_new()
-** call used to create the changebatch object passed as the only argument
-** to this function.
-*/
-sqlite3 *sqlite3changebatch_db(sqlite3_changebatch*);
-
-/*
-** Delete a changebatch object.
-*/
-void sqlite3changebatch_delete(sqlite3_changebatch*);
-
-#endif /* !defined(SQLITECHANGEBATCH_H_) */
-

ext/session/sqlite3session.c

@@ -27,13 +27,6 @@ typedef struct SessionInput SessionInput;
 
 #define SESSIONS_ROWID "_rowid_"
 
-/*
-** The three different types of changesets generated.
-*/
-#define SESSIONS_PATCHSET      0
-#define SESSIONS_CHANGESET     1
-#define SESSIONS_FULLCHANGESET 2
-
 static int sessions_strm_chunk_size = SESSIONS_STRM_CHUNK_SIZE;
 
 typedef struct SessionHook SessionHook;
@@ -2351,7 +2344,7 @@ static void sessionAppendCol(
 */ 
 static int sessionAppendUpdate(
   SessionBuffer *pBuf,            /* Buffer to append to */
-  int ePatchset,                  /* True for "patchset", 0 for "changeset" */
+  int bPatchset,                  /* True for "patchset", 0 for "changeset" */
   sqlite3_stmt *pStmt,            /* Statement handle pointing at new row */
   SessionChange *p,               /* Object containing old values */
   u8 *abPK                        /* Boolean array - true for PK columns */
@@ -2415,8 +2408,8 @@ static int sessionAppendUpdate(
 
     /* Add a field to the old.* record. This is omitted if this module is
     ** currently generating a patchset. */
-    if( ePatchset!=SESSIONS_PATCHSET ){
-      if( ePatchset==SESSIONS_FULLCHANGESET || bChanged || abPK[i] ){
+    if( bPatchset==0 ){
+      if( bChanged || abPK[i] ){
         sessionAppendBlob(pBuf, pCsr, nAdvance, &rc);
       }else{
         sessionAppendByte(pBuf, 0, &rc);
@@ -2425,7 +2418,7 @@ static int sessionAppendUpdate(
 
     /* Add a field to the new.* record. Or the only record if currently
     ** generating a patchset.  */
-    if( bChanged || (ePatchset==SESSIONS_PATCHSET && abPK[i]) ){
+    if( bChanged || (bPatchset && abPK[i]) ){
       sessionAppendCol(&buf2, pStmt, i, &rc);
     }else{
       sessionAppendByte(&buf2, 0, &rc);
@@ -2451,7 +2444,7 @@ static int sessionAppendUpdate(
 */
 static int sessionAppendDelete(
   SessionBuffer *pBuf,            /* Buffer to append to */
-  int eChangeset,                 /* One of SESSIONS_CHANGESET etc. */
+  int bPatchset,                  /* True for "patchset", 0 for "changeset" */
   SessionChange *p,               /* Object containing old values */
   int nCol,                       /* Number of columns in table */
   u8 *abPK                        /* Boolean array - true for PK columns */
@@ -2461,7 +2454,7 @@ static int sessionAppendDelete(
   sessionAppendByte(pBuf, SQLITE_DELETE, &rc);
   sessionAppendByte(pBuf, p->bIndirect, &rc);
 
-  if( eChangeset!=SESSIONS_PATCHSET ){
+  if( bPatchset==0 ){
     sessionAppendBlob(pBuf, p->aRecord, p->nRecord, &rc);
   }else{
     int i;
@@ -2687,12 +2680,12 @@ static int sessionSelectBind(
 */
 static void sessionAppendTableHdr(
   SessionBuffer *pBuf,            /* Append header to this buffer */
-  int ePatchset,                  /* Use the patchset format if true */
+  int bPatchset,                  /* Use the patchset format if true */
   SessionTable *pTab,             /* Table object to append header for */
   int *pRc                        /* IN/OUT: Error code */
 ){
   /* Write a table header */
-  sessionAppendByte(pBuf, (ePatchset==SESSIONS_PATCHSET) ? 'P' : 'T', pRc);
+  sessionAppendByte(pBuf, (bPatchset ? 'P' : 'T'), pRc);
   sessionAppendVarint(pBuf, pTab->nCol, pRc);
   sessionAppendBlob(pBuf, pTab->abPK, pTab->nCol, pRc);
   sessionAppendBlob(pBuf, (u8 *)pTab->zName, (int)strlen(pTab->zName)+1, pRc);
@@ -2710,7 +2703,7 @@ static void sessionAppendTableHdr(
 */
 static int sessionGenerateChangeset(
   sqlite3_session *pSession,      /* Session object */
-  int ePatchset,                  /* One of SESSIONS_CHANGESET etc. */
+  int bPatchset,                  /* True for patchset, false for changeset */
   int (*xOutput)(void *pOut, const void *pData, int nData),
   void *pOut,                     /* First argument for xOutput */
   int *pnChangeset,               /* OUT: Size of buffer at *ppChangeset */
@@ -2765,7 +2758,7 @@ static int sessionGenerateChangeset(
       }
 
       /* Write a table header */
-      sessionAppendTableHdr(&buf, ePatchset, pTab, &rc);
+      sessionAppendTableHdr(&buf, bPatchset, pTab, &rc);
 
       /* Build and compile a statement to execute: */
       if( rc==SQLITE_OK ){
@@ -2791,10 +2784,10 @@ static int sessionGenerateChangeset(
               }
             }else{
               assert( abPK!=0 );  /* Because sessionSelectStmt() returned ok */
-              rc = sessionAppendUpdate(&buf, ePatchset, pSel, p, abPK);
+              rc = sessionAppendUpdate(&buf, bPatchset, pSel, p, abPK);
             }
           }else if( p->op!=SQLITE_INSERT ){
-            rc = sessionAppendDelete(&buf, ePatchset, p, nCol, abPK);
+            rc = sessionAppendDelete(&buf, bPatchset, p, nCol, abPK);
           }
           if( rc==SQLITE_OK ){
             rc = sqlite3_reset(pSel);
@@ -2854,8 +2847,7 @@ int sqlite3session_changeset(
   int rc;
 
   if( pnChangeset==0 || ppChangeset==0 ) return SQLITE_MISUSE;
-  rc = sessionGenerateChangeset(
-      pSession, SESSIONS_CHANGESET, 0, 0, pnChangeset, ppChangeset);
+  rc = sessionGenerateChangeset(pSession, 0, 0, 0, pnChangeset, ppChangeset);
   assert( rc || pnChangeset==0 
        || pSession->bEnableSize==0 || *pnChangeset<=pSession->nMaxChangesetSize 
   );
@@ -2871,8 +2863,7 @@ int sqlite3session_changeset_strm(
   void *pOut
 ){
   if( xOutput==0 ) return SQLITE_MISUSE;
-  return sessionGenerateChangeset(
-      pSession, SESSIONS_CHANGESET, xOutput, pOut, 0, 0);
+  return sessionGenerateChangeset(pSession, 0, xOutput, pOut, 0, 0);
 }
 
 /*
@@ -2884,8 +2875,7 @@ int sqlite3session_patchset_strm(
   void *pOut
 ){
   if( xOutput==0 ) return SQLITE_MISUSE;
-  return sessionGenerateChangeset(
-      pSession, SESSIONS_PATCHSET, xOutput, pOut, 0, 0);
+  return sessionGenerateChangeset(pSession, 1, xOutput, pOut, 0, 0);
 }
 
 /*
@@ -2901,20 +2891,9 @@ int sqlite3session_patchset(
   void **ppPatchset               /* OUT: Buffer containing changeset */
 ){
   if( pnPatchset==0 || ppPatchset==0 ) return SQLITE_MISUSE;
-  return sessionGenerateChangeset(
-      pSession, SESSIONS_PATCHSET, 0, 0, pnPatchset, ppPatchset);
+  return sessionGenerateChangeset(pSession, 1, 0, 0, pnPatchset, ppPatchset);
 }
 
-int sqlite3session_fullchangeset(
-  sqlite3_session *pSession,      /* Session object */
-  int *pnChangeset,               /* OUT: Size of buffer at *ppChangeset */
-  void **ppChangeset              /* OUT: Buffer containing changeset */
-){
-  return sessionGenerateChangeset(
-      pSession, SESSIONS_FULLCHANGESET, 0, 0, pnChangeset, ppChangeset);
-}
-
-
 /*
 ** Enable or disable the session object passed as the first argument.
 */
@@ -3257,19 +3236,15 @@ static int sessionReadRecord(
         }
       }
       if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
-        if( (pIn->nData-pIn->iNext)<8 ){
-          rc = SQLITE_CORRUPT_BKPT;
+        sqlite3_int64 v = sessionGetI64(aVal);
+        if( eType==SQLITE_INTEGER ){
+          sqlite3VdbeMemSetInt64(apOut[i], v);
         }else{
-          sqlite3_int64 v = sessionGetI64(aVal);
-          if( eType==SQLITE_INTEGER ){
-            sqlite3VdbeMemSetInt64(apOut[i], v);
-          }else{
-            double d;
-            memcpy(&d, &v, 8);
-            sqlite3VdbeMemSetDouble(apOut[i], d);
-          }
-          pIn->iNext += 8;
+          double d;
+          memcpy(&d, &v, 8);
+          sqlite3VdbeMemSetDouble(apOut[i], d);
         }
+        pIn->iNext += 8;
       }
     }
   }
@@ -5514,11 +5489,10 @@ static int sessionChangegroupOutput(
   ** hash tables attached to the SessionTable objects in list p->pList. 
   */
   for(pTab=pGrp->pList; rc==SQLITE_OK && pTab; pTab=pTab->pNext){
-    int eChangeset = pGrp->bPatch ? SESSIONS_PATCHSET : SESSIONS_CHANGESET;
     int i;
     if( pTab->nEntry==0 ) continue;
 
-    sessionAppendTableHdr(&buf, eChangeset, pTab, &rc);
+    sessionAppendTableHdr(&buf, pGrp->bPatch, pTab, &rc);
     for(i=0; i<pTab->nChange; i++){
       SessionChange *p;
       for(p=pTab->apChange[i]; p; p=p->pNext){

ext/session/sqlite3session.h

@@ -368,19 +368,6 @@ int sqlite3session_changeset(
   void **ppChangeset              /* OUT: Buffer containing changeset */
 );
 
-/*
-** CAPI3REF: Generate A Full Changeset From A Session Object
-**
-** This function is similar to sqlite3session_changeset(), except that for
-** each row affected by an UPDATE statement, all old.* values are recorded
-** as part of the changeset, not just those modified.
-*/
-int sqlite3session_fullchangeset(
-  sqlite3_session *pSession,      /* Session object */
-  int *pnChangeset,               /* OUT: Size of buffer at *ppChangeset */
-  void **ppChangeset              /* OUT: Buffer containing changeset */
-);
-
 /*
 ** CAPI3REF: Return An Upper-limit For The Size Of The Changeset
 ** METHOD: sqlite3_session

ext/session/test_session.c

@@ -236,7 +236,6 @@ static int testStreamOutput(
 **          $session indirect INTEGER
 **          $session patchset
 **          $session table_filter SCRIPT
-**          $session fullchangeset
 */
 static int SQLITE_TCLAPI test_session_cmd(
   void *clientData,
@@ -250,20 +249,20 @@ static int SQLITE_TCLAPI test_session_cmd(
     const char *zSub;
     int nArg;
     const char *zMsg;
+    int iSub;
   } aSub[] = {
-    { "attach",       1, "TABLE"       }, /* 0 */
-    { "changeset",    0, ""            }, /* 1 */
-    { "delete",       0, ""            }, /* 2 */
-    { "enable",       1, "BOOL"        }, /* 3 */
-    { "indirect",     1, "BOOL"        }, /* 4 */
-    { "isempty",      0, ""            }, /* 5 */
-    { "table_filter", 1, "SCRIPT"      }, /* 6 */
+    { "attach",       1, "TABLE",      }, /* 0 */
+    { "changeset",    0, "",           }, /* 1 */
+    { "delete",       0, "",           }, /* 2 */
+    { "enable",       1, "BOOL",       }, /* 3 */
+    { "indirect",     1, "BOOL",       }, /* 4 */
+    { "isempty",      0, "",           }, /* 5 */
+    { "table_filter", 1, "SCRIPT",     }, /* 6 */
     { "patchset",     0, "",           }, /* 7 */
-    { "diff",         2, "FROMDB TBL"  }, /* 8 */
-    { "fullchangeset",0, ""            }, /* 9 */
-    { "memory_used",  0, "",           }, /* 10 */
-    { "changeset_size", 0, "",         }, /* 11 */
-    { "object_config", 2, "OPTION INTEGER", }, /* 12 */
+    { "diff",         2, "FROMDB TBL", }, /* 8 */
+    { "memory_used",  0, "",           }, /* 9 */
+    { "changeset_size", 0, "",         }, /* 10 */
+    { "object_config", 2, "OPTION INTEGER", }, /* 11 */
     { 0 }
   };
   int iSub;
@@ -293,11 +292,10 @@ static int SQLITE_TCLAPI test_session_cmd(
       break;
     }
 
-    case 9:        /* fullchangeset */
     case 7:        /* patchset */
     case 1: {      /* changeset */
       TestSessionsBlob o = {0, 0};
-      if( iSub!=9 && test_tcl_integer(interp, SESSION_STREAM_TCL_VAR) ){
+      if( test_tcl_integer(interp, SESSION_STREAM_TCL_VAR) ){
         void *pCtx = (void*)&o;
         if( iSub==7 ){
           rc = sqlite3session_patchset_strm(pSession, testStreamOutput, pCtx);
@@ -307,8 +305,6 @@ static int SQLITE_TCLAPI test_session_cmd(
       }else{
         if( iSub==7 ){
           rc = sqlite3session_patchset(pSession, &o.n, &o.p);
-        }else if( iSub==9 ){
-          rc = sqlite3session_fullchangeset(pSession, &o.n, &o.p);
         }else{
           rc = sqlite3session_changeset(pSession, &o.n, &o.p);
         }
@@ -324,7 +320,6 @@ static int SQLITE_TCLAPI test_session_cmd(
       break;
     }
 
-
     case 2:        /* delete */
       Tcl_DeleteCommand(interp, Tcl_GetString(objv[0]));
       break;
@@ -375,18 +370,18 @@ static int SQLITE_TCLAPI test_session_cmd(
       break;
     }
 
-    case 10: {      /* memory_used */
+    case 9: {      /* memory_used */
       sqlite3_int64 nMalloc = sqlite3session_memory_used(pSession);
       Tcl_SetObjResult(interp, Tcl_NewWideIntObj(nMalloc));
       break;
     }
 
-    case 11: {
+    case 10: {
       sqlite3_int64 nSize = sqlite3session_changeset_size(pSession);
       Tcl_SetObjResult(interp, Tcl_NewWideIntObj(nSize));
       break;
     }
-    case 12: {    /* object_config */
+    case 11: {    /* object_config */
       struct ObjConfOpt {
         const char *zName;
         int opt;
@@ -396,6 +391,7 @@ static int SQLITE_TCLAPI test_session_cmd(
         { 0, 0 }
       };
       size_t sz = sizeof(aOpt[0]);
+
       int rc;
       int iArg;
       int iOpt;
@@ -553,7 +549,7 @@ static int test_filter_handler(
 
   Tcl_DecrRefCount(pEval);
   return res;
-}
+}  
 
 static int test_conflict_handler(
   void *pCtx,                     /* Pointer to TestConflictHandler structure */
@@ -1196,127 +1192,6 @@ static int SQLITE_TCLAPI test_sqlite3session_foreach(
   return TCL_OK;
 }
 
-#include "sqlite3changebatch.h"
-
-typedef struct TestChangebatch TestChangebatch;
-struct TestChangebatch {
-  sqlite3_changebatch *pChangebatch;
-};
-
-/*
-** Tclcmd:  $changebatch add BLOB
-**          $changebatch zero
-**          $changebatch delete
-*/
-static int SQLITE_TCLAPI test_changebatch_cmd(
-  void *clientData,
-  Tcl_Interp *interp,
-  int objc,
-  Tcl_Obj *CONST objv[]
-){
-  TestChangebatch *p = (TestChangebatch*)clientData;
-  sqlite3_changebatch *pChangebatch = p->pChangebatch;
-  struct SessionSubcmd {
-    const char *zSub;
-    int nArg;
-    const char *zMsg;
-    int iSub;
-  } aSub[] = {
-    { "add",          1, "CHANGESET",  }, /* 0 */
-    { "zero",         0, "",           }, /* 1 */
-    { "delete",       0, "",           }, /* 2 */
-    { 0 }
-  };
-  int iSub;
-  int rc;
-
-  if( objc<2 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "SUBCOMMAND ...");
-    return TCL_ERROR;
-  }
-  rc = Tcl_GetIndexFromObjStruct(interp, 
-      objv[1], aSub, sizeof(aSub[0]), "sub-command", 0, &iSub
-  );
-  if( rc!=TCL_OK ) return rc;
-  if( objc!=2+aSub[iSub].nArg ){
-    Tcl_WrongNumArgs(interp, 2, objv, aSub[iSub].zMsg);
-    return TCL_ERROR;
-  }
-
-  switch( iSub ){
-    case 0: {      /* add */
-      int nArg;
-      unsigned char *pArg = Tcl_GetByteArrayFromObj(objv[2], &nArg);
-      rc = sqlite3changebatch_add(pChangebatch, pArg, nArg);
-      if( rc!=SQLITE_OK && rc!=SQLITE_CONSTRAINT ){
-        return test_session_error(interp, rc, 0);
-      }else{
-        extern const char *sqlite3ErrName(int);
-        Tcl_SetObjResult(interp, Tcl_NewStringObj(sqlite3ErrName(rc), -1));
-      }
-      break;
-    }
-
-    case 1: {      /* zero */
-      sqlite3changebatch_zero(pChangebatch);
-      break;
-    }
-
-    case 2:        /* delete */
-      Tcl_DeleteCommand(interp, Tcl_GetString(objv[0]));
-      break;
-  }
-
-  return TCL_OK;
-}
-
-static void SQLITE_TCLAPI test_changebatch_del(void *clientData){
-  TestChangebatch *p = (TestChangebatch*)clientData;
-  sqlite3changebatch_delete(p->pChangebatch);
-  ckfree((char*)p);
-}
-
-/*
-** Tclcmd:  sqlite3changebatch CMD DB-HANDLE
-*/
-static int SQLITE_TCLAPI test_sqlite3changebatch(
-  void * clientData,
-  Tcl_Interp *interp,
-  int objc,
-  Tcl_Obj *CONST objv[]
-){
-  sqlite3 *db;
-  Tcl_CmdInfo info;
-  int rc;                         /* sqlite3session_create() return code */
-  TestChangebatch *p;             /* New wrapper object */
-
-  if( objc!=3 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "CMD DB-HANDLE");
-    return TCL_ERROR;
-  }
-
-  if( 0==Tcl_GetCommandInfo(interp, Tcl_GetString(objv[2]), &info) ){
-    Tcl_AppendResult(interp, "no such handle: ", Tcl_GetString(objv[2]), 0);
-    return TCL_ERROR;
-  }
-  db = *(sqlite3 **)info.objClientData;
-
-  p = (TestChangebatch*)ckalloc(sizeof(TestChangebatch));
-  memset(p, 0, sizeof(TestChangebatch));
-  rc = sqlite3changebatch_new(db, &p->pChangebatch);
-  if( rc!=SQLITE_OK ){
-    ckfree((char*)p);
-    return test_session_error(interp, rc, 0);
-  }
-
-  Tcl_CreateObjCommand(
-      interp, Tcl_GetString(objv[1]), test_changebatch_cmd, (ClientData)p,
-      test_changebatch_del
-  );
-  Tcl_SetObjResult(interp, objv[1]);
-  return TCL_OK;
-}
-
 /*
 ** tclcmd: CMD configure REBASE-BLOB
 ** tclcmd: CMD rebase CHANGESET
@@ -1602,10 +1477,6 @@ int TestSession_Init(Tcl_Interp *interp){
     Tcl_CreateObjCommand(interp, p->zCmd, p->xProc, 0, 0);
   }
 
-
-  Tcl_CreateObjCommand(
-      interp, "sqlite3changebatch", test_sqlite3changebatch, 0, 0
-  );
   return TCL_OK;
 }
 

ext/wasm/EXPORTED_FUNCTIONS.fiddle.in

@@ -1,7 +1,10 @@
-_fiddle_exec
-_fiddle_interrupt
-_fiddle_experiment
-_fiddle_the_db
 _fiddle_db_arg
 _fiddle_db_filename
+_fiddle_exec
+_fiddle_experiment
+_fiddle_interrupt
+_fiddle_main
 _fiddle_reset_db
+_fiddle_db_handle
+_fiddle_db_vfs
+_fiddle_export_db

ext/wasm/GNUmakefile

@@ -456,13 +456,6 @@ emcc.exportedRuntimeMethods := \
 emcc.jsflags += $(emcc.exportedRuntimeMethods)
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
-#emcc.jsflags += -sASYNCIFY=2
-# ^^^ ASYNCIFY=2 is for experimental JSPI support
-# (https://v8.dev/blog/jspi), but enabling it causes the lib-level
-# init code to throw inexplicable complaints about C-level function
-# signatures not matching what we expect them to be. JSPI requires, as of
-# this writing, requires an experimental Chrome flag:
-# chrome://flags/#enable-experimental-webassembly-stack-switching
 emcc.jsflags += -sSTRICT_JS=0
 # STRICT_JS disabled due to:
 #   https://github.com/emscripten-core/emscripten/issues/18610
@@ -845,11 +838,11 @@ sqlite3-worker1-bundler-friendly.js := $(dir.dout)/sqlite3-worker1-bundler-frien
 sqlite3-worker1-promiser-bundler-friendly.js := $(dir.dout)/sqlite3-worker1-promiser-bundler-friendly.js
 $(eval $(call C-PP.FILTER,$(sqlite3-worker1.js.in),$(sqlite3-worker1.js)))
 $(eval $(call C-PP.FILTER,$(sqlite3-worker1.js.in),$(sqlite3-worker1-bundler-friendly.js),\
-    $(c-pp.D.sqlite3-bundler-friendly)))
+    $(c-pp.D.bundler-friendly)))
 $(eval $(call C-PP.FILTER,$(sqlite3-worker1-promiser.js.in),$(sqlite3-worker1-promiser.js)))
 $(eval $(call C-PP.FILTER,$(sqlite3-worker1-promiser.js.in),\
     $(sqlite3-worker1-promiser-bundler-friendly.js),\
-    $(c-pp.D.sqlite3-bundler-friendly)))
+    $(c-pp.D.bundler-friendly)))
 $(sqlite3-bundler-friendly.mjs): $(sqlite3-worker1-bundler-friendly.js) \
     $(sqlite3-worker1-promiser-bundler-friendly.js)
 $(sqlite3.js) $(sqlite3.mjs): $(sqlite3-worker1.js) $(sqlite3-worker1-promiser.js)

ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api

@@ -1,3 +1,8 @@
+_malloc
+_free
+_realloc
+_sqlite3_aggregate_context
+_sqlite3_auto_extension
 _sqlite3_bind_blob
 _sqlite3_bind_double
 _sqlite3_bind_int
@@ -5,11 +10,16 @@ _sqlite3_bind_int64
 _sqlite3_bind_null
 _sqlite3_bind_parameter_count
 _sqlite3_bind_parameter_index
+_sqlite3_bind_pointer
 _sqlite3_bind_text
+_sqlite3_busy_handler
+_sqlite3_busy_timeout
+_sqlite3_cancel_auto_extension
 _sqlite3_changes
 _sqlite3_changes64
 _sqlite3_clear_bindings
 _sqlite3_close_v2
+_sqlite3_collation_needed
 _sqlite3_column_blob
 _sqlite3_column_bytes
 _sqlite3_column_count
@@ -20,12 +30,28 @@ _sqlite3_column_int64
 _sqlite3_column_name
 _sqlite3_column_text
 _sqlite3_column_type
+_sqlite3_column_value
+_sqlite3_commit_hook
 _sqlite3_compileoption_get
 _sqlite3_compileoption_used
+_sqlite3_complete
+_sqlite3_context_db_handle
+_sqlite3_create_collation
+_sqlite3_create_collation_v2
+_sqlite3_create_function
 _sqlite3_create_function_v2
+_sqlite3_create_module
+_sqlite3_create_module_v2
+_sqlite3_create_window_function
 _sqlite3_data_count
 _sqlite3_db_filename
+_sqlite3_db_handle
 _sqlite3_db_name
+_sqlite3_db_status
+_sqlite3_declare_vtab
+_sqlite3_deserialize
+_sqlite3_drop_modules
+_sqlite3_errcode
 _sqlite3_errmsg
 _sqlite3_error_offset
 _sqlite3_errstr
@@ -33,16 +59,38 @@ _sqlite3_exec
 _sqlite3_expanded_sql
 _sqlite3_extended_errcode
 _sqlite3_extended_result_codes
+_sqlite3_file_control
 _sqlite3_finalize
+_sqlite3_free
+_sqlite3_get_auxdata
 _sqlite3_initialize
-_sqlite3_interrupt
+_sqlite3_keyword_count
+_sqlite3_keyword_name
+_sqlite3_keyword_check
+_sqlite3_last_insert_rowid
 _sqlite3_libversion
 _sqlite3_libversion_number
+_sqlite3_limit
+_sqlite3_malloc
+_sqlite3_malloc64
+_sqlite3_msize
 _sqlite3_open
 _sqlite3_open_v2
+_sqlite3_overload_function
 _sqlite3_prepare_v2
 _sqlite3_prepare_v3
+_sqlite3_preupdate_blobwrite
+_sqlite3_preupdate_count
+_sqlite3_preupdate_depth
+_sqlite3_preupdate_hook
+_sqlite3_preupdate_new
+_sqlite3_preupdate_old
+_sqlite3_progress_handler
+_sqlite3_randomness
+_sqlite3_realloc
+_sqlite3_realloc64
 _sqlite3_reset
+_sqlite3_reset_auto_extension
 _sqlite3_result_blob
 _sqlite3_result_double
 _sqlite3_result_error
@@ -50,23 +98,106 @@ _sqlite3_result_error_code
 _sqlite3_result_error_nomem
 _sqlite3_result_error_toobig
 _sqlite3_result_int
+_sqlite3_result_int64
 _sqlite3_result_null
+_sqlite3_result_pointer
+_sqlite3_result_subtype
 _sqlite3_result_text
+_sqlite3_result_zeroblob
+_sqlite3_result_zeroblob64
+_sqlite3_rollback_hook
+_sqlite3_serialize
+_sqlite3_set_authorizer
+_sqlite3_set_auxdata
+_sqlite3_set_last_insert_rowid
+_sqlite3_shutdown
 _sqlite3_sourceid
 _sqlite3_sql
+_sqlite3_status
+_sqlite3_status64
 _sqlite3_step
+_sqlite3_stmt_isexplain
+_sqlite3_stmt_readonly
+_sqlite3_stmt_status
 _sqlite3_strglob
+_sqlite3_stricmp
 _sqlite3_strlike
+_sqlite3_strnicmp
+_sqlite3_table_column_metadata
 _sqlite3_total_changes
 _sqlite3_total_changes64
+_sqlite3_trace_v2
+_sqlite3_txn_state
+_sqlite3_update_hook
+_sqlite3_uri_boolean
+_sqlite3_uri_int64
+_sqlite3_uri_key
+_sqlite3_uri_parameter
+_sqlite3_user_data
 _sqlite3_value_blob
 _sqlite3_value_bytes
 _sqlite3_value_double
+_sqlite3_value_dup
+_sqlite3_value_free
+_sqlite3_value_frombind
+_sqlite3_value_int
+_sqlite3_value_int64
+_sqlite3_value_nochange
+_sqlite3_value_numeric_type
+_sqlite3_value_pointer
+_sqlite3_value_subtype
 _sqlite3_value_text
 _sqlite3_value_type
 _sqlite3_vfs_find
 _sqlite3_vfs_register
-_sqlite3_wasm_db_error
-_sqlite3_wasm_enum_json
-_malloc
-_free
+_sqlite3_vfs_unregister
+_sqlite3_vtab_collation
+_sqlite3_vtab_distinct
+_sqlite3_vtab_in
+_sqlite3_vtab_in_first
+_sqlite3_vtab_in_next
+_sqlite3_vtab_nochange
+_sqlite3_vtab_on_conflict
+_sqlite3_vtab_rhs_value
+_sqlite3changegroup_add
+_sqlite3changegroup_add_strm
+_sqlite3changegroup_delete
+_sqlite3changegroup_new
+_sqlite3changegroup_output
+_sqlite3changegroup_output_strm
+_sqlite3changeset_apply
+_sqlite3changeset_apply_strm
+_sqlite3changeset_apply_v2
+_sqlite3changeset_apply_v2_strm
+_sqlite3changeset_concat
+_sqlite3changeset_concat_strm
+_sqlite3changeset_conflict
+_sqlite3changeset_finalize
+_sqlite3changeset_fk_conflicts
+_sqlite3changeset_invert
+_sqlite3changeset_invert_strm
+_sqlite3changeset_new
+_sqlite3changeset_next
+_sqlite3changeset_old
+_sqlite3changeset_op
+_sqlite3changeset_pk
+_sqlite3changeset_start
+_sqlite3changeset_start_strm
+_sqlite3changeset_start_v2
+_sqlite3changeset_start_v2_strm
+_sqlite3session_attach
+_sqlite3session_changeset
+_sqlite3session_changeset_size
+_sqlite3session_changeset_strm
+_sqlite3session_config
+_sqlite3session_create
+_sqlite3session_delete
+_sqlite3session_diff
+_sqlite3session_enable
+_sqlite3session_indirect
+_sqlite3session_isempty
+_sqlite3session_memory_used
+_sqlite3session_object_config
+_sqlite3session_patchset
+_sqlite3session_patchset_strm
+_sqlite3session_table_filter

ext/wasm/api/sqlite3-api-glue.js

@@ -888,9 +888,9 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      consistency with non-special-case wrappings.
   */
   const __dbArgcMismatch = (pDb,f,n)=>{
-    return util.sqlite3_wasm_db_error(pDb, capi.SQLITE_MISUSE,
-                                      f+"() requires "+n+" argument"+
-                                      (1===n?"":'s')+".");
+    return sqlite3.util.sqlite3_wasm_db_error(pDb, capi.SQLITE_MISUSE,
+                                              f+"() requires "+n+" argument"+
+                                              (1===n?"":'s')+".");
   };
 
   /** Code duplication reducer for functions which take an encoding

ext/wasm/api/sqlite3-api-prologue.js

@@ -772,8 +772,43 @@ globalThis.sqlite3ApiBootstrap = function sqlite3ApiBootstrap(
     isSharedTypedArray,
     toss: function(...args){throw new Error(args.join(' '))},
     toss3,
-    typedArrayPart
-  };
+    typedArrayPart,
+    /**
+       Given a byte array or ArrayBuffer, this function throws if the
+       lead bytes of that buffer do not hold a SQLite3 database header,
+       else it returns without side effects.
+
+       Added in 3.44.
+    */
+    affirmDbHeader: function(bytes){
+      if(bytes instanceof ArrayBuffer) bytes = new Uint8Array(bytes);
+      const header = "SQLite format 3";
+      if( header.length > bytes.byteLength ){
+        toss3("Input does not contain an SQLite3 database header.");
+      }
+      for(let i = 0; i < header.length; ++i){
+        if( header.charCodeAt(i) !== bytes[i] ){
+          toss3("Input does not contain an SQLite3 database header.");
+        }
+      }
+    },
+    /**
+       Given a byte array or ArrayBuffer, this function throws if the
+       database does not, at a cursory glance, appear to be an SQLite3
+       database. It only examines the size and header, but further
+       checks may be added in the future.
+
+       Added in 3.44.
+    */
+    affirmIsDb: function(bytes){
+      if(bytes instanceof ArrayBuffer) bytes = new Uint8Array(bytes);
+      const n = bytes.byteLength;
+      if(n<512 || n%512!==0) {
+        toss3("Byte array size",n,"is invalid for an SQLite3 db.");
+      }
+      util.affirmDbHeader(bytes);
+    }
+  }/*util*/;
 
   Object.assign(wasm, {
     /**

ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js

@@ -59,6 +59,7 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const toss3 = sqlite3.util.toss3;
   const initPromises = Object.create(null);
   const capi = sqlite3.capi;
+  const util = sqlite3.util;
   const wasm = sqlite3.wasm;
   // Config opts for the VFS...
   const SECTOR_SIZE = 4096;
@@ -869,9 +870,48 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       return b;
     }
 
+    //! Impl for importDb() when its 2nd arg is a function.
+    async importDbChunked(name, callback){
+      const sah = this.#mapFilenameToSAH.get(name)
+            || this.nextAvailableSAH()
+            || toss("No available handles to import to.");
+      sah.truncate(0);
+      let nWrote = 0, chunk, checkedHeader = false, err = false;
+      try{
+        while( undefined !== (chunk = await callback()) ){
+          if(chunk instanceof ArrayBuffer) chunk = new Uint8Array(chunk);
+          if( 0===nWrote && chunk.byteLength>=15 ){
+            util.affirmDbHeader(chunk);
+            checkedHeader = true;
+          }
+          sah.write(chunk, {at:  HEADER_OFFSET_DATA + nWrote});
+          nWrote += chunk.byteLength;
+        }
+        if( nWrote < 512 || 0!==nWrote % 512 ){
+          toss("Input size",nWrote,"is not correct for an SQLite database.");
+        }
+        if( !checkedHeader ){
+          const header = new Uint8Array(20);
+          sah.read( header, {at: 0} );
+          util.affirmDbHeader( header );
+        }
+        sah.write(new Uint8Array(2), {
+          at: HEADER_OFFSET_DATA + 18
+        }/*force db out of WAL mode*/);
+      }catch(e){
+        this.setAssociatedPath(sah, '', 0);
+      }
+      this.setAssociatedPath(sah, name, capi.SQLITE_OPEN_MAIN_DB);
+      return nWrote;
+    }
+
     //! Documented elsewhere in this file.
     importDb(name, bytes){
-      if(bytes instanceof ArrayBuffer) bytes = new Uint8Array(bytes);
+      if( bytes instanceof ArrayBuffer ) bytes = new Uint8Array(bytes);
+      else if( bytes instanceof Function ) return this.importDbChunked(name, bytes);
+      const sah = this.#mapFilenameToSAH.get(name)
+            || this.nextAvailableSAH()
+            || toss("No available handles to import to.");
       const n = bytes.byteLength;
       if(n<512 || n%512!=0){
         toss("Byte array size is invalid for an SQLite db.");
@@ -882,18 +922,16 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           toss("Input does not contain an SQLite database header.");
         }
       }
-      const sah = this.#mapFilenameToSAH.get(name)
-            || this.nextAvailableSAH()
-            || toss("No available handles to import to.");
       const nWrote = sah.write(bytes, {at: HEADER_OFFSET_DATA});
       if(nWrote != n){
         this.setAssociatedPath(sah, '', 0);
         toss("Expected to write "+n+" bytes but wrote "+nWrote+".");
       }else{
-        sah.write(new Uint8Array([1,1]), {at: HEADER_OFFSET_DATA+18}
-                  /* force db out of WAL mode */);
+        sah.write(new Uint8Array([0,0]), {at: HEADER_OFFSET_DATA+18}
+                   /* force db out of WAL mode */);
         this.setAssociatedPath(sah, name, capi.SQLITE_OPEN_MAIN_DB);
       }
+      return nWrote;
     }
 
   }/*class OpfsSAHPool*/;
@@ -1100,6 +1138,19 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      automatically clean up any non-database files so importing them
      is pointless.
 
+     If passed a function for its second argument, its behavior
+     changes to asynchronous and it imports its data in chunks fed to
+     it by the given callback function. It calls the callback (which
+     may be async) repeatedly, expecting either a Uint8Array or
+     ArrayBuffer (to denote new input) or undefined (to denote
+     EOF). For so long as the callback continues to return
+     non-undefined, it will append incoming data to the given
+     VFS-hosted database file. The result of the resolved Promise when
+     called this way is the size of the resulting database.
+
+     On succes this routine rewrites the database header bytes in the
+     output file (not the input array) to force disabling of WAL mode.
+
      On a write error, the handle is removed from the pool and made
      available for re-use.
 

ext/wasm/api/sqlite3-vfs-opfs.c-pp.js

@@ -136,6 +136,7 @@ const installOpfsVfs = function callee(options){
     const error =  (...args)=>logImpl(0, ...args);
     const toss = sqlite3.util.toss;
     const capi = sqlite3.capi;
+    const util = sqlite3.util;
     const wasm = sqlite3.wasm;
     const sqlite3_vfs = capi.sqlite3_vfs;
     const sqlite3_file = capi.sqlite3_file;
@@ -1168,41 +1169,93 @@ const installOpfsVfs = function callee(options){
       doDir(opt.directory, 0);
     };
 
+    /**
+       impl of importDb() when it's given a function as its second
+       argument.
+    */
+    const importDbChunked = async function(filename, callback){
+      const [hDir, fnamePart] = await opfsUtil.getDirForFilename(filename, true);
+      const hFile = await hDir.getFileHandle(fnamePart, {create:true});
+      let sah = await hFile.createSyncAccessHandle();
+      let nWrote = 0, chunk, checkedHeader = false, err = false;
+      try{
+        sah.truncate(0);
+        while( undefined !== (chunk = await callback()) ){
+          if(chunk instanceof ArrayBuffer) chunk = new Uint8Array(chunk);
+          if( 0===nWrote && chunk.byteLength>=15 ){
+            util.affirmDbHeader(chunk);
+            checkedHeader = true;
+          }
+          sah.write(chunk, {at: nWrote});
+          nWrote += chunk.byteLength;
+        }
+        if( nWrote < 512 || 0!==nWrote % 512 ){
+          toss("Input size",nWrote,"is not correct for an SQLite database.");
+        }
+        if( !checkedHeader ){
+          const header = new Uint8Array(20);
+          sah.read( header, {at: 0} );
+          util.affirmDbHeader( header );
+        }
+        sah.write(new Uint8Array(2), {at: 18}/*force db out of WAL mode*/);
+        return nWrote;
+      }catch(e){
+        await sah.close();
+        sah = undefined;
+        await hDir.removeEntry( fnamePart ).catch(()=>{});
+        throw e;
+      }finally {
+        if( sah ) await sah.close();
+      }
+    };
+
     /**
        Asynchronously imports the given bytes (a byte array or
        ArrayBuffer) into the given database file.
 
+       If passed a function for its second argument, its behaviour
+       changes to async and it imports its data in chunks fed to it by
+       the given callback function. It calls the callback (which may
+       be async) repeatedly, expecting either a Uint8Array or
+       ArrayBuffer (to denote new input) or undefined (to denote
+       EOF). For so long as the callback continues to return
+       non-undefined, it will append incoming data to the given
+       VFS-hosted database file. When called this way, the resolved
+       value of the returned Promise is the number of bytes written to
+       the target file.
+
        It very specifically requires the input to be an SQLite3
        database and throws if that's not the case.  It does so in
        order to prevent this function from taking on a larger scope
        than it is specifically intended to. i.e. we do not want it to
        become a convenience for importing arbitrary files into OPFS.
 
-       Throws on error. Resolves to the number of bytes written.
+       This routine rewrites the database header bytes in the output
+       file (not the input array) to force disabling of WAL mode.
+
+       On error this throws and the state of the input file is
+       undefined (it depends on where the exception was triggered).
+
+       On success, resolves to the number of bytes written.
     */
     opfsUtil.importDb = async function(filename, bytes){
+      if( bytes instanceof Function ){
+        return importDbChunked(filename, bytes);
+      }
       if(bytes instanceof ArrayBuffer) bytes = new Uint8Array(bytes);
+      util.affirmIsDb(bytes);
       const n = bytes.byteLength;
-      if(n<512 || n%512!=0){
-        toss("Byte array size is invalid for an SQLite db.");
-      }
-      const header = "SQLite format 3";
-      for(let i = 0; i < header.length; ++i){
-        if( header.charCodeAt(i) !== bytes[i] ){
-          toss("Input does not contain an SQLite database header.");
-        }
-      }
-      let sah;
       const [hDir, fnamePart] = await opfsUtil.getDirForFilename(filename, true);
+      let sah, err, nWrote = 0;
       try {
         const hFile = await hDir.getFileHandle(fnamePart, {create:true});
         sah = await hFile.createSyncAccessHandle();
         sah.truncate(0);
-        const nWrote = sah.write(bytes, {at: 0});
+        nWrote = sah.write(bytes, {at: 0});
         if(nWrote != n){
           toss("Expected to write "+n+" bytes but wrote "+nWrote+".");
         }
-        sah.write(new Uint8Array([1,1]), {at: 18}) /* force db out of WAL mode */;
+        sah.write(new Uint8Array(2), {at: 18}) /* force db out of WAL mode */;
         return nWrote;
       }catch(e){
         if( sah ){ await sah.close(); sah = undefined; }

ext/wasm/api/sqlite3-wasm.c

@@ -352,7 +352,9 @@ int sqlite3_wasm_db_error(sqlite3*db, int err_code, const char *zMsg){
   if( db!=0 ){
     if( 0!=zMsg ){
       const int nMsg = sqlite3Strlen30(zMsg);
+      sqlite3_mutex_enter(sqlite3_db_mutex(db));
       sqlite3ErrorWithMsg(db, err_code, "%.*s", nMsg, zMsg);
+      sqlite3_mutex_leave(sqlite3_db_mutex(db));
     }else{
       sqlite3ErrorWithMsg(db, err_code, NULL);
     }

ext/wasm/api/sqlite3-worker1-promiser.c-pp.js

@@ -114,7 +114,7 @@
    by all client code except that which tests this API. The `row`
    property contains the row result in the form implied by the
    `rowMode` option (defaulting to `'array'`). The `rowNumber` is a
-   1-based integer value incremented by 1 on each call into th 
+   1-based integer value incremented by 1 on each call into the
    callback.
 
    At the end of the result set, the same event is fired with
@@ -122,8 +122,17 @@
    the end of the result set has been reached. Note that the rows
    arrive via worker-posted messages, with all the implications
    of that.
+
+   Notable shortcomings:
+
+   - This API was not designed with ES6 modules in mind. Neither Firefox
+     nor Safari support, as of March 2023, the {type:"module"} flag to the
+     Worker constructor, so that particular usage is not something we're going
+     to target for the time being:
+
+     https://developer.mozilla.org/en-US/docs/Web/API/Worker/Worker
 */
-self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
+globalThis.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
   // Inspired by: https://stackoverflow.com/a/52439530
   if(1===arguments.length && 'function'===typeof arguments[0]){
     const f = config;
@@ -160,7 +169,7 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
       if(msgHandler && msgHandler.onrow){
         msgHandler.onrow(ev);
         return;
-      }        
+      }
       if(config.onunhandled) config.onunhandled(arguments[0]);
       else err("sqlite3Worker1Promiser() unhandled worker message:",ev);
       return;
@@ -187,10 +196,9 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
     if(1===arguments.length){
       msg = arguments[0];
     }else if(2===arguments.length){
-      msg = {
-        type: arguments[0],
-        args: arguments[1]
-      };
+      msg = Object.create(null);
+      msg.type = arguments[0];
+      msg.args = arguments[1];
     }else{
       toss("Invalid arugments for sqlite3Worker1Promiser()-created factory.");
     }
@@ -236,10 +244,13 @@ self.sqlite3Worker1Promiser = function callee(config = callee.defaultConfig){
     return p;
   };
 }/*sqlite3Worker1Promiser()*/;
-self.sqlite3Worker1Promiser.defaultConfig = {
+globalThis.sqlite3Worker1Promiser.defaultConfig = {
   worker: function(){
 //#if target=es6-bundler-friendly
-    return new Worker("sqlite3-worker1.js");
+    return new Worker("sqlite3-worker1-bundler-friendly.mjs",{
+      type: 'module' /* Noting that neither Firefox nor Safari suppor this,
+                        as of this writing. */
+    });
 //#else
     let theJs = "sqlite3-worker1.js";
     if(this.currentScript){
@@ -247,17 +258,17 @@ self.sqlite3Worker1Promiser.defaultConfig = {
       src.pop();
       theJs = src.join('/')+'/' + theJs;
       //sqlite3.config.warn("promiser currentScript, theJs =",this.currentScript,theJs);
-    }else{
-      //sqlite3.config.warn("promiser self.location =",self.location);
-      const urlParams = new URL(self.location.href).searchParams;
+    }else if(globalThis.location){
+      //sqlite3.config.warn("promiser globalThis.location =",globalThis.location);
+      const urlParams = new URL(globalThis.location.href).searchParams;
       if(urlParams.has('sqlite3.dir')){
         theJs = urlParams.get('sqlite3.dir') + '/' + theJs;
       }
     }
-    return new Worker(theJs + self.location.search);
+    return new Worker(theJs + globalThis.location.search);
 //#endif
   }.bind({
-    currentScript: self?.document?.currentScript
+    currentScript: globalThis?.document?.currentScript
   }),
   onerror: (...args)=>console.error('worker1 promiser error',...args)
 };

ext/wasm/fiddle/index.html

@@ -273,11 +273,6 @@
         </fieldset>
       </div>
     </div> <!-- #view-split -->
-    <!-- Maintenance notes:
-
-        ... TODO... currently being refactored...
-
-    -->
     <script src="fiddle.js"></script>
   </body>
 </html>

ext/wasm/tester1.c-pp.js

@@ -2939,8 +2939,27 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
         let db;
         try {
           const exp = this.opfsDbExport;
+          const filename = this.opfsDbFile;
           delete this.opfsDbExport;
-          this.opfsImportSize = await sqlite3.oo1.OpfsDb.importDb(this.opfsDbFile, exp);
+          this.opfsImportSize = await sqlite3.oo1.OpfsDb.importDb(filename, exp);
+          db = new sqlite3.oo1.OpfsDb(this.opfsDbFile);
+          T.assert(6 === db.selectValue('select count(*) from p')).
+            assert( this.opfsImportSize == exp.byteLength );
+          db.close();
+          this.opfsUnlink(filename);
+          T.assert(!(await sqlite3.opfs.entryExists(filename)));
+          // Try again with a function as an input source:
+          let cursor = 0;
+          const blockSize = 512, end = exp.byteLength;
+          const reader = async function(){
+            if(cursor >= exp.byteLength){
+              return undefined;
+            }
+            const rv = exp.subarray(cursor, cursor+blockSize>end ? end : cursor+blockSize);
+            cursor += blockSize;
+            return rv;
+          };
+          this.opfsImportSize = await sqlite3.oo1.OpfsDb.importDb(filename, reader);
           db = new sqlite3.oo1.OpfsDb(this.opfsDbFile);
           T.assert(6 === db.selectValue('select count(*) from p')).
             assert( this.opfsImportSize == exp.byteLength );
@@ -3059,8 +3078,9 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
           const dbytes = u1.exportFile(dbName);
           T.assert(dbytes.length >= 4096);
           const dbName2 = '/exported.db';
-          u1.importDb(dbName2, dbytes);
-          T.assert( 2 == u1.getFileCount() );
+          let nWrote = u1.importDb(dbName2, dbytes);
+          T.assert( 2 == u1.getFileCount() )
+            .assert( dbytes.byteLength == nWrote );
           let db2 = new u1.OpfsSAHPoolDb(dbName2);
           T.assert(db2 instanceof sqlite3.oo1.DB)
             .assert(3 === db2.selectValue('select count(*) from t'));
@@ -3069,6 +3089,25 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
             .assert(false === u1.unlink(dbName2))
             .assert(1 === u1.getFileCount())
             .assert(1 === u1.getFileNames().length);
+          // Try again with a function as an input source:
+          let cursor = 0;
+          const blockSize = 1024, end = dbytes.byteLength;
+          const reader = async function(){
+            if(cursor >= dbytes.byteLength){
+              return undefined;
+            }
+            const rv = dbytes.subarray(cursor, cursor+blockSize>end ? end : cursor+blockSize);
+            cursor += blockSize;
+            return rv;
+          };
+          nWrote = await u1.importDb(dbName2, reader);
+          T.assert( 2 == u1.getFileCount() );
+          db2 = new u1.OpfsSAHPoolDb(dbName2);
+          T.assert(db2 instanceof sqlite3.oo1.DB)
+            .assert(3 === db2.selectValue('select count(*) from t'));
+          db2.close();
+          T.assert(true === u1.unlink(dbName2))
+            .assert(dbytes.byteLength == nWrote);
         }
 
         T.assert(true === u1.unlink(dbName))

main.mk

@@ -428,7 +428,6 @@ TESTSRC2 = \
   $(TOP)/ext/async/sqlite3async.c \
   $(TOP)/ext/misc/stmt.c \
   $(TOP)/ext/session/sqlite3session.c \
-  $(TOP)/ext/session/sqlite3changebatch.c \
   $(TOP)/ext/session/test_session.c \
   fts5.c
 
@@ -918,11 +917,11 @@ fulltestonly:	$(TESTPROGS) fuzztest
 queryplantest:	testfixture$(EXE) sqlite3$(EXE)
 	./testfixture$(EXE) $(TOP)/test/permutations.test queryplanner $(TESTOPTS)
 
-fuzztest:	fuzzcheck$(EXE) $(FUZZDATA) sessionfuzz$(EXE) $(TOP)/test/sessionfuzz-data1.db
+fuzztest:	fuzzcheck$(EXE) $(FUZZDATA) sessionfuzz$(EXE)
 	./fuzzcheck$(EXE) $(FUZZDATA)
 	./sessionfuzz run $(TOP)/test/sessionfuzz-data1.db
 
-valgrindfuzz:	fuzzcheck$(EXE) $(FUZZDATA) sessionfuzz$(EXE) $(TOP)/test/sessionfuzz-data1.db
+valgrindfuzz:	fuzzcheck$(EXE) $(FUZZDATA) sessionfuzz$(EXE)
 	valgrind ./fuzzcheck$(EXE) --cell-size-check --limit-mem 10M $(FUZZDATA)
 	valgrind ./sessionfuzz run $(TOP)/test/sessionfuzz-data1.db
 
@@ -986,9 +985,6 @@ THREADTEST3_SRC = $(TOP)/test/threadtest3.c    \
 threadtest3$(EXE): sqlite3.o $(THREADTEST3_SRC) $(TOP)/src/test_multiplex.c
 	$(TCCX) $(TOP)/test/threadtest3.c $(TOP)/src/test_multiplex.c sqlite3.o -o $@ $(THREADLIB)
 
-bc_test1$(EXE): sqlite3.o $(TOP)/test/bc_test1.c $(TOP)/test/tt3_core.c
-	$(TCCX) $(TOP)/test/bc_test1.c sqlite3.o -o $@ $(THREADLIB)
-
 threadtest: threadtest3$(EXE)
 	./threadtest3$(EXE)
 

manifest

@@ -1,13 +1,13 @@
-C Merge\sthe\sversion-3.43.2\schanges\sinto\sthe\sbegin-concurrent-3.43\sbranch.
-D 2023-10-14T17:34:32.998
+C Fix\sthe\s"sdevtest"\stestrunner.tcl\scommand\sso\sthat\sit\scorrectly\senables\sasan\son\swindows.
+D 2023-08-28T20:02:59.639
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in e30f6dd29e4ebab6d9fe34fa3204d2c993e273629368f7b55e0b71b1baff8552
+F Makefile.in 345a8599cf8ff015db534cedad7af70a1a6c36e295b85d720966c18af836ed30
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
-F Makefile.msc c401429bdc84ee277009fbb8d71ab62c22d31dfc907fcae997b63cffeff86a33
+F Makefile.msc 26c2d196391a285c279adb10fd6001774d9b243af94b700b681e4a49cd476684
 F README.md 963d30019abf0cc06b263cd2824bce022893f3f93a531758f6f04ff2194a16a8
-F VERSION 56b287eac8404526c4faa0bdfa7e31baed534068fa3acece479b5d6c35cfca1e
+F VERSION c6366dc72582d3144ce87b013cc35fe48d62f6d07d5be0c9716ea33c862144aa
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@ -22,7 +22,7 @@ F autoconf/configure.ac ec7fa914c5e74ff212fe879f9bb6918e1234497e05facfb641f30c4d
 F autoconf/tea/Makefile.in 106a96f2f745d41a0f6193f1de98d7355830b65d45032c18cd7c90295ec24196
 F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
-F autoconf/tea/configure.ac c968ba373f2afaad123e59e14baf20aa423ac0e5668ca8b40092b96b408d9938
+F autoconf/tea/configure.ac fce5eca183cf47853f7d5b81c1e7bfa41c021fb460939ec67ef83653ffc6a531
 F autoconf/tea/doc/sqlite3.n e1fe45d4f5286ee3d0ccc877aca2a0def488e9bb
 F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523
 F autoconf/tea/pkgIndex.tcl.in b9eb6dd37f64e08e637d576b3c83259814b9cddd78bec4af2e5abfc6c5c750ce
@@ -33,15 +33,15 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034
 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
-F configure 2c538b418bb71f7e8bb62193eae709a1f7dd4342f74f6530891bd1e937c03df2 x
+F configure 9dc3300339f4d6b3c3b108de60cc6ae6b3c547e25c7e6df280b4775db4de3a1b x
 F configure.ac 4654d32ac0a0d0b48f1e1e79bdc3d777b723cf2f63c33eb1d7c4ed8b435938e8
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
-F doc/begin_concurrent.md e694a2a1c623833e7de8b688e81ec30fd4439a78d6b74be61bce0b1e8f590470
 F doc/compile-for-windows.md c52f2903f1cb11b2308798feecca2e44701b037b78f467a538ac5c46c28ee250
 F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
 F doc/lemon.html 44a53a1d2b42d7751f7b2f478efb23c978e258d794bfd172442307a755b9fa44
 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
+F doc/testrunner.md 2434864be2219d4f0b6ffc99d0a2172d531c4ca4345340776f67ad4edd90dc90
 F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
 F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56
 F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
@@ -78,7 +78,7 @@ F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c c1de4ae28356ad98ccb8b2e3388a7fdcce7607b5523738c9afb6275dab765154
 F ext/fts3/fts3_unicode.c de426ff05c1c2e7bce161cf6b706638419c3a1d9c2667de9cb9dc0458c18e226
 F ext/fts3/fts3_unicode2.c 416eb7e1e81142703520d284b768ca2751d40e31fa912cae24ba74860532bf0f
-F ext/fts3/fts3_write.c b28f4cde90ed560245ecb76a882b45aa62da16ff6f61e9884eae5c7c5eff16ea
+F ext/fts3/fts3_write.c d28d9ef383ef848a7b77df4b9964abcc90d67a2b584120c0ad465972dce416e6
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/tool/fts3cov.sh c331d006359456cf6f8f953e37f2b9c7d568f3863f00bb5f7eb87fea4ac01b73
 F ext/fts3/tool/fts3view.c 413c346399159df81f86c4928b7c4a455caab73bfbc8cd68f950f632e5751674
@@ -94,8 +94,8 @@ F ext/fts5/fts5_buffer.c 3001fbabb585d6de52947b44b455235072b741038391f830d6b7292
 F ext/fts5/fts5_config.c 054359543566cbff1ba65a188330660a5457299513ac71c53b3a07d934c7b081
 F ext/fts5/fts5_expr.c bd3b81ce669c4104e34ffe66570af1999a317b142c15fccb112de9fb0caa57a6
 F ext/fts5/fts5_hash.c 65e7707bc8774706574346d18c20218facf87de3599b995963c3e6d6809f203d
-F ext/fts5/fts5_index.c bf9c3b2fc1cbc2b996693e393bb708756d770de2e931602102c2f0adbf75db2c
-F ext/fts5/fts5_main.c 8a16865b1652667c5a80592a4860a8fd40de283869d28da347a671c1c441933f
+F ext/fts5/fts5_index.c b484322421cbb421d22bb2cd304001b80596d671cd626367c8c806b889de4b42
+F ext/fts5/fts5_main.c 7070031993ba5b5d89b13206ec4ef624895f2f7c0ec72725913d301e4d382445
 F ext/fts5/fts5_storage.c 3c9b41fce41b6410f2e8f82eb035c6a29b2560483f773e6dc98cf3cb2e4ddbb5
 F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
 F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
@@ -179,13 +179,14 @@ F ext/fts5/test/fts5limits.test 8ab67cf5d311c124b6ceb0062d0297767176df4572d955fc
 F ext/fts5/test/fts5matchinfo.test 10c9a6f7fe61fb132299c4183c012770b10c4d5c2f2edb6df0b6607f683d737a
 F ext/fts5/test/fts5merge.test e92a8db28b45931e7a9c7b1bbd36101692759d00274df74d83fd29d25d53b3a6
 F ext/fts5/test/fts5merge2.test 3ebad1a59d6ad3fb66eff6523a09e95dc6367cbefb3cd73196801dea0425c8e2
-F ext/fts5/test/fts5misc.test 3947a481486156536f417a015343f05f9f367a17f282a4e02bdb95bb5bd43293
+F ext/fts5/test/fts5misc.test 416ec0ffbc79320a0760ec32d6684866e3ccd3fbce09f9bcd62d9aee4c666b43
 F ext/fts5/test/fts5multi.test a15bc91cdb717492e6e1b66fec1c356cb57386b980c7ba5af1915f97fe878581
 F ext/fts5/test/fts5multiclient.test 5ff811c028d6108045ffef737f1e9f05028af2458e456c0937c1d1b8dea56d45
 F ext/fts5/test/fts5near.test 211477940142d733ac04fad97cb24095513ab2507073a99c2765c3ddd2ef58bd
 F ext/fts5/test/fts5onepass.test f9b7d9b2c334900c6542a869760290e2ab5382af8fbd618834bf1fcc3e7b84da
 F ext/fts5/test/fts5optimize.test 36a752d24c818792032e4ff502936fc9cc5ef938721696396fdc79214b2717f1
-F ext/fts5/test/fts5optimize2.test c7c97693abe8a2cb572acfb1f252d78f03d3984094cfc5eb2285a76d8a702a92
+F ext/fts5/test/fts5optimize2.test 93e742c36b487d8874621360af5b1ce4d39b04fb9e71ce9bc34015c5fc811785
+F ext/fts5/test/fts5optimize3.test bf9c91bb927d0fb2b9a06318a217a0419183ac5913842e062c7e0b98ea5d0fca
 F ext/fts5/test/fts5phrase.test 13e5d8e9083077b3d9c74315b3c92ec723cc6eb37c8155e0bfe1bba00559f07b
 F ext/fts5/test/fts5plan.test b65cfcca9ddd6fdaa118c61e17aeec8e8433bc5b6bb307abd116514f79c49c5a
 F ext/fts5/test/fts5porter.test 8d08010c28527db66bc3feebd2b8767504aaeb9b101a986342fa7833d49d0d15
@@ -193,12 +194,12 @@ F ext/fts5/test/fts5porter2.test 0d251a673f02fa13ca7f011654873b3add20745f7402f10
 F ext/fts5/test/fts5prefix.test a0fa67b06650f2deaa7bf27745899d94e0fb547ad9ecbd08bfad98c04912c056
 F ext/fts5/test/fts5prefix2.test 3847ce46f70b82d61c6095103a9d7c53f2952c40a4704157bc079c04d9c8b18b
 F ext/fts5/test/fts5query.test ac363b17a442620bb0780e93c24f16a5f963dfe2f23dc85647b869efcfada728
-F ext/fts5/test/fts5rank.test 30f29e278cd7fb8831ba4f082feb74d8eb90c463bf07113ae200afc2b467ef32
+F ext/fts5/test/fts5rank.test c9fd4a1e36b4fa92d572ec13d846469b97da249d1c2f7fd3ee7e017ce46f2416
 F ext/fts5/test/fts5rebuild.test 55d6f17715cddbf825680dd6551efbc72ed916d8cf1cde40a46fc5d785b451e7
 F ext/fts5/test/fts5restart.test 835ecc8f449e3919f72509ab58056d0cedca40d1fe04108ccf8ac4c2ba41f415
 F ext/fts5/test/fts5rowid.test b8790ec170a8dc1942a15aef3db926a5f3061b1ff171013003d8297203a20ad6
 F ext/fts5/test/fts5savepoint.test fc02929f238d02a22df4172625704e029f7c1e0e92e332d654375690f8e6e43f
-F ext/fts5/test/fts5secure.test 833f987e6902a9ab20fabbaa7ca0662c6187fa368cbc7a8082fdf2bf22ee0304
+F ext/fts5/test/fts5secure.test 214a561519d1b1817f146efd1057e2a97cc896e75c2accc77157d874154bda64
 F ext/fts5/test/fts5secure2.test 2e961d7eef939f294c56b5d895cac7f1c3a60b934ee2cfd5e5e620bdf1ba6bbc
 F ext/fts5/test/fts5secure3.test c7e1080a6912f2a3ac68f2e05b88b72a99de38543509b2bbf427cac5c9c1c610
 F ext/fts5/test/fts5secure4.test 0d10a80590c07891478700af7793b232962042677432b9846cf7fc8337b67c97
@@ -233,43 +234,53 @@ F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c
 F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9
 F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282
 F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8
-F ext/jni/GNUmakefile 3deba6bc0bf37c1ee5f15d1ff3c3512ae2f3cf44a2b8ae7b4af92690514b0cb4
-F ext/jni/README.md 5c60e4580aa5c94ff74d7bef1fb6231e578f7764e831a07b5981b6ab62b35560
-F ext/jni/jar-dist.make 93da95f8fe01ef22fccacc27f2e805938058e91e8c72c0532558d3a812a42e74
-F ext/jni/src/c/sqlite3-jni.c bea6b8691a5fa3a8626a771757bb261208d3c5fc6598266d3b0ee23d88e35632
-F ext/jni/src/c/sqlite3-jni.h 28565de9efc971195c684095ba0d184b90401290698c987f7ea3f54e47ff4f2f
-F ext/jni/src/org/sqlite/jni/Authorizer.java 1308988f7f40579ea0e4deeaec3c6be971630566bd021c31367fe3f5140db892
-F ext/jni/src/org/sqlite/jni/AutoExtension.java 18e83f6f463e306df60b2dceb65247d32af1f78af4bbbae9155411a8c6cdb093
-F ext/jni/src/org/sqlite/jni/BusyHandler.java 1b1d3e5c86cd796a0580c81b6af6550ad943baa25e47ada0dcca3aff3ebe978c
-F ext/jni/src/org/sqlite/jni/Collation.java 8dffbb00938007ad0967b2ab424d3c908413af1bbd3d212b9c9899910f1218d1
-F ext/jni/src/org/sqlite/jni/CollationNeeded.java ad67843b6dd1c06b6b0a1dc72887b7c48e2a98042fcf6cacf14d42444037eab8
-F ext/jni/src/org/sqlite/jni/CommitHook.java 87c6a8e5138c61a8eeff018fe16d23f29219150239746032687f245938baca1a
-F ext/jni/src/org/sqlite/jni/Fts5.java 13844685231e8b4840a706db3bed84d5dfcf15be0ae7e809eac40420dba24901
+F ext/jni/GNUmakefile 4e60cdca419ac6783719da98379480b6f04d5d1b5fa1408c46fcb0c32565c571
+F ext/jni/README.md 1332b1fa27918bd5d9ca2d0d4f3ac3a6ab86b9e3699dc5bfe32904a027f3d2a9
+F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
+F ext/jni/src/c/sqlite3-jni.c d6665b309171af316f83a422b0a1c360f760493d9d8cfe239c8f38b639daac47
+F ext/jni/src/c/sqlite3-jni.h a410d05ca47a676b75ff7b8980e75ad604ea15f3c29965f88989703abc2eeaf6
+F ext/jni/src/org/sqlite/jni/AggregateFunction.java 0a5a74bea5ee12a99407e9432d0ca393525af912c2b0ca55c7ee5dbd019c00ef
+F ext/jni/src/org/sqlite/jni/AuthorizerCallback.java c374bb76409cce7a0bdba94877706b59ac6127fa5d9e6af3e8058c99ce99c030
+F ext/jni/src/org/sqlite/jni/AutoExtensionCallback.java 4290d8b0937b07d466b50e6ca4136cec037f3ce658277af0d0c2d371e5f4b459
+F ext/jni/src/org/sqlite/jni/BusyHandlerCallback.java efef1892e404f5780d81c46a7997cab874aff5db5131985dd3af319fc5e3adc7
+F ext/jni/src/org/sqlite/jni/CollationCallback.java 4391351e10f26ca61e9c461f969c12f36e0146e50a8c5b66ff549142bbf41f64
+F ext/jni/src/org/sqlite/jni/CollationNeededCallback.java b2adbe0cb41b67bcb638885e00950abe0265e885326a96451f6ab114fb11ef59
+F ext/jni/src/org/sqlite/jni/CommitHookCallback.java c2b4deec20acf9c72ab487ba1a408c54cb5cc12c45baa46490b555b80bd3579f
+F ext/jni/src/org/sqlite/jni/ConfigSqllogCallback.java e3656909eab7ed0f7e457c5b82df160ca22dd5e954c0a306ec1fca61b0d266b4
+F ext/jni/src/org/sqlite/jni/Fts5.java 3ebfbd5b95fdb9d7bc40306f2e682abd12e247d9224e92510b8dd103b4f96fe8
 F ext/jni/src/org/sqlite/jni/Fts5Context.java 0a5a02047a6a1dd3e4a38b0e542a8dd2de365033ba30e6ae019a676305959890
-F ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java 01f890105c6b7edbbad1c0f5635f783cea62c4b2ae694a71e76514a936ee03ec
+F ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java d475009d654a16060101da6bdfd7f118d49ff61d910faf5a1d1fdb0a1def75f1
 F ext/jni/src/org/sqlite/jni/Fts5Function.java 65cde7151e441fee012250a5e03277de7babcd11a0c308a832b7940574259bcc
 F ext/jni/src/org/sqlite/jni/Fts5PhraseIter.java 6642beda341c0b1b46af4e2d7f6f9ab03a7aede43277b2c92859176d6bce3be9
 F ext/jni/src/org/sqlite/jni/Fts5Tokenizer.java 91489893596b6528c0df5cd7180bd5b55809c26e2b797fb321dfcdbc1298c060
-F ext/jni/src/org/sqlite/jni/NativePointerHolder.java 9c5d901cce4f7e57c3d623f4e2476f9f79a8eed6e51b2a603f37866018e040ee
-F ext/jni/src/org/sqlite/jni/OutputPointer.java d81f8bd43d2296ae373692370cfad16ddde76f5c14cd2760f7b4e1113ef56d4c
-F ext/jni/src/org/sqlite/jni/ProgressHandler.java 6f62053a828a572de809828b1ee495380677e87daa29a1c57a0e2c06b0a131dc
+F ext/jni/src/org/sqlite/jni/NativePointerHolder.java 564087036449a16df148dcf0a067408bd251170bf23286c655f46b5f973e8b2d
+F ext/jni/src/org/sqlite/jni/NotNull.java 08fcfcee93cdf5dd3128a88f9a112c000c143f9e077fcb31e554822595c9d73e
+F ext/jni/src/org/sqlite/jni/Nullable.java b2f8755970e9dd0e917a505638d036ccc699c8422f1a69fe9d98c0804beaea17
+F ext/jni/src/org/sqlite/jni/OutputPointer.java 4ae06135decef35eb04498daa2868939d91a294e948747c580ef9ce31563a6b3
+F ext/jni/src/org/sqlite/jni/PreupdateHookCallback.java 8925c58797a90caeb4a7728a964227db3ba6f953cc89b8be38a5ae6fea063818
+F ext/jni/src/org/sqlite/jni/ProgressHandlerCallback.java 7c46660c6b07a765a3f053ae06a10d7ccb4966b49979143d605a3bfb4f14f806
 F ext/jni/src/org/sqlite/jni/ResultCode.java ba701f20213a5f259e94cfbfdd36eb7ac7ce7797f2c6c7fca2004ff12ce20f86
-F ext/jni/src/org/sqlite/jni/RollbackHook.java b04c8abcc6ade44a8a57129e33765793f69df0ba909e49ba18d73f4268d92564
-F ext/jni/src/org/sqlite/jni/SQLFunction.java 09ce81c1c637e31c3a830d4c859cce95d65f5e02ff45f8bd1985b3479381bc46
-F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 4b6fd22e04e63eb65d8e4e38fda39ecf15ce244d034607517627ce2e766e7e65
-F ext/jni/src/org/sqlite/jni/Tester1.java 4253dc7bcff64500a9388f1a17d3d39dbe4eb9d7db9fc035ce6e2380d45ad5fc
-F ext/jni/src/org/sqlite/jni/TesterFts5.java 59e22dd24af033ea8827d36225a2f3297908fb6af8818ead8850c6c6847557b1
-F ext/jni/src/org/sqlite/jni/Tracer.java a5cece9f947b0af27669b8baec300b6dd7ff859c3e6a6e4a1bd8b50f9714775d
-F ext/jni/src/org/sqlite/jni/UpdateHook.java e58645a1727f8a9bbe72dc072ec5b40d9f9362cb0aa24acfe93f49ff56a9016d
+F ext/jni/src/org/sqlite/jni/RollbackHookCallback.java be7f7a26d1102fb514d835e11198d51302af8053d97188bfb2e34c2133208568
+F ext/jni/src/org/sqlite/jni/SQLFunction.java d060f302b2cc4cf7a4f5a6b2d36458a2e6fc9648374b5d09c36a43665af41207
+F ext/jni/src/org/sqlite/jni/SQLite3CallbackProxy.java 13c4ea6f35871261eba63fa4117715515e0beecbdebfb879ec5b1f340ed36904
+F ext/jni/src/org/sqlite/jni/SQLite3Jni.java d640493f52c04e03f9c0525f16dcec6b718638ace22101c0ccfc014883a15b0b
+F ext/jni/src/org/sqlite/jni/ScalarFunction.java 21301a947e49f0dd9c682dfe2cc8a6518226c837253dd791cd512f847eeca52c
+F ext/jni/src/org/sqlite/jni/Tester1.java 37b46dc15ac8fbeb916dcf1f7771023d2be025d05422d725d5891935eda506ac
+F ext/jni/src/org/sqlite/jni/TesterFts5.java 6f135c60e24c89e8eecb9fe61dde0f3bb2906de668ca6c9186bcf34bdaf94629
+F ext/jni/src/org/sqlite/jni/TraceV2Callback.java 25a45e800b0c57f506c237d111bcfd09da584e936fee395d4bd802100ebeff8c
+F ext/jni/src/org/sqlite/jni/UpdateHookCallback.java f5eadfa44462c050658230884b41477274f34306accd85c8201a7afbc00d2429
 F ext/jni/src/org/sqlite/jni/ValueHolder.java f022873abaabf64f3dd71ab0d6037c6e71cece3b8819fa10bf26a5461dc973ee
+F ext/jni/src/org/sqlite/jni/WindowFunction.java 3e24a0f2615f9a232b1ecbb3f243b05dd7c007dc43be238499af93a459fe8253
+F ext/jni/src/org/sqlite/jni/XDestroyCallback.java 95fb66353e62e4aca8d6ab60e8f14f9235bd10373c34db0a64f5f13f016f0471
 F ext/jni/src/org/sqlite/jni/fts5_api.java 5198be71c162e3e0cb1f4962a7cdf0d7596e8af53f70c4af6db24aab8d53d9ba
 F ext/jni/src/org/sqlite/jni/fts5_extension_function.java ac825035d7d83fc7fd960347abfa6803e1614334a21533302041823ad5fc894c
-F ext/jni/src/org/sqlite/jni/fts5_tokenizer.java e530b36e6437fcc500e95d5d75fbffe272bdea20d2fac6be2e1336c578fba98b
+F ext/jni/src/org/sqlite/jni/fts5_tokenizer.java a9cce7f9c52803f0d8ee7fb8e40c94e88e980dc24a170e6344b9e5ab0a4411fa
+F ext/jni/src/org/sqlite/jni/package-info.java c8f1c858ebcadd16ff047a74cf7a0556d4235386c47bc0a4d78c4a564bba03fe
 F ext/jni/src/org/sqlite/jni/sqlite3.java 62b1b81935ccf3393472d17cb883dc5ff39c388ec3bc1de547f098a0217158fc
-F ext/jni/src/org/sqlite/jni/sqlite3_context.java d26573fc7b309228cb49786e9078597d96232257defa955a3425d10897bca810
+F ext/jni/src/org/sqlite/jni/sqlite3_context.java 66ca95ce904044263a4aff684abe262d56f73e6b06bca6cf650761d79d7779ad
 F ext/jni/src/org/sqlite/jni/sqlite3_stmt.java 78e6d1b95ac600a9475e9db4623f69449322b0c93d1bd4e1616e76ed547ed9fc
 F ext/jni/src/org/sqlite/jni/sqlite3_value.java 3d1d4903e267bc0bc81d57d21f5e85978eff389a1a6ed46726dbe75f85e6914a
-F ext/jni/src/org/sqlite/jni/tester/SQLTester.java 1f1286428fab38dfefe328e72b5735f533b19af8dd17712dd3df7e044d21c8b8
+F ext/jni/src/org/sqlite/jni/tester/SQLTester.java 439d28ac92570e4d16a5361423656f3eae6916c6d4777afde490f77dbb3ec1bc
 F ext/jni/src/org/sqlite/jni/tester/test-script-interpreter.md f9f25126127045d051e918fe59004a1485311c50a13edbf18c79a6ff9160030e
 F ext/jni/src/tests/000-000-sanity.test cfe6dc1b950751d6096e3f5695becaadcdaa048bfe9567209d6eb676e693366d
 F ext/jni/src/tests/000-001-ignored.test e17e874c6ab3c437f1293d88093cf06286083b65bf162317f91bbfd92f961b70
@@ -488,8 +499,6 @@ F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/util/randomshape.tcl 54ee03d0d4a1c621806f7f44d5b78d2db8fac26e0e8687c36c4bd0203b27dbff
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F ext/rtree/visual01.txt e9c2564083bcd30ec51b07f881bffbf0e12b50a3f6fced0c222c5c1d2f94ac66
-F ext/session/changebatch1.test 2ac3b06cf86d6a5935eee8152d164d90030f29cf70218eaa856b235d4b6c18ab
-F ext/session/changebatchfault.test be49c793219bf387ad692a60856b921f0854ad6d
 F ext/session/changeset.c 7a1e6a14c7e92d36ca177e92e88b5281acd709f3b726298dc34ec0fb58869cb5
 F ext/session/changesetfuzz.c 227076ab0ae4447d742c01ee88a564da6478bbf26b65108bf8fac9cd8b0b24aa
 F ext/session/changesetfuzz1.test 2e1b90d888fbf0eea5e1bd2f1e527a48cc85f8e0ff75df1ec4e320b21f580b3a
@@ -508,7 +517,7 @@ F ext/session/sessionD.test f5c6a762d00bc6ca9d561695c322ba8ecca2bed370486707ef37
 F ext/session/sessionE.test b2010949c9d7415306f64e3c2072ddabc4b8250c98478d3c0c4d064bce83111d
 F ext/session/sessionF.test d37ed800881e742c208df443537bf29aa49fd56eac520d0f0c6df3e6320f3401
 F ext/session/sessionG.test 3efe388282d641b65485b5462e67851002cd91a282dc95b685d085eb8efdad0a
-F ext/session/sessionH.test 29a5441c3dc0a63fa596d745e64bc6c636e062ae04cd89bc84e32c7d98b1fa9b
+F ext/session/sessionH.test 71bbff6b1abb2c4ac62b84dee53273c37e0b21e5fde3aed80929403e091ef859
 F ext/session/session_common.tcl e5598096425486b363718e2cda48ee85d660c96b4f8ea9d9d7a4c3ef514769da
 F ext/session/session_speed_test.c dcf0ef58d76b70c8fbd9eab3be77cf9deb8bc1638fed8be518b62d6cbdef88b3
 F ext/session/sessionat.test 00c8badb35e43a2f12a716d2734a44d614ff62361979b6b85419035bc04b45ee
@@ -525,19 +534,17 @@ F ext/session/sessionrowid.test 85187c2f1b38861a5844868126f69f9ec62223a03449a98a
 F ext/session/sessionsize.test 8fcf4685993c3dbaa46a24183940ab9f5aa9ed0d23e5fb63bfffbdb56134b795
 F ext/session/sessionstat1.test b039e38e2ba83767b464baf39b297cc0b1cc6f3292255cb467ea7e12d0d0280c
 F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
-F ext/session/sqlite3changebatch.c d5553b79e012ee2cb06c0a96bdf9dfe19e66354390ea0036cc46c4953142d517
-F ext/session/sqlite3changebatch.h e72016998c9a22d439ddfd547b69e1ebac810c24
-F ext/session/sqlite3session.c 2d84cd1d0bd927a59b538c3c7593aefbe3db139a50346f1120bfe6def2f8ab61
-F ext/session/sqlite3session.h 0acea22732ef17c1d56d68cdd70948101e7ee2053e92764a80051d9572d432d1
-F ext/session/test_session.c 8957ef47655196b0d94cde7095b294fe34d7bac25c5dc7c4bb21a0b6e4f991c7
+F ext/session/sqlite3session.c 1971b61ca45babf0d9e4bb669a65b0903135e9828af2fcd4f0c8f1b7acf36b6f
+F ext/session/sqlite3session.h 653e9d49c4edae231df8a4c8d69c2145195aedb32462d4b44229dbee7d2680fb
+F ext/session/test_session.c 5285482f83cd92b4c1fe12fcf88210566a18312f4f2aa110f6399dae46aeccbb
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
-F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
-F ext/wasm/GNUmakefile 7eea788d3cde04135da82451a0afcd22f264157544ba69464a9285319a44b41d
+F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
+F ext/wasm/GNUmakefile 594f5a6dc889f836ebdf0d4a35a9c39fbf56cd2827416cdd98b5244f51519901
 F ext/wasm/README-dist.txt 6382cb9548076fca472fb3330bbdba3a55c1ea0b180ff9253f084f07ff383576
 F ext/wasm/README.md a8a2962c3aebdf8d2104a9102e336c5554e78fc6072746e5daf9c61514e7d193
-F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api c5eaceabb9e759aaae7d3101a4a3e542f96ab2c99d89a80ce20ec18c23115f33
+F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api d6a5078f48a5301ed17b9a30331075d9b2506e1360c1f0dee0c7816c10acd9ab
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-see fb29e62082a658f0d81102488414d422c393c4b20cc2f685b216bc566237957b
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 5eb44fa02e9c693a1884a3692428647894b0380b24bca120866b7a24c8786134
@@ -547,17 +554,17 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js 47b6b281f39ad59fa6e8b658308cd98ea292c286a68407b35ff3ed9cfd281a62
 F ext/wasm/api/pre-js.c-pp.js ad906703f7429590f2fbf5e6498513bf727a1a4f0ebfa057afb08161d7511219
 F ext/wasm/api/sqlite3-api-cleanup.js d235ad237df6954145404305040991c72ef8b1881715d2a650dda7b3c2576d0e
-F ext/wasm/api/sqlite3-api-glue.js 26aedfb27915f4f316f6eac84078443e4f0d2dfe5f012310014923ed4b77b2b6
+F ext/wasm/api/sqlite3-api-glue.js b65e546568f1dfb35205b9792feb5146a6323d71b55cda58e2ed30def6dd52f3
 F ext/wasm/api/sqlite3-api-oo1.js 9678dc4d9a5d39632b6ffe6ea94a023119260815bf32f265bf5f6c36c9516db8
-F ext/wasm/api/sqlite3-api-prologue.js 5f283b096b98bfb1ee2f2201e7ff0489dff00e29e1030c30953bdb4f5b87f4bd
+F ext/wasm/api/sqlite3-api-prologue.js ef6f67c5ea718490806e5e17d2644b8b2f6e6ba5284d23dc1fbfd14d401c1ab5
 F ext/wasm/api/sqlite3-api-worker1.js 9f32af64df1a031071912eea7a201557fe39b1738645c0134562bb84e88e2fec
 F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 8cf8a897726f14071fae6be6648125162b256dfb4f96555b865dbb7a6b65e379
 F ext/wasm/api/sqlite3-v-helper.js 7daa0eab0a513a25b05e9abae7b5beaaa39209b3ed12f86aeae9ef8d2719ed25
-F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js c7caf5ccd85d6e92bee4285871d51bc0e3e635b3e2d76f50515f5482a0ec0239
-F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js cf0a2a182d16e71c5ccb1a870bfdba0d0da5e2fe5542907b036e92b3db5982c3
-F ext/wasm/api/sqlite3-wasm.c d4d4c2b349b43b7b861e6d2994299630fb79e07573ea6b61e28e8071b7d16b61
-F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js c5ac33e39f21a3481812d7333ca6e18853640d423a01960ca8dbc6e7c5c3c21c
+F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 561463ac5380e4ccf1839a1922e6d7a5585660f32e3b9701a270b78cd35566cf
+F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js d9e62d42b86f7bb3143eb071628b24e2ba7dcc749e41a0e9d3e2451bfea1a6b6
+F ext/wasm/api/sqlite3-wasm.c 6773e949034369ddd2a1efdedc39b2808a10b7274b0769188905432e561feebe
+F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bc06df0d599e625bde6a10a394e326dc68da9ff07fa5404354580f81566e591f
 F ext/wasm/api/sqlite3-worker1.c-pp.js da509469755035e919c015deea41b4514b5e84c12a1332e6cc8d42cb2cc1fb75
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
 F ext/wasm/batch-runner.js 0dad6a02ad796f1003d3b7048947d275c4d6277f63767b8e685c27df8fdac93e
@@ -580,8 +587,8 @@ F ext/wasm/example_extra_init.c 2347cd69d19d839ef4e5e77b7855103a7fe3ef2af86f2e8c
 F ext/wasm/fiddle.make fa2ba6e90457ba2a71cb745f200d409caf773076df75ae5b177cc225d7627a11
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js e0153f9af6500805c6f09c0b3cfdb7d857e9d6863dbee9d50d1628fccf5f4b4d
-F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
+F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html 22379774f0ad4edcaaa8cf9c674c82e794cc557719a8addabed74eb8069d412e
 F ext/wasm/index.html 4e7847b909f4ae0da8c829b150b79454050e53b3658431f138636257729cd42b
 F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54
@@ -601,7 +608,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js f09266873e1a34d9bdb6d3981ec8c9e382f31f215c9fd2f9016d2394b8ae9b7b
 F ext/wasm/tester1-worker.html ebc4b820a128963afce328ecf63ab200bd923309eb939f4110510ab449e9814c
 F ext/wasm/tester1.c-pp.html 1c1bc78b858af2019e663b1a31e76657b73dc24bede28ca92fbe917c3a972af2
-F ext/wasm/tester1.c-pp.js 64eb0ee6e695d5638d0f758f31a0ca2231e627ca5d768de3d8b44f9f494de8d4
+F ext/wasm/tester1.c-pp.js 9e0f4da49f02753a73a5f931bfb9b1458175518daa3fec40b5ebdc06c285539c
 F ext/wasm/tests/opfs/concurrency/index.html 0802373d57034d51835ff6041cda438c7a982deea6079efd98098d3e42fbcbc1
 F ext/wasm/tests/opfs/concurrency/test.js a98016113eaf71e81ddbf71655aa29b0fed9a8b79a3cdd3620d1658eb1cc9a5d
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
@@ -609,7 +616,7 @@ F ext/wasm/wasmfs.make 8a4955882aaa0783b3f60a9484a1f0f3d8b6f775c0fcd17c082f31966
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 9ec18b7b3f00b776327344cbbe1d24124508f2ce731bf0ed751ba1c40a428e31
+F main.mk 5536159f62058714c972b5bd325c8d5ecd5c9b00b385dd2e1cbc17da70a711b2
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -626,12 +633,12 @@ F src/analyze.c d4cc28738c29e009640ec20ebb6936ba6fcefff0d11aa93398d9bb9a5ead6c1f
 F src/attach.c cc9d00d30da916ff656038211410ccf04ed784b7564639b9b61d1839ed69fd39
 F src/auth.c 19b7ccacae3dfba23fc6f1d0af68134fa216e9040e53b0681b4715445ea030b4
 F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
-F src/bitvec.c 501daeef838fa82a9fb53540d72f29e3d9172c8867f1e19f94f681e2e20b966e
+F src/bitvec.c 9eac5f42c11914d5ef00a75605bb205e934f435c579687f985f1f8b0995c8645
 F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522
-F src/btree.c ab9d1674d11799a2bf648d347dcccf45ba52629b5132c6676d903751280493ee
-F src/btree.h d906e4d53f483c83d471d99479fa73fcdf20696305d578876f46ee283f3507cb
-F src/btreeInt.h e941b5c41efef760e6f8826f308ec9e9a480d26e615f565a1a4bdb07aff496b1
-F src/build.c 84238806b9a9ca5373ccaea65a86129717d023bc582919f7f5a91d1b92e1a4c1
+F src/btree.c 7a37bdf09f338561880860681cb03499a60c3bb0869e539c58bc1d2cdd705ff2
+F src/btree.h 03e3356f5208bcab8eed4e094240fdac4a7f9f5ddf5e91045ce589f67d47c240
+F src/btreeInt.h 91a9e0c41a0e71fa91a742ec285c63dd8dcb38b73d14fae0ed7209174ff0fdc1
+F src/build.c a8ae3b32d9aa9bbd2c0e97d7c0dd80def9fbca408425de1608f57ee6f47f45f4
 F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c cff2b493de894383832347c3a3f936a05f4e089a92b42366838da1735f3848b5
@@ -642,17 +649,17 @@ F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
 F src/expr.c 1affe0cc049683ef0ef3545d9b6901508556b0ef7e2892a344c3df6d7288d79d
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a7fcbf7e66d14dbb73cf49f31489ebf66d0e6006c62b95246924a3bae9f37b36
-F src/func.c 734fe24efbeb4ef945007695c4dfa3d93597d8d5cbce30a368e33a63a4ceb61b
+F src/func.c dd1ecd1be6aaa67c9fa723f841e05e1536314c6aaa0509e25289b310f64dbb9c
 F src/global.c 29f56a330ed9d1b5cd9b79ac0ca36f97ac3afc730ff8bfa987b0db9e559d684d
 F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
-F src/json.c 5c25f82e1c0f3eb44fb9a23feff6b7b952fd40122d9e3ab601a84ea83710a980
+F src/json.c ae840f87b418f039f5d336b488933d09396bd31e6b31e855b93055ccaee4e255
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
-F src/main.c e56843b488ead74369eeffc64cd5b9d3a7ffbf8621bb0cd695272d9b9ce53afa
+F src/main.c fde8f13c876a658b4e8b74b77d875ca887915c174ea6a2f3122d80966f93d865
 F src/malloc.c 47b82c5daad557d9b963e3873e99c22570fb470719082c6658bf64e3012f7d23
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@ -673,33 +680,33 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
 F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
-F src/os_unix.c 587a756c1244e1e2fc1c7ca8d77de891c13c177fbc3c5bfeee58f75445499baa
+F src/os_unix.c 2e8b12107f75d1bd16412f312b4c5d5103191807a37836d3b81beb26436ad81b
 F src/os_win.c 4a50a154aeebc66a1f8fb79c1ff6dd5fe3d005556533361e0d460d41cb6a45a8
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 356c794f7fd5f76318843287497e1711278f2a3174d736ade8397ff4c934d70a
-F src/pager.h 116cbdc21f0f255de6e6091ebde1a3fbf63e521c099e89045cd75f7b037d59be
-F src/parse.y 92a9cc670816e1274a107d02ed8efec6028c23713c767f035479fde411c86f27
+F src/pager.c 993445a19b611d473ca007542ab3149840661a4c7e9f2d9e1ec008b7cc2abe78
+F src/pager.h f4d33fec8052603758792045493423b8871a996da2d0973927b7d36cd6070473
+F src/parse.y aeb7760d41cfa86465e3adba506500c021597049fd55f82a30e5b7045862c28c
 F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
 F src/pragma.c 37b8fb02d090262280c86e1e2654bf59d8dbfbfe8dc6733f2b968a11374c095a
-F src/pragma.h 1f421360eed1a7721e8c521463df8519a7c8d0d5893ebd9dbfe0dba8de996f8c
+F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 80548297dc0e1fb3139cdebffb5a1bcac3dfac66d791012dd74838e70445072d
 F src/printf.c e3ba080e2f409f9bfcc8d34724e6fc160e9c718dc92d0548f6b71b8b6f860ce2
-F src/random.c a3e70f8515721ff24d2c0e6afd83923e8faab5ab79ececea4c1bf9fe4049fbb2
+F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 37953a5f36c60bea413c3c04efcd433b6177009f508ef2ace0494728912fe2e9
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
-F src/select.c 50051b914873ddf497b4aa3f1cdbc99d4be98d64443cf8c799c0ec5ebbdda4f4
-F src/shell.c.in d381ea090c17db5d50049e6c06e9e175d8d712c7f9bc7a0b8a51616af44f060c
-F src/sqlite.h.in 866a39afb9215fb8b6a2b5ef7c64fbd90ff590afed863ade038ba79272fa428f
+F src/select.c 5f545a2c8702d4d3430bbb188cfec47d6c122d899061ef00cbe56af14591c574
+F src/shell.c.in 2f9be25294b68b07e7e81f0adcec4475aba6011b64f160e414efe226910c4d7b
+F src/sqlite.h.in 73a366c1c45d5ac9888cfe81c458826a44498531d106cfb4f328193ab5f6f17d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 2f30b2671f4c03cd27a43f039e11251391066c97d11385f5f963bb40b03038ac
-F src/sqliteInt.h e889cc24d80f126d25a89ae1c4aa4ec7d3ad38500c51bdc00627cd8016e51411
+F src/sqliteInt.h 025ed58a41968ef80d64cdc194caa8dd207b0256b147253d762fdac7a62408f9
 F src/sqliteLimit.h 33b1c9baba578d34efe7dfdb43193b366111cdf41476b1e82699e14c11ee1fb6
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c ecbc3c99c0d0c3ed122a913f143026c26d38d57f33e06bb71185dd5c1efe37cd
-F src/test1.c e7259249cb89c9c26a5df2dd91815bd6af77401042709ab092396196c114aff0
+F src/test1.c ebba2473874a23add4a10881b90bd445cfa7f59f90749434938aec14239c6486
 F src/test2.c 54520d0565ef2b9bf0f8f1dcac43dc4d06baf4ffe13d10905f8d8c3ad3e4b9ab
 F src/test3.c e5178558c41ff53236ae0271e9acb3d6885a94981d2eb939536ee6474598840e
 F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
@@ -713,7 +720,7 @@ F src/test_backup.c bf5da90c9926df0a4b941f2d92825a01bbe090a0
 F src/test_bestindex.c 68c62586d2ae9f032903fe53be743657d0c2aac0a850b880938b668e1161d516
 F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31ce
 F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
-F src/test_config.c 4ad524247225326ccc0046b8820e4ae2cefd687d0263f752f59259704e05d98a
+F src/test_config.c f0cc1f517deaa96dd384822ae2bb91534fa56aa458528b439830d709941d3932
 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
 F src/test_demovfs.c 38a459d1c78fd9afa770445b224c485e079018d6ac07332ff9bd07b54d2b8ce9
 F src/test_devsym.c 649434ed34d0b03fbd5a6b42df80f0f9a7e53f94dd1710aad5dd8831e91c4e86
@@ -754,25 +761,25 @@ F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 23d9f4539880b40226254ad9072f4ecf12eb1902e62aea47aac29928afafcfd5
 F src/treeview.c 1d52fbc4e97161e65858d36e3424ea6e3fc045dd8a679c82b4b9593dc30de3bd
 F src/trigger.c ad6ab9452715fa9a8075442e15196022275b414b9141b566af8cdb7a1605f2b0
-F src/update.c c45d7d8aedf65a5a971b368a18550079550e58d45ef8b19124a9357f130f76b7
+F src/update.c 6904814dd62a7a93bbb86d9f1419c7f134a9119582645854ab02b36b676d9f92
 F src/upsert.c fa125a8d3410ce9a97b02cb50f7ae68a2476c405c76aa692d3acf6b8586e9242
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
-F src/util.c 79f084901f52d9d7025200a177f7d1d66f83a73333fe486a2626490eaa49bc4c
-F src/vacuum.c b1dd6d73869229b6e08bac910ac011dc9da42e3120ec2b7241accc5a752bd419
-F src/vdbe.c ed1b8487a88aba5d2880dfba514276cbe2107b5986910fc49f616e00b29d9441
+F src/util.c 278b81c3b33db1b5a5f3859adf8905c165b910080043061d44d3c5a25b4b406d
+F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
+F src/vdbe.c 346d848a0bf8128e3e3722c5406f4bde6c32d7093b93402c6f8e0718d19305c3
 F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
 F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
 F src/vdbeapi.c 37341acd781fda162e8cf4d9fc2eaea2febad3b365877a9d7233b8c6d0960d85
-F src/vdbeaux.c 2c87c99975ac23e777e9c270d979eca38f2a021b1f14f061c83faab5b24d5576
-F src/vdbeblob.c 4cf5aa130e96e3b52ba3fb54b7f9606c942ab988dbb32cb19cff4db24e06aeec
+F src/vdbeaux.c e3aa5c46827cd95e0fc4d0f302fa3e901ab5f07258fdbb42709eeef40f63018d
+F src/vdbeblob.c 2516697b3ee8154eb8915f29466fb5d4f1ae39ee8b755ea909cefaf57ec5e2ce
 F src/vdbemem.c 317b9f48708139db6239ade40c7980b4bc8233168383690d588dad6d8437f722
 F src/vdbesort.c 0d40dca073c94e158ead752ef4225f4fee22dee84145e8c00ca2309afb489015
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c 57fa8f56478e5b5cb558cb425e7878515e0a105c54f96f1d1bbf4b9433529254
 F src/vtab.c 1ecf8c3745d29275688d583e12822fa984d421e0286b5ef50c137bc3bf6d7a64
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c e0f74d2495339741411551ed3c5d4b7dfe4ba089b1a03ad491ed5c1c1b98cb33
-F src/wal.h e9aeb67102d9b9a0b089b80bd6136a16dd6360ac3daa731f2b71c6d4f8341717
+F src/wal.c 01e051a1e713d9eabdb25df38602837cec8f4c2cae448ce2cf6accc87af903e9
+F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
 F src/where.c b8917792f1e0dbfa28fb29e6cd3d560060d69667be0ba4c491cbc772363264f5
 F src/whereInt.h c7d19902863beadec1d04e66aca39c0bcd60b74f05f0eaa7422c7005dfc5d51a
@@ -862,7 +869,6 @@ F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f
 F test/badutf2.test f310fd3b24a491b6b77bccdf14923b85d6ebcce751068c180d93a6b8ff854399
 F test/basexx1.test d8a50f0744b93dca656625597bcd3499ff4b9a4ea2a82432b119b7d46e3e0c08
 F test/bc_common.tcl b5e42d80305be95697e6370e015af571e5333a1c
-F test/bc_test1.c e0a092579552e066ed4ce7bcdaecfa69c4aacc8d
 F test/bestindex1.test 856a453dff8c68b4568601eed5a8b5e20b4763af9229f3947c215729ed878db0
 F test/bestindex2.test 394ff8fbf34703391247116d6a44e1c50ee7282236ee77909044573cefc37bc0
 F test/bestindex3.test 34bea272b0e0f835651b16a3931dbe7ac927039be6b2e1cb617bbe1d584b492b
@@ -932,16 +938,6 @@ F test/collateB.test 1e68906951b846570f29f20102ed91d29e634854ee47454d725f2151eca
 F test/colmeta.test 2c765ea61ee37bc43bbe6d6047f89004e6508eb1
 F test/colname.test 87ad5458bb8709312dac0d6755fd30e8e4ca83298d0a9ef6e5c24277a3c3390e
 F test/columncount.test 6fe99c2f35738b0129357a1cf3fa483f76140f4cd8a89014c88c33c876d2638f
-F test/concfault.test e5370cd686f601a01909377cac3bbf13dac56d39dd4ad6b04ccbec9eeeaccb18
-F test/concurrent.test fb624ddac9b008f347685911f90b6b5a022fd0a3f884c0ffef8056bc440e5d76
-F test/concurrent2.test de748c7dd749c77e2af2c4b914b9b09a28ac09608042ca498c0251dc6f46aa1a
-F test/concurrent3.test 82923fc2ea7321144b4448f98ea38aa316ddceef9020a392c5f6dea536506434
-F test/concurrent4.test e0b12cd467137e50259df3b4f837507e82aaa07c35941c88664dc8ed1d089c44
-F test/concurrent5.test 0c16cbf7446af162a14e6def30445e94016064eb994e5aa4ebb2bebc59554176
-F test/concurrent6.test a7860e9ca13bb5fb76bcf41c5524fbfa9c37e6e258ecf84ffb5748a272488c67
-F test/concurrent7.test b96fa5c4cfdf8d5c0bc66b6934214500bad0260884a736f054ccc76e81aae85d
-F test/concurrent8.test b93937e74a8efb8b84f2fea7595b53418c5f29777bbe9cbdb5dc219b3dd72a7d
-F test/concurrent9.test 92a7315092e54c7377e58cfce1c158aa55f6915a026aff27da00db088676101b
 F test/conflict.test b705cddf025a675d3c13d62fa78ab1e2696fb8e07a3d7cccce1596ff8b301492
 F test/conflict2.test 5557909ce683b1073982f5d1b61dfb1d41e369533bfdaf003180c5bc87282dd1
 F test/conflict3.test 81865d9599609aca394fb3b9cd5f561d4729ea5b176bece3644f6ecb540f88ac
@@ -968,7 +964,7 @@ F test/corruptJ.test 4d5ccc4bf959464229a836d60142831ef76a5aa4
 F test/corruptK.test 5b4212fe346699831c5ad559a62c54e11c0611bdde1ea8423a091f9c01aa32af
 F test/corruptL.test 504d90502d9993440226edc355d2275524b89064ea3df5ee5c27f7028ec59d07
 F test/corruptM.test 7d574320e08c1b36caa3e47262061f186367d593a7e305d35f15289cc2c3e067
-F test/corruptN.test 046a637064be7830d202765763063568621551bc5ffd6dea8eaf4db0f3536e82
+F test/corruptN.test 7c099d153a554001b4fb829c799b01f2ea6276cbc32479131e0db0da4efd9cc4
 F test/cost.test b11cdbf9f11ffe8ef99c9881bf390e61fe92baf2182bad1dbe6de59a7295c576
 F test/count.test cd4bd531066e8d77ef8fe1e3fc8253d042072e117ccab214b290cf83f1602249
 F test/countofview.test 4088e461a10ee33e69803c177a69aa1d7bba81a9ffc2df66d76465a22ca7fdfc
@@ -1172,7 +1168,7 @@ F test/fts4umlaut.test fcaca4471de7e78c9d1f7e8976e3e8704d7d8ad979d57a739d00f3f75
 F test/fts4unicode.test 82a9c16b68ba2f358a856226bb2ee02f81583797bc4744061c54401bf1a0f4c9
 F test/fts4upfrom.test f25835162c989dffd5e2ef91ec24c4848cc9973093e2d492d1c7b32afac1b49d
 F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
-F test/func.test cbcf086273529d4a99b7199086da637a99039d2cad81dd7d7c4c9e25258ae164
+F test/func.test 2acd982669b2c15ceccc046385b458e985f90c9ca58b14d0ef75eec79c32f45b
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/func3.test 600a632c305a88f3946d38f9a51efe145c989b2e13bd2b2a488db47fe76bab6a
 F test/func4.test 2285fb5792d593fef442358763f0fd9de806eda47dbc7a5934df57ffdc484c31
@@ -1289,8 +1285,8 @@ F test/json/README.md 63e3e589e1df8fd3cc1588ba1faaff659214003f8b77a15af5c6452b35
 F test/json/json-generator.tcl dc0dd0f393800c98658fc4c47eaa6af29d4e17527380cd28656fb261bddc8a3f
 F test/json/json-q1.txt 65f9d1cdcc4cffa9823fb73ed936aae5658700cd001fde448f68bfb91c807307
 F test/json/json-speed-check.sh 8b7babf530faa58bd59d6d362cec8e9036a68c5457ff46f3b1f1511d21af6737 x
-F test/json101.test 4d78048b185ffb9ae37645fa6934d48fc182473ae0bae088a1e2f7ba483c3a71
-F test/json102.test 4c69694773a470f1fda34e5f4ba24920b35184fb66050b450fc2ef9ab5ad310b
+F test/json101.test dc9d5a2a5b1fd1b54dbd71c538b17933cc98d84b4c1f821ead754933663dca55
+F test/json102.test 24f6f204f9cde45b971016691d0b92a9b4c58040d699e36d6b12cb165f9083ff
 F test/json103.test 53df87f83a4e5fa0c0a56eb29ff6c94055c6eb919f33316d62161a8880112dbe
 F test/json104.test 1b844a70cddcfa2e4cd81a5db0657b2e61e7f00868310f24f56a9ba0114348c1
 F test/json105.test 11670a4387f4308ae0318cadcbd6a918ea7edcd19fbafde020720a073952675d
@@ -1383,7 +1379,6 @@ F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test 437d40e6d0778b050d7750726c0cbd2c9936b81962926e8f8c48ca698f00f4d1
 F test/nockpt.test 8c43b25af63b0bd620cf1b003529e37b6f1dc53bd22690e96a1bd73f78dde53a
 F test/nolock.test f196cf8b8fbea4e2ca345140a2b3f3b0da45c76e
-F test/noop_update.test 74d71bbe5d37f7861cc2402ed620eb165b8e6b00159cdcada7df716420336651
 F test/normalize.test f23b6c5926c59548635fcf39678ac613e726121e073dd902a3062fbb83903b72
 F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf
 F test/notify2.test 2ecabaa1305083856b7c39cf32816b612740c161
@@ -1423,6 +1418,7 @@ F test/pagerfault2.test caf4c7facb914fd3b03a17b31ae2b180c8d6ca1f
 F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
 F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0
 F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
+F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035ce4b3
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/pendingrace.test cbdf0f74bc939fb43cebad64dda7a0b5a3941a10b7e9cc2b596ff3e423a18156
@@ -1517,7 +1513,7 @@ F test/selectD.test 6d1909b49970bf92f45ce657505befcef5fc7cbc13544e18103a316d3218
 F test/selectE.test a8730ca330fcf40ace158f134f4fe0eb00c7edbf
 F test/selectF.test 21c94e6438f76537b72532fa9fd4710cdd455fc3
 F test/selectG.test 089f7d3d7e6db91566f00b036cb353107a2cca6220eb1cb264085a836dae8840
-F test/selectH.test 0b54599f1917d99568c9b929df22ec6261ed7b6d2f02a46b5945ef81b7871aac
+F test/selectH.test 88237ded5925adfb3f27fdafb5428c2ffc4d61e313bceb854e225ffc3ef0d206
 F test/session.test 78fa2365e93d3663a6e933f86e7afc395adf18be
 F test/sessionfuzz-data1.db 1f8d5def831f19b1c74571037f0d53a588ea49a6c4ca2a028fc0c27ef896dbcb
 F test/sessionfuzz.c 5eef09af01eeff6f20250ae4c0112c2e576e4d2f2026cc9a49dc5be6886fa6ee
@@ -1619,8 +1615,8 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 68454ef88508c196d19e8694daa27bff7107a91857799eaa12f417188ae53ede
-F test/testrunner.tcl a9fee4df57276bc9e446961b160068c269da5902cc8ffc3e8852d77626b7594c
-F test/testrunner_data.tcl 968cfee74688eb698b6917b7e53aba2993a1789430192d5efd27d2173c2e36c6
+F test/testrunner.tcl c88eae7d8ba9825d09f080ee2aa98b8e65c381bb56b4d427fb492625d2d4c36b
+F test/testrunner_data.tcl 7d698b094b66b2a9849c6a592fe7083fd76b382257d49985b3487f2f5bf412ad
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1809,7 +1805,6 @@ F test/triggerG.test 2b816093c91ba73c733cfa8aedcc210ad819d72a98b1da30768a3c56505
 F test/triggerupfrom.test d1f9e56090408115c522bee626cc33a2f3370f627a5e341d832589d72e3aa271
 F test/trustschema1.test d2996bb284859c99956ac706160eab9f086919da738d19bfef3ac431cce8fd47
 F test/tt3_checkpoint.c ac7ca661d739280c89d9c253897df64a59a49369bd1247207ac0f655b622579d
-F test/tt3_core.c 8cd89ead95410f70e7fb02c79f1e040f9c5ad5cf
 F test/tt3_index.c 39eec10a35f57672225be4d182862152896dee4a
 F test/tt3_lookaside1.c 0377e202c3c2a50d688cb65ba203afeda6fafeb9
 F test/tt3_shared.c b37d22defc944a2ac4c91c927fd06c1d48cd51e2ce9d004fe868625bd2399f93
@@ -1886,7 +1881,7 @@ F test/vtabdistinct.test 7688f0889358f849fd60bbfde1ded38b014b18066076d4bfbb75395
 F test/vtabdrop.test 65d4cf6722972e5499bdaf0c0d70ee3b8133944a4e4bc31862563f32a7edca12
 F test/vtabrhs1.test 9b5ecbc74a689500c33a4b2b36761f9bcc22fcc4e3f9d21066ee0c9c74cf5f6c
 F test/wal.test b7cc6984709f54afbf8441747ced1f646af120bf0c1b1d847bfa39306fbea089
-F test/wal2.test 88d34cc62bf5460ad6b1f837cd56ab55731bb0637ff99e113b790873d9b60b14
+F test/wal2.test 31f6e2c404b9f2cdf9ca19b105a1742fdc19653c2c936da39e3658c617524046
 F test/wal3.test 5de023bb862fd1eb9d2ad26fa8d9c43abb5370582e5b08b2ae0d6f93661bc310
 F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
@@ -1895,7 +1890,7 @@ F test/wal64k.test 2a525c0f45d709bae3765c71045ccec5df7d100ccbd3a7860fdba46c9addb
 F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 F test/wal8.test d9df3fba4caad5854ed69ed673c68482514203c8
 F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
-F test/wal_common.tcl 37902864b63794e9bf59393b8887e21a9cbd4db8
+F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 F test/walbak.test 018d4e5a3d45c6298d11b99f09a8ef6876527946
 F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 F test/walblock.test be48f3a75eff0b4456209f26b3ce186c2015497d
@@ -2029,7 +2024,7 @@ F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c c34e5944318415de513d29a6098df247a9618c96d83c38d4abd88641fe46e669
 F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
-F tool/mkautoconfamal.sh 7077151b62ecb2848c5b2d36cdbcd8caa0b58f2c12dcdac6e982da39d29d213c
+F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
 F tool/mkctimec.tcl aca4b83e49aecf10368cd5d11bc4847061041ade026db5bd8da17ef201f1403b x
 F tool/mkkeywordhash.c b9faa0ae7e14e4dbbcd951cddd786bf46b8a65bb07b129ba8c0cfade723aaffd
@@ -2037,7 +2032,7 @@ F tool/mkmsvcmin.tcl 8897d515ef7f94772322db95a3b6fce6c614d84fe0bdd06ba5a1c786351
 F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
 F tool/mkopcodeh.tcl 769d9e6a8b462323150dc13a8539d6064664b72974f7894befe2491cc73e05cd
 F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
-F tool/mkpragmatab.tcl 8dcba40365eceba24f059d82bbc8b61bb647d5a0b8076f24a1876872a1b58832
+F tool/mkpragmatab.tcl bd07bd59d45d0f3448e123d6937e9811195f9908a51e09d774609883055bfd3d
 F tool/mkshellc.tcl b7adf08b82de60811d2cb6af05ff59fc17e5cd6f3e98743c14eaaa3f8971fed0
 F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@ -2077,7 +2072,6 @@ F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaa
 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
 F tool/src-verify.c 41c586dee84d0b190ad13e0282ed83d4a65ec9fefde9adf4943efdf6558eea7f
 F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f
-F tool/srctree-check.tcl cef630bc4ff21a460d72479c43a42bf1c1ed61897659305c35c8d72e91bcb176
 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
 F tool/stripccomments.c 20b8aabc4694d0d4af5566e42da1f1a03aff057689370326e9269a9ddcffdc37
 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
@@ -2110,8 +2104,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c78679850649c1a0a48a8b51c1069c388f62eeeeb153c929055a321d0a20b6c9 4310099cce5a487035fa535dd3002c59ac7f1d1bec68d7cf317fd3e769484790
-R 22f778be6411d544db76a7afad269328
-U drh
-Z d8631650768b41695fb495ec9dd101a0
+P 26ae090889640bfcf02a6dd5aa58044edd4d0708a11d8e005149f1a3c8495bba
+R 72ed41043ab228a8430556867561403b
+U dan
+Z 47e21353f9923e8c0acadea18c12278f
 # Remove this line to create a well-formed Fossil manifest.

manifest.uuid

@@ -1 +1 @@
-f3fb30af03b32ef6b41b5e0e283a56518564dd058ec43a8d230b617944b0d83e
+6463192369ff22eb15d4e34590ef55cd8a6f2501227835664816277806bf961b

src/bitvec.c

@@ -171,12 +171,6 @@ int sqlite3BitvecSet(Bitvec *p, u32 i){
   if( p==0 ) return SQLITE_OK;
   assert( i>0 );
   assert( i<=p->iSize );
-  if( i>p->iSize || i==0 ){
-    sqlite3_log(SQLITE_ERROR, 
-        "Bitvec: setting bit %d of bitvec size %d\n", (int)i, (int)p->iSize
-    );
-    abort();
-  }
   i--;
   while((p->iSize > BITVEC_NBIT) && p->iDivisor) {
     u32 bin = i/p->iDivisor;

src/btree.c

@@ -481,240 +481,7 @@ static void downgradeAllSharedCacheTableLocks(Btree *p){
 
 #endif /* SQLITE_OMIT_SHARED_CACHE */
 
-#ifndef SQLITE_OMIT_CONCURRENT
-/*
-** The following structure - BtreePtrmap - stores the in-memory pointer map
-** used for newly allocated pages in CONCURRENT transactions. Such pages are
-** always allocated in a contiguous block (from the end of the file) starting
-** with page BtreePtrmap.iFirst.
-*/
-typedef struct RollbackEntry RollbackEntry;
-typedef struct PtrmapEntry PtrmapEntry;
-struct PtrmapEntry {
-  Pgno parent;
-  u8 eType;
-};
-struct RollbackEntry {
-  Pgno pgno;
-  Pgno parent;
-  u8 eType;
-};
-struct BtreePtrmap {
-  Pgno iFirst;                    /* First new page number aPtr[0] */
-
-  int nPtrAlloc;                  /* Allocated size of aPtr[] array */
-  PtrmapEntry *aPtr;              /* Array of parent page numbers */
-
-  int nSvpt;                      /* Used size of aSvpt[] array */
-  int nSvptAlloc;                 /* Allocated size of aSvpt[] */
-  int *aSvpt;                     /* First aRollback[] entry for savepoint i */
-
-  int nRollback;                  /* Used size of aRollback[] array */
-  int nRollbackAlloc;             /* Allocated size of aRollback[] array */
-  RollbackEntry *aRollback;       /* Array of rollback entries */
-};
-
-/* !defined(SQLITE_OMIT_CONCURRENT)
-**
-** If page number pgno is greater than or equal to BtreePtrmap.iFirst, 
-** store an entry for it in the pointer-map structure.
-*/
-static int btreePtrmapStore(
-  BtShared *pBt,
-  Pgno pgno,
-  u8 eType, 
-  Pgno parent
-){
-  BtreePtrmap *pMap = pBt->pMap;
-  if( pgno>=pMap->iFirst ){
-    int iEntry = pgno - pMap->iFirst;
-
-    /* Grow the aPtr[] array as required */
-    while( iEntry>=pMap->nPtrAlloc ){
-      int nNew = pMap->nPtrAlloc ? pMap->nPtrAlloc*2 : 16;
-      PtrmapEntry *aNew = (PtrmapEntry*)sqlite3_realloc(
-          pMap->aPtr, nNew*sizeof(PtrmapEntry)
-      );
-      if( aNew==0 ){
-        return SQLITE_NOMEM;
-      }else{
-        int nByte = (nNew-pMap->nPtrAlloc)*sizeof(PtrmapEntry);
-        memset(&aNew[pMap->nPtrAlloc], 0, nByte);
-        pMap->aPtr = aNew;
-        pMap->nPtrAlloc = nNew;
-      }
-    }
-
-    /* Add an entry to the rollback log if required */
-    if( pMap->nSvpt>0 && pMap->aPtr[iEntry].parent ){
-      if( pMap->nRollback>=pMap->nRollbackAlloc ){
-        int nNew = pMap->nRollback ? pMap->nRollback*2 : 16;
-        RollbackEntry *aNew = (RollbackEntry*)sqlite3_realloc(
-            pMap->aRollback, nNew*sizeof(RollbackEntry)
-        );
-        if( aNew==0 ){
-          return SQLITE_NOMEM;
-        }else{
-          pMap->aRollback = aNew;
-          pMap->nRollbackAlloc = nNew;
-        }
-      }
-
-      pMap->aRollback[pMap->nRollback].pgno = pgno;
-      pMap->aRollback[pMap->nRollback].parent = pMap->aPtr[iEntry].parent;
-      pMap->aRollback[pMap->nRollback].eType = pMap->aPtr[iEntry].eType;
-      pMap->nRollback++;
-    }
-
-    /* Update the aPtr[] array */
-    pMap->aPtr[iEntry].parent = parent;
-    pMap->aPtr[iEntry].eType = eType;
-  }
-
-  return SQLITE_OK;
-}
-
-/* !defined(SQLITE_OMIT_CONCURRENT)
-**
-** Open savepoint iSavepoint, if it is not already open.
-*/
-static int btreePtrmapBegin(BtShared *pBt, int nSvpt){
-  BtreePtrmap *pMap = pBt->pMap;
-  if( pMap && nSvpt>pMap->nSvpt ){
-    int i;
-    if( nSvpt>=pMap->nSvptAlloc ){
-      int nNew = pMap->nSvptAlloc ? pMap->nSvptAlloc*2 : 16;
-      int *aNew = sqlite3_realloc(pMap->aSvpt, sizeof(int) * nNew);
-      if( aNew==0 ){
-        return SQLITE_NOMEM;
-      }else{
-        pMap->aSvpt = aNew;
-        pMap->nSvptAlloc = nNew;
-      }
-    }
-
-    for(i=pMap->nSvpt; i<nSvpt; i++){
-      pMap->aSvpt[i] = pMap->nRollback;
-    }
-    pMap->nSvpt = nSvpt;
-  }
-
-  return SQLITE_OK;
-}
-
-/* !defined(SQLITE_OMIT_CONCURRENT)
-**
-** Rollback (if op==SAVEPOINT_ROLLBACK) or release (if op==SAVEPOINT_RELEASE)
-** savepoint iSvpt.
-*/
-static void btreePtrmapEnd(BtShared *pBt, int op, int iSvpt){
-  BtreePtrmap *pMap = pBt->pMap;
-  if( pMap ){
-    assert( op==SAVEPOINT_ROLLBACK || op==SAVEPOINT_RELEASE );
-    assert( iSvpt>=0 || (iSvpt==-1 && op==SAVEPOINT_ROLLBACK) );
-    if( iSvpt<0 ){
-      pMap->nSvpt = 0;
-      pMap->nRollback = 0;
-      memset(pMap->aPtr, 0, sizeof(Pgno) * pMap->nPtrAlloc);
-    }else if( iSvpt<pMap->nSvpt ){
-      if( op==SAVEPOINT_ROLLBACK ){
-        int ii;
-        for(ii=pMap->nRollback-1; ii>=pMap->aSvpt[iSvpt]; ii--){
-          RollbackEntry *p = &pMap->aRollback[ii];
-          PtrmapEntry *pEntry = &pMap->aPtr[p->pgno - pMap->iFirst];
-          pEntry->parent = p->parent;
-          pEntry->eType = p->eType;
-        }
-      }
-      pMap->nSvpt = iSvpt + (op==SAVEPOINT_ROLLBACK);
-      pMap->nRollback = pMap->aSvpt[iSvpt];
-    }
-  }
-}
-
-/* !defined(SQLITE_OMIT_CONCURRENT)
-**
-** This function is called after an CONCURRENT transaction is opened on the
-** database. It allocates the BtreePtrmap structure used to track pointers
-** to allocated pages and zeroes the nFree/iTrunk fields in the database 
-** header on page 1.
-*/
-static int btreePtrmapAllocate(BtShared *pBt){
-  int rc = SQLITE_OK;
-  if( pBt->pMap==0 ){
-    BtreePtrmap *pMap = sqlite3_malloc(sizeof(BtreePtrmap));
-    if( pMap==0 ){
-      rc = SQLITE_NOMEM;
-    }else{
-      memset(&pBt->pPage1->aData[32], 0, sizeof(u32)*2);
-      memset(pMap, 0, sizeof(BtreePtrmap));
-      pMap->iFirst = pBt->nPage + 1;
-      pBt->pMap = pMap;
-    }
-  }
-  return rc;
-}
-
-/* !defined(SQLITE_OMIT_CONCURRENT)
-**
-** Free any BtreePtrmap structure allocated by an earlier call to
-** btreePtrmapAllocate().
-*/
-static void btreePtrmapDelete(BtShared *pBt){
-  BtreePtrmap *pMap = pBt->pMap;
-  if( pMap ){
-    sqlite3_free(pMap->aRollback);
-    sqlite3_free(pMap->aPtr);
-    sqlite3_free(pMap->aSvpt);
-    sqlite3_free(pMap);
-    pBt->pMap = 0;
-  }
-}
-
-/*
-** Check that the pointer-map does not contain any entries with a parent
-** page of 0. Call sqlite3_log() multiple times to output the entire
-** data structure if it does.
-*/
-static void btreePtrmapCheck(BtShared *pBt, Pgno nPage){
-  Pgno i;
-  int bProblem = 0;
-  BtreePtrmap *p = pBt->pMap;
-
-  for(i=p->iFirst; i<=nPage; i++){
-    PtrmapEntry *pEntry = &p->aPtr[i-p->iFirst];
-    if( pEntry->eType==PTRMAP_OVERFLOW1
-     || pEntry->eType==PTRMAP_OVERFLOW2
-     || pEntry->eType==PTRMAP_BTREE
-    ){
-      if( pEntry->parent==0 ){
-        bProblem = 1;
-        break;
-      }
-    }
-  }
-
-  if( bProblem ){
-    for(i=p->iFirst; i<=nPage; i++){
-      PtrmapEntry *pEntry = &p->aPtr[i-p->iFirst];
-      sqlite3_log(SQLITE_CORRUPT, 
-          "btreePtrmapCheck: pgno=%d eType=%d parent=%d", 
-          (int)i, (int)pEntry->eType, (int)pEntry->parent
-      );
-    }
-    abort();
-  }
-}
-
-#else  /* SQLITE_OMIT_CONCURRENT */
-# define btreePtrmapAllocate(x) SQLITE_OK
-# define btreePtrmapDelete(x) 
-# define btreePtrmapBegin(x,y)  SQLITE_OK
-# define btreePtrmapEnd(x,y,z) 
-# define btreePtrmapCheck(y,z) 
-#endif /* SQLITE_OMIT_CONCURRENT */
-
-static void releasePage(MemPage *pPage);  /* Forward reference */
+static void releasePage(MemPage *pPage);         /* Forward reference */
 static void releasePageOne(MemPage *pPage);      /* Forward reference */
 static void releasePageNotNull(MemPage *pPage);  /* Forward reference */
 
@@ -1256,13 +1023,6 @@ static void ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno parent, int *pRC){
   /* The super-journal page number must never be used as a pointer map page */
   assert( 0==PTRMAP_ISPAGE(pBt, PENDING_BYTE_PAGE(pBt)) );
 
-#ifndef SQLITE_OMIT_CONCURRENT
-  if( pBt->pMap ){
-    *pRC = btreePtrmapStore(pBt, key, eType, parent);
-    return;
-  }
-#endif
-
   assert( pBt->autoVacuum );
   if( key==0 ){
     *pRC = SQLITE_CORRUPT_BKPT;
@@ -2595,17 +2355,6 @@ static int getAndInitPage(
   return SQLITE_OK;
 }
 
-#ifndef SQLITE_OMIT_CONCURRENT
-/* 
-** Set the value of the MemPage.pgnoRoot variable, if it exists.
-*/
-static void setMempageRoot(MemPage *pPg, u32 pgnoRoot){
-  pPg->pgnoRoot = pgnoRoot;
-}
-#else
-# define setMempageRoot(x,y)
-#endif
-
 /*
 ** Release a MemPage.  This should be called once for each prior
 ** call to btreeGetPage.
@@ -3792,7 +3541,6 @@ static SQLITE_NOINLINE int btreeBeginTrans(
   BtShared *pBt = p->pBt;
   Pager *pPager = pBt->pPager;
   int rc = SQLITE_OK;
-  int bConcurrent = (p->db->eConcurrent && !ISAUTOVACUUM(pBt));
 
   sqlite3BtreeEnter(p);
   btreeIntegrity(p);
@@ -3880,8 +3628,7 @@ static SQLITE_NOINLINE int btreeBeginTrans(
       if( (pBt->btsFlags & BTS_READ_ONLY)!=0 ){
         rc = SQLITE_READONLY;
       }else{
-        int exFlag = bConcurrent ? -1 : (wrflag>1);
-        rc = sqlite3PagerBegin(pPager, exFlag, sqlite3TempInMemory(p->db));
+        rc = sqlite3PagerBegin(pPager, wrflag>1, sqlite3TempInMemory(p->db));
         if( rc==SQLITE_OK ){
           rc = newDatabase(pBt);
         }else if( rc==SQLITE_BUSY_SNAPSHOT && pBt->inTransaction==TRANS_NONE ){
@@ -3945,15 +3692,6 @@ static SQLITE_NOINLINE int btreeBeginTrans(
   }
 
 trans_begun:
-#ifndef SQLITE_OMIT_CONCURRENT
-  if( bConcurrent && rc==SQLITE_OK && sqlite3PagerIsWal(pBt->pPager) ){
-    rc = sqlite3PagerBeginConcurrent(pBt->pPager);
-    if( rc==SQLITE_OK && wrflag ){
-      rc = btreePtrmapAllocate(pBt);
-    }
-  }
-#endif
-
   if( rc==SQLITE_OK ){
     if( pSchemaVersion ){
       *pSchemaVersion = get4byte(&pBt->pPage1->aData[40]);
@@ -3963,11 +3701,7 @@ trans_begun:
       ** open savepoints. If the second parameter is greater than 0 and
       ** the sub-journal is not already open, then it will be opened here.
       */
-      int nSavepoint = p->db->nSavepoint;
-      rc = sqlite3PagerOpenSavepoint(pPager, nSavepoint);
-      if( rc==SQLITE_OK && nSavepoint ){
-        rc = btreePtrmapBegin(pBt, nSavepoint);
-      }
+      rc = sqlite3PagerOpenSavepoint(pPager, p->db->nSavepoint);
     }
   }
 
@@ -3980,15 +3714,6 @@ int sqlite3BtreeBeginTrans(Btree *p, int wrflag, int *pSchemaVersion){
   if( p->sharable
    || p->inTrans==TRANS_NONE
    || (p->inTrans==TRANS_READ && wrflag!=0)
-#ifndef SQLITE_OMIT_CONCURRENT
-   /* Always use the full version for "BEGIN CONCURRENT" transactions. This
-   ** is to ensure that any required calls to btreePtrmapBegin() are made.
-   ** These calls are not present on trunk (they're part of the
-   ** begin-concurrent patch), and so they are not present in the fast path
-   ** below. And it's easier just to call the full version every time than
-   ** to complicate the code below by adding btreePtrmapBegin() calls. */
-   || p->db->eConcurrent!=CONCURRENT_NONE
-#endif
   ){
     return btreeBeginTrans(p,wrflag,pSchemaVersion);
   }
@@ -4466,175 +4191,6 @@ static int autoVacuumCommit(Btree *p){
 # define setChildPtrmaps(x) SQLITE_OK
 #endif
 
-#ifndef SQLITE_OMIT_CONCURRENT
-/*
-** This function is called as part of merging an CONCURRENT transaction with
-** the snapshot at the head of the wal file. It relocates all pages in the
-** range iFirst..iLast, inclusive. It is assumed that the BtreePtrmap 
-** structure at BtShared.pMap contains the location of the pointers to each
-** page in the range.
-**
-** If pnCurrent is NULL, then all pages in the range are moved to currently
-** free locations (i.e. free-list entries) within the database file before page
-** iFirst.
-**
-** Or, if pnCurrent is not NULL, then it points to a value containing the
-** current size of the database file in pages. In this case, all pages are
-** relocated to the end of the database file - page iFirst is relocated to
-** page (*pnCurrent+1), page iFirst+1 to page (*pnCurrent+2), and so on.
-** Value *pnCurrent is set to the new size of the database before this 
-** function returns.
-**
-** If no error occurs, SQLITE_OK is returned. Otherwise, an SQLite error code.
-*/
-static int btreeRelocateRange(
-  BtShared *pBt,                  /* B-tree handle */
-  Pgno iFirst,                    /* First page to relocate */
-  Pgno iLast,                     /* Last page to relocate */
-  Pgno *pnCurrent                 /* If not NULL, IN/OUT: Database size */
-){
-  int rc = SQLITE_OK;
-  BtreePtrmap *pMap = pBt->pMap;
-  Pgno iPg;
-
-  for(iPg=iFirst; iPg<=iLast && rc==SQLITE_OK; iPg++){
-    MemPage *pFree = 0;     /* Page allocated from free-list */
-    MemPage *pPg = 0;
-    Pgno iNew;              /* New page number for pPg */
-    PtrmapEntry *pEntry;    /* Pointer map entry for page iPg */
-
-    if( iPg==PENDING_BYTE_PAGE(pBt) ) continue;
-    pEntry = &pMap->aPtr[iPg - pMap->iFirst];
-
-    if( pEntry->eType==PTRMAP_FREEPAGE ){
-      Pgno dummy;
-      rc = allocateBtreePage(pBt, &pFree, &dummy, iPg, BTALLOC_EXACT);
-      if( pFree ){
-        assert( sqlite3PagerPageRefcount(pFree->pDbPage)==1 );
-        sqlite3PcacheDrop(pFree->pDbPage);
-      }
-      assert( rc!=SQLITE_OK || dummy==iPg );
-    }else if( pnCurrent ){
-      btreeGetPage(pBt, iPg, &pPg, 0);
-      assert( sqlite3PagerIswriteable(pPg->pDbPage) );
-      assert( sqlite3PagerPageRefcount(pPg->pDbPage)==1 );
-      iNew = ++(*pnCurrent);
-      if( iNew==PENDING_BYTE_PAGE(pBt) ) iNew = ++(*pnCurrent);
-      rc = relocatePage(pBt, pPg, pEntry->eType, pEntry->parent, iNew, 1);
-      releasePageNotNull(pPg);
-    }else{
-      rc = allocateBtreePage(pBt, &pFree, &iNew, iFirst-1, BTALLOC_LE);
-      assert( rc!=SQLITE_OK || iNew<iFirst );
-      if( rc==SQLITE_OK ){
-        releasePage(pFree);
-        btreeGetPage(pBt, iPg, &pPg, 0);
-        rc = relocatePage(pBt, pPg, pEntry->eType, pEntry->parent,iNew,1);
-        releasePage(pPg);
-      }
-    }
-  }
-  return rc;
-}
-
-/* !defined(SQLITE_OMIT_CONCURRENT)
-**
-** The b-tree handle passed as the only argument is about to commit an
-** CONCURRENT transaction. At this point it is guaranteed that this is 
-** possible - the wal WRITER lock is held and it is known that there are 
-** no conflicts with committed transactions.
-*/
-static int btreeFixUnlocked(Btree *p){
-  BtShared *pBt = p->pBt;
-  MemPage *pPage1 = pBt->pPage1;
-  u8 *p1 = pPage1->aData;
-  Pager *pPager = pBt->pPager;
-  int rc = SQLITE_OK;
-
-  /* If page 1 of the database is not writable, then no pages were allocated
-  ** or freed by this transaction. In this case no special handling is 
-  ** required. Otherwise, if page 1 is dirty, proceed.  */
-  BtreePtrmap *pMap = pBt->pMap;
-  Pgno iTrunk = get4byte(&p1[32]);
-  Pgno nPage = btreePagecount(pBt);
-  u32 nFree = get4byte(&p1[36]);
-
-  assert( pBt->pMap );
-  rc = sqlite3PagerUpgradeSnapshot(pPager, pPage1->pDbPage);
-  assert( p1==pPage1->aData );
-
-  if( rc==SQLITE_OK ){
-    Pgno nHPage = get4byte(&p1[28]);
-    Pgno nFin = nHPage;         /* Size of db after transaction merge */
-
-    if( sqlite3PagerIswriteable(pPage1->pDbPage) ){
-      Pgno iHTrunk = get4byte(&p1[32]);
-      u32 nHFree = get4byte(&p1[36]);
-
-      btreePtrmapCheck(pBt, nPage);
-
-      /* Attach the head database free list to the end of the current
-      ** transactions free-list (if any).  */
-      if( iTrunk!=0 ){
-        put4byte(&p1[36], nHFree + nFree);
-        put4byte(&p1[32], iTrunk);
-        while( iTrunk ){
-          DbPage *pTrunk = sqlite3PagerLookup(pPager, iTrunk);
-          iTrunk = get4byte((u8*)pTrunk->pData);
-          if( iTrunk==0 ){
-            put4byte((u8*)pTrunk->pData, iHTrunk);
-          }
-          sqlite3PagerUnref(pTrunk);
-        };
-      }
-
-      if( nHPage<(pMap->iFirst-1) ){
-        /* The database consisted of (pMap->iFirst-1) pages when the current
-        ** concurrent transaction was opened. And an concurrent transaction may
-        ** not be executed on an auto-vacuum database - so the db should 
-        ** not have shrunk since the transaction was opened. Therefore nHPage
-        ** should be set to (pMap->iFirst-1) or greater. */
-        rc = SQLITE_CORRUPT_BKPT;
-      }else{
-        /* The current transaction allocated pages pMap->iFirst through
-        ** nPage (inclusive) at the end of the database file. Meanwhile,
-        ** other transactions have allocated (iFirst..nHPage). So move
-        ** pages (iFirst..MIN(nPage,nHPage)) to (MAX(nPage,nHPage)+1). */
-        Pgno iLast = MIN(nPage, nHPage);    /* Last page to move */
-        Pgno nCurrent;                      /* Current size of db */
-
-        nCurrent = MAX(nPage, nHPage);
-        pBt->nPage = nCurrent;
-        rc = btreeRelocateRange(pBt, pMap->iFirst, iLast, &nCurrent);
-
-        /* There are now no collisions with the snapshot at the head of the
-        ** database file. So at this point it would be possible to write
-        ** the transaction out to disk. Before doing so though, attempt to
-        ** relocate some of the new pages to free locations within the body
-        ** of the database file (i.e. free-list entries). */
-        if( rc==SQLITE_OK ){
-          assert( nCurrent!=PENDING_BYTE_PAGE(pBt) );
-          sqlite3PagerSetDbsize(pBt->pPager, nCurrent);
-          nFree = get4byte(&p1[36]);
-          nFin = nCurrent-nFree;
-          if( nCurrent>PENDING_BYTE_PAGE(pBt) && nFin<=PENDING_BYTE_PAGE(pBt) ){
-            nFin--;
-          }
-          nFin = MAX(nFin, nHPage);
-          rc = btreeRelocateRange(pBt, nFin+1, nCurrent, 0);
-        }
-
-        put4byte(&p1[28], nFin);
-      }
-    }
-    sqlite3PagerSetDbsize(pPager, nFin);
-  }
-
-  return rc;
-}
-#else
-# define btreeFixUnlocked(X)  SQLITE_OK
-#endif /* SQLITE_OMIT_CONCURRENT */
-
 /*
 ** This routine does the first phase of a two-phase commit.  This routine
 ** causes a rollback journal to be created (if it does not already exist)
@@ -4666,10 +4222,8 @@ int sqlite3BtreeCommitPhaseOne(Btree *p, const char *zSuperJrnl){
   if( p->inTrans==TRANS_WRITE ){
     BtShared *pBt = p->pBt;
     sqlite3BtreeEnter(p);
-
 #ifndef SQLITE_OMIT_AUTOVACUUM
     if( pBt->autoVacuum ){
-      assert( ISCONCURRENT==0 );
       rc = autoVacuumCommit(p);
       if( rc!=SQLITE_OK ){
         sqlite3BtreeLeave(p);
@@ -4680,12 +4234,7 @@ int sqlite3BtreeCommitPhaseOne(Btree *p, const char *zSuperJrnl){
       sqlite3PagerTruncateImage(pBt->pPager, pBt->nPage);
     }
 #endif
-    if( rc==SQLITE_OK && ISCONCURRENT && p->db->eConcurrent==CONCURRENT_OPEN ){
-      rc = btreeFixUnlocked(p);
-    }
-    if( rc==SQLITE_OK ){
-      rc = sqlite3PagerCommitPhaseOne(pBt->pPager, zSuperJrnl, 0);
-    }
+    rc = sqlite3PagerCommitPhaseOne(pBt->pPager, zSuperJrnl, 0);
     sqlite3BtreeLeave(p);
   }
   return rc;
@@ -4728,11 +4277,6 @@ static void btreeEndTransaction(Btree *p){
     unlockBtreeIfUnused(pBt);
   }
 
-  /* If this was an CONCURRENT transaction, delete the pBt->pMap object.
-  ** Also call PagerEndConcurrent() to ensure that the pager has discarded
-  ** the record of all pages read within the transaction.  */
-  btreePtrmapDelete(pBt);
-  sqlite3PagerEndConcurrent(pBt->pPager);
   btreeIntegrity(p);
 }
 
@@ -4962,9 +4506,6 @@ int sqlite3BtreeBeginStmt(Btree *p, int iStatement){
   ** such savepoints while the statement transaction savepoint is active.
   */
   rc = sqlite3PagerOpenSavepoint(pBt->pPager, iStatement);
-  if( rc==SQLITE_OK ){
-    rc = btreePtrmapBegin(pBt, iStatement);
-  }
   sqlite3BtreeLeave(p);
   return rc;
 }
@@ -4988,7 +4529,6 @@ int sqlite3BtreeSavepoint(Btree *p, int op, int iSavepoint){
     assert( op==SAVEPOINT_RELEASE || op==SAVEPOINT_ROLLBACK );
     assert( iSavepoint>=0 || (iSavepoint==-1 && op==SAVEPOINT_ROLLBACK) );
     sqlite3BtreeEnter(p);
-    btreePtrmapEnd(pBt, op, iSavepoint);
     if( op==SAVEPOINT_ROLLBACK ){
       rc = saveAllCursors(pBt, 0, 0);
     }
@@ -5784,7 +5324,6 @@ const void *sqlite3BtreePayloadFetch(BtCursor *pCur, u32 *pAmt){
 ** vice-versa).
 */
 static int moveToChild(BtCursor *pCur, u32 newPgno){
-  BtShared *pBt = pCur->pBt;
   int rc;
   assert( cursorOwnsBtShared(pCur) );
   assert( pCur->eState==CURSOR_VALID );
@@ -5799,14 +5338,13 @@ static int moveToChild(BtCursor *pCur, u32 newPgno){
   pCur->apPage[pCur->iPage] = pCur->pPage;
   pCur->ix = 0;
   pCur->iPage++;
-  rc = getAndInitPage(pBt, newPgno, &pCur->pPage, pCur->curPagerFlags);
-  if( rc==SQLITE_OK ){
-    assert( pCur->pPage!=0 );
-    setMempageRoot(pCur->pPage, pCur->pgnoRoot);
-    if( pCur->pPage->nCell<1 || pCur->pPage->intKey!=pCur->curIntKey ){
-      releasePage(pCur->pPage);
-      rc = SQLITE_CORRUPT_PGNO(newPgno);
-    }
+  rc = getAndInitPage(pCur->pBt, newPgno, &pCur->pPage, pCur->curPagerFlags);
+  assert( pCur->pPage!=0 || rc!=SQLITE_OK );
+  if( rc==SQLITE_OK
+   && (pCur->pPage->nCell<1 || pCur->pPage->intKey!=pCur->curIntKey)
+  ){
+    releasePage(pCur->pPage);
+    rc = SQLITE_CORRUPT_PGNO(newPgno);
   }
   if( rc ){
     pCur->pPage = pCur->apPage[--pCur->iPage];
@@ -5923,7 +5461,6 @@ static int moveToRoot(BtCursor *pCur){
       pCur->eState = CURSOR_INVALID;
       return rc;
     }
-    setMempageRoot(pCur->pPage, pCur->pgnoRoot);
     pCur->iPage = 0;
     pCur->curIntKey = pCur->pPage->intKey;
   }
@@ -6826,7 +6363,7 @@ static int allocateBtreePage(
   Pgno mxPage;     /* Total size of the database file */
 
   assert( sqlite3_mutex_held(pBt->mutex) );
-  assert( eMode==BTALLOC_ANY || (nearby>0 && REQUIRE_PTRMAP ) );
+  assert( eMode==BTALLOC_ANY || (nearby>0 && IfNotOmitAV(pBt->autoVacuum)) );
   pPage1 = pBt->pPage1;
   mxPage = btreePagecount(pBt);
   /* EVIDENCE-OF: R-21003-45125 The 4-byte big-endian integer at offset 36
@@ -6836,15 +6373,6 @@ static int allocateBtreePage(
   if( n>=mxPage ){
     return SQLITE_CORRUPT_BKPT;
   }
-
-  /* Ensure page 1 is writable. This function will either change the number
-  ** of pages in the free-list or the size of the database file. Since both
-  ** of these operations involve modifying page 1 header fields, page 1
-  ** will definitely be written by this transaction. If this is an CONCURRENT
-  ** transaction, ensure the BtreePtrmap structure has been allocated.  */
-  rc = sqlite3PagerWrite(pPage1->pDbPage);
-  if( rc ) return rc;
-
   if( n>0 ){
     /* There are pages on the freelist.  Reuse one of those pages. */
     Pgno iTrunk;
@@ -6855,29 +6383,28 @@ static int allocateBtreePage(
     ** shows that the page 'nearby' is somewhere on the free-list, then
     ** the entire-list will be searched for that page.
     */
+#ifndef SQLITE_OMIT_AUTOVACUUM
     if( eMode==BTALLOC_EXACT ){
-      assert( ISAUTOVACUUM(pBt)!=ISCONCURRENT );
-      if( ISAUTOVACUUM(pBt) ){
-        if( nearby<=mxPage ){
-          u8 eType;
-          assert( nearby>0 );
-          assert( pBt->autoVacuum );
-          rc = ptrmapGet(pBt, nearby, &eType, 0);
-          if( rc ) return rc;
-          if( eType==PTRMAP_FREEPAGE ){
-            searchList = 1;
-          }
+      if( nearby<=mxPage ){
+        u8 eType;
+        assert( nearby>0 );
+        assert( pBt->autoVacuum );
+        rc = ptrmapGet(pBt, nearby, &eType, 0);
+        if( rc ) return rc;
+        if( eType==PTRMAP_FREEPAGE ){
+          searchList = 1;
         }
-      }else{
-        searchList = 1;
       }
     }else if( eMode==BTALLOC_LE ){
       searchList = 1;
     }
+#endif
 
     /* Decrement the free-list count by 1. Set iTrunk to the index of the
     ** first free-list trunk page. iPrevTrunk is initially 1.
     */
+    rc = sqlite3PagerWrite(pPage1->pDbPage);
+    if( rc ) return rc;
     put4byte(&pPage1->aData[36], n-1);
 
     /* The code within this loop is run only once if the 'searchList' variable
@@ -7185,7 +6712,7 @@ static int freePage2(BtShared *pBt, MemPage *pMemPage, Pgno iPage){
   /* If the database supports auto-vacuum, write an entry in the pointer-map
   ** to indicate that the page is free.
   */
-  if( REQUIRE_PTRMAP ){
+  if( ISAUTOVACUUM(pBt) ){
     ptrmapPut(pBt, iPage, PTRMAP_FREEPAGE, 0, &rc);
     if( rc ) goto freepage_out;
   }
@@ -7516,7 +7043,7 @@ static int fillInCell(
       }
 #endif
       rc = allocateBtreePage(pBt, &pOvfl, &pgnoOvfl, pgnoOvfl, 0);
-
+#ifndef SQLITE_OMIT_AUTOVACUUM
       /* If the database supports auto-vacuum, and the second or subsequent
       ** overflow page is being allocated, add an entry to the pointer-map
       ** for that page now.
@@ -7527,13 +7054,14 @@ static int fillInCell(
       ** may misinterpret the uninitialized values and delete the
       ** wrong pages from the database.
       */
-      if( REQUIRE_PTRMAP && rc==SQLITE_OK ){
+      if( pBt->autoVacuum && rc==SQLITE_OK ){
         u8 eType = (pgnoPtrmap?PTRMAP_OVERFLOW2:PTRMAP_OVERFLOW1);
         ptrmapPut(pBt, pgnoOvfl, eType, pgnoPtrmap, &rc);
         if( rc ){
           releasePage(pOvfl);
         }
       }
+#endif
       if( rc ){
         releasePage(pToRelease);
         return rc;
@@ -7677,7 +7205,6 @@ static int insertCell(
     assert( j==0 || pPage->aiOvfl[j-1]<(u16)i ); /* Overflows in sorted order */
     assert( j==0 || i==pPage->aiOvfl[j-1]+1 );   /* Overflows are sequential */
   }else{
-    BtShared *pBt = pPage->pBt;
     int rc = sqlite3PagerWrite(pPage->pDbPage);
     if( NEVER(rc!=SQLITE_OK) ){
       return rc;
@@ -7707,7 +7234,8 @@ static int insertCell(
     /* increment the cell count */
     if( (++data[pPage->hdrOffset+4])==0 ) data[pPage->hdrOffset+3]++;
     assert( get2byte(&data[pPage->hdrOffset+3])==pPage->nCell || CORRUPT_DB );
-    if( REQUIRE_PTRMAP ){
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    if( pPage->pBt->autoVacuum ){
       int rc2 = SQLITE_OK;
       /* The cell may contain a pointer to an overflow page. If so, write
       ** the entry for the overflow page into the pointer map.
@@ -7715,6 +7243,7 @@ static int insertCell(
       ptrmapPutOvflPtr(pPage, pPage, pCell, &rc2);
       if( rc2 ) return rc2;
     }
+#endif
   }
   return SQLITE_OK;
 }
@@ -7766,7 +7295,6 @@ static int insertCellFast(
     assert( j==0 || pPage->aiOvfl[j-1]<(u16)i ); /* Overflows in sorted order */
     assert( j==0 || i==pPage->aiOvfl[j-1]+1 );   /* Overflows are sequential */
   }else{
-    BtShared *pBt = pPage->pBt;
     int rc = sqlite3PagerWrite(pPage->pDbPage);
     if( rc!=SQLITE_OK ){
       return rc;
@@ -7780,7 +7308,7 @@ static int insertCellFast(
     ** if it returns successfully */
     assert( idx >= 0 );
     assert( idx >= pPage->cellOffset+2*pPage->nCell+2 || CORRUPT_DB );
-    assert( idx+sz <= (int)pBt->usableSize );
+    assert( idx+sz <= (int)pPage->pBt->usableSize );
     pPage->nFree -= (u16)(2 + sz);
     memcpy(&data[idx], pCell, sz);
     pIns = pPage->aCellIdx + i*2;
@@ -7790,7 +7318,8 @@ static int insertCellFast(
     /* increment the cell count */
     if( (++data[pPage->hdrOffset+4])==0 ) data[pPage->hdrOffset+3]++;
     assert( get2byte(&data[pPage->hdrOffset+3])==pPage->nCell || CORRUPT_DB );
-    if( REQUIRE_PTRMAP ){
+#ifndef SQLITE_OMIT_AUTOVACUUM
+    if( pPage->pBt->autoVacuum ){
       int rc2 = SQLITE_OK;
       /* The cell may contain a pointer to an overflow page. If so, write
       ** the entry for the overflow page into the pointer map.
@@ -7798,6 +7327,7 @@ static int insertCellFast(
       ptrmapPutOvflPtr(pPage, pPage, pCell, &rc2);
       if( rc2 ) return rc2;
     }
+#endif
   }
   return SQLITE_OK;
 }
@@ -7963,7 +7493,6 @@ static int rebuildPage(
   int k;                          /* Current slot in pCArray->apEnd[] */
   u8 *pSrcEnd;                    /* Current pCArray->apEnd[k] value */
 
-  assert( nCell>0 );
   assert( i<iEnd );
   j = get2byte(&aData[hdr+5]);
   if( NEVER(j>(u32)usableSize) ){ j = 0; }
@@ -8270,7 +7799,6 @@ static int editPage(
   return SQLITE_OK;
  editpage_fail:
   /* Unable to edit this page. Rebuild it from scratch instead. */
-  if( nNew<1 ) return SQLITE_CORRUPT_BKPT;
   populateCellCache(pCArray, iNew, nNew);
   return rebuildPage(pCArray, iNew, nNew, pPg);
 }
@@ -8353,7 +7881,7 @@ static int balance_quick(MemPage *pParent, MemPage *pPage, u8 *pSpace){
     ** be marked as dirty. Returning an error code will cause a
     ** rollback, undoing any changes made to the parent page.
     */
-    if( REQUIRE_PTRMAP ){
+    if( ISAUTOVACUUM(pBt) ){
       ptrmapPut(pBt, pgnoNew, PTRMAP_BTREE, pParent->pgno, &rc);
       if( szCell>pNew->minLocal ){
         ptrmapPutOvflPtr(pNew, pNew, pCell, &rc);
@@ -8491,7 +8019,7 @@ static void copyNodeContent(MemPage *pFrom, MemPage *pTo, int *pRC){
     /* If this is an auto-vacuum database, update the pointer-map entries
     ** for any b-tree or overflow pages that pTo now contains the pointers to.
     */
-    if( REQUIRE_PTRMAP ){
+    if( ISAUTOVACUUM(pBt) ){
       *pRC = setChildPtrmaps(pTo);
     }
   }
@@ -8542,8 +8070,7 @@ static int balance_nonroot(
   int iParentIdx,                 /* Index of "the page" in pParent */
   u8 *aOvflSpace,                 /* page-size bytes of space for parent ovfl */
   int isRoot,                     /* True if pParent is a root-page */
-  int bBulk,                      /* True if this call is part of a bulk load */
-  Pgno pgnoRoot                   /* Root page of b-tree being balanced */
+  int bBulk                       /* True if this call is part of a bulk load */
 ){
   BtShared *pBt;               /* The whole database */
   int nMaxCells = 0;           /* Allocated size of apCell, szCell, aFrom. */
@@ -8631,7 +8158,6 @@ static int balance_nonroot(
       memset(apOld, 0, (i+1)*sizeof(MemPage*));
       goto balance_cleanup;
     }
-    setMempageRoot(apOld[i], pgnoRoot);
     if( apOld[i]->nFree<0 ){
       rc = btreeComputeFreeSpace(apOld[i]);
       if( rc ){
@@ -8981,7 +8507,7 @@ static int balance_nonroot(
       cntOld[i] = b.nCell;
 
       /* Set the pointer-map entry for the new sibling page. */
-      if( REQUIRE_PTRMAP ){
+      if( ISAUTOVACUUM(pBt) ){
         ptrmapPut(pBt, pNew->pgno, PTRMAP_BTREE, pParent->pgno, &rc);
         if( rc!=SQLITE_OK ){
           goto balance_cleanup;
@@ -9074,7 +8600,7 @@ static int balance_nonroot(
   ** updated. This happens below, after the sibling pages have been
   ** populated, not here.
   */
-  if( REQUIRE_PTRMAP ){
+  if( ISAUTOVACUUM(pBt) ){
     MemPage *pOld;
     MemPage *pNew = pOld = apNew[0];
     int cntOldNext = pNew->nCell + pNew->nOverflow;
@@ -9269,7 +8795,7 @@ static int balance_nonroot(
     );
     copyNodeContent(apNew[0], pParent, &rc);
     freePage(apNew[0], &rc);
-  }else if( REQUIRE_PTRMAP && !leafCorrection ){
+  }else if( ISAUTOVACUUM(pBt) && !leafCorrection ){
     /* Fix the pointer map entries associated with the right-child of each
     ** sibling page. All other pointer map entries have already been taken
     ** care of.  */
@@ -9352,7 +8878,7 @@ static int balance_deeper(MemPage *pRoot, MemPage **ppChild){
   if( rc==SQLITE_OK ){
     rc = allocateBtreePage(pBt,&pChild,&pgnoChild,pRoot->pgno,0);
     copyNodeContent(pRoot, pChild, &rc);
-    if( REQUIRE_PTRMAP ){
+    if( ISAUTOVACUUM(pBt) ){
       ptrmapPut(pBt, pgnoChild, PTRMAP_BTREE, pRoot->pgno, &rc);
     }
   }
@@ -9515,7 +9041,7 @@ static int balance(BtCursor *pCur){
           */
           u8 *pSpace = sqlite3PageMalloc(pCur->pBt->pageSize);
           rc = balance_nonroot(pParent, iIdx, pSpace, iPage==1,
-                               pCur->hints&BTREE_BULKLOAD, pCur->pgnoRoot);
+                               pCur->hints&BTREE_BULKLOAD);
           if( pFree ){
             /* If pFree is not NULL, it points to the pSpace buffer used
             ** by a previous call to balance_nonroot(). Its contents are
@@ -9893,7 +9419,6 @@ int sqlite3BtreeInsert(
   pCur->info.nSize = 0;
   if( loc==0 ){
     CellInfo info;
-    BtShared *pBt = p->pBt;
     assert( idx>=0 );
     if( idx>=pPage->nCell ){
       return SQLITE_CORRUPT_BKPT;
@@ -9910,7 +9435,7 @@ int sqlite3BtreeInsert(
     testcase( pCur->curFlags & BTCF_ValidOvfl );
     invalidateOverflowCache(pCur);
     if( info.nSize==szNew && info.nLocal==info.nPayload
-     && (!REQUIRE_PTRMAP || szNew<pPage->minLocal)
+     && (!ISAUTOVACUUM(p->pBt) || szNew<pPage->minLocal)
     ){
       /* Overwrite the old cell with the new if they are the same size.
       ** We could also try to do this if the old cell is smaller, then add
@@ -10499,8 +10024,7 @@ static int clearDatabasePage(
   BtShared *pBt,           /* The BTree that contains the table */
   Pgno pgno,               /* Page number to clear */
   int freePageFlag,        /* Deallocate page if true */
-  i64 *pnChange,           /* Add number of Cells freed to this counter */
-  Pgno pgnoRoot
+  i64 *pnChange            /* Add number of Cells freed to this counter */
 ){
   MemPage *pPage;
   int rc;
@@ -10515,7 +10039,6 @@ static int clearDatabasePage(
   }
   rc = getAndInitPage(pBt, pgno, &pPage, 0);
   if( rc ) return rc;
-  setMempageRoot(pPage, pgnoRoot);
   if( (pBt->openFlags & BTREE_SINGLE)==0
    && sqlite3PagerPageRefcount(pPage->pDbPage) != (1 + (pgno==1))
   ){
@@ -10526,16 +10049,14 @@ static int clearDatabasePage(
   for(i=0; i<pPage->nCell; i++){
     pCell = findCell(pPage, i);
     if( !pPage->leaf ){
-      rc = clearDatabasePage(pBt, get4byte(pCell), 1, pnChange, pgnoRoot);
+      rc = clearDatabasePage(pBt, get4byte(pCell), 1, pnChange);
       if( rc ) goto cleardatabasepage_out;
     }
     BTREE_CLEAR_CELL(rc, pPage, pCell, info);
     if( rc ) goto cleardatabasepage_out;
   }
   if( !pPage->leaf ){
-    rc = clearDatabasePage(
-        pBt, get4byte(&pPage->aData[hdr+8]), 1, pnChange, pgnoRoot
-    );
+    rc = clearDatabasePage(pBt, get4byte(&pPage->aData[hdr+8]), 1, pnChange);
     if( rc ) goto cleardatabasepage_out;
     if( pPage->intKey ) pnChange = 0;
   }
@@ -10581,7 +10102,7 @@ int sqlite3BtreeClearTable(Btree *p, int iTable, i64 *pnChange){
     if( p->hasIncrblobCur ){
       invalidateIncrblobCursors(p, (Pgno)iTable, 0, 1);
     }
-    rc = clearDatabasePage(pBt, (Pgno)iTable, 0, pnChange, (Pgno)iTable);
+    rc = clearDatabasePage(pBt, (Pgno)iTable, 0, pnChange);
   }
   sqlite3BtreeLeave(p);
   return rc;
@@ -11524,12 +11045,10 @@ int sqlite3BtreeIntegrityCheck(
   }
   pBt->db->flags = savedDbFlags;
 
+  /* Make sure every page in the file is referenced
+  */
   if( !bPartial ){
-    /* Make sure every page in the file is referenced. Skip this if the
-    ** database is currently being written by a CONCURRENT transaction (it 
-    ** may fail as pages that were part of the free-list when the transaction
-    ** was opened cannot be counted).  */
-    for(i=1; ISCONCURRENT==0 && i<=sCheck.nPage && sCheck.mxErr; i++){
+    for(i=1; i<=sCheck.nPage && sCheck.mxErr; i++){
 #ifdef SQLITE_OMIT_AUTOVACUUM
       if( getPageReferenced(&sCheck, i)==0 ){
         checkAppendMsg(&sCheck, "Page %u: never used", i);
@@ -11830,102 +11349,6 @@ int sqlite3BtreeIsReadonly(Btree *p){
 */
 int sqlite3HeaderSizeBtree(void){ return ROUND8(sizeof(MemPage)); }
 
-/*
-** This function is called to ensure that all locks required to commit the
-** current write-transaction to the database file are held. If the db is
-** in rollback mode, this means the EXCLUSIVE lock on the database file.
-**
-** Or, if this is an CONCURRENT transaction on a wal-mode database, the WRITER
-** lock on the wal file. In this case this function also checks that the
-** CONCURRENT transaction can be safely committed (does not commit with any
-** other transaction committed since it was opened).
-**
-** SQLITE_OK is returned if successful. SQLITE_BUSY if the required locks
-** cannot be obtained due to a conflicting lock. If the locks cannot be
-** obtained for an CONCURRENT transaction due to a conflict with an already
-** committed transaction, SQLITE_BUSY_SNAPSHOT is returned. Otherwise, if
-** some other error (OOM, IO, etc.) occurs, the relevant SQLite error code
-** is returned.
-*/
-int sqlite3BtreeExclusiveLock(Btree *p){
-  int rc;
-  Pgno pgno = 0;
-  BtShared *pBt = p->pBt;
-  assert( p->inTrans==TRANS_WRITE && pBt->pPage1 );
-  sqlite3BtreeEnter(p);
-  rc = sqlite3PagerExclusiveLock(pBt->pPager, 
-    (p->db->eConcurrent==CONCURRENT_SCHEMA) ? 0 : pBt->pPage1->pDbPage,
-    &pgno
-  );
-#ifdef SQLITE_OMIT_CONCURRENT
-  assert( pgno==0 );
-#else
-  if( rc==SQLITE_BUSY_SNAPSHOT && pgno ){
-    PgHdr *pPg = 0;
-    int rc2 = sqlite3PagerGet(pBt->pPager, pgno, &pPg, 0);
-    if( rc2==SQLITE_OK ){
-      int bWrite = -1;
-      const char *zObj = 0;
-      const char *zTab = 0;
-      char zContent[17];
-
-      if( pPg ){
-        Pgno pgnoRoot = 0;
-        HashElem *pE;
-        Schema *pSchema;
-        u8 *aData = (u8*)sqlite3PagerGetData(pPg);
-        int i;
-        for(i=0; i<8; i++){
-          static const char hexdigits[] = {
-            '0', '1', '2', '3', '4', '5', '6', '7',
-            '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' 
-          };
-          zContent[i*2] = hexdigits[(aData[i] >> 4)];
-          zContent[i*2+1] = hexdigits[(aData[i] & 0xF)];
-        }
-        zContent[16] = '\0';
-
-        pgnoRoot = ((MemPage*)sqlite3PagerGetExtra(pPg))->pgnoRoot;
-        bWrite = sqlite3PagerIswriteable(pPg);
-        sqlite3PagerUnref(pPg);
-
-        pSchema = sqlite3SchemaGet(p->db, p);
-        if( pSchema ){
-          for(pE=sqliteHashFirst(&pSchema->tblHash); pE; pE=sqliteHashNext(pE)){
-            Table *pTab = (Table *)sqliteHashData(pE);
-            if( pTab->tnum==(int)pgnoRoot ){
-              zObj = pTab->zName;
-              zTab = 0;
-            }else{
-              Index *pIdx;
-              for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
-                if( pIdx->tnum==(int)pgnoRoot ){
-                  zObj = pIdx->zName;
-                  zTab = pTab->zName;
-                }
-              }
-            }
-          }
-        }
-      }
-
-      sqlite3_log(SQLITE_OK,
-          "cannot commit CONCURRENT transaction "
-          "- conflict at page %d "
-          "(%s page; part of db %s %s%s%s; content=%s...)",
-          (int)pgno,
-          (bWrite==0?"read-only":(bWrite>0?"read/write":"unknown")),
-          (zTab ? "index" : "table"),
-          (zTab ? zTab : ""), (zTab ? "." : ""), (zObj ? zObj : "UNKNOWN"),
-          zContent
-      );
-    }
-  }
-#endif
-  sqlite3BtreeLeave(p);
-  return rc;
-}
-
 /*
 ** If no transaction is active and the database is not a temp-db, clear
 ** the in-memory pager cache.

src/btree.h

@@ -356,8 +356,6 @@ sqlite3_uint64 sqlite3BtreeSeekCount(Btree*);
 # define sqlite3BtreeSeekCount(X) 0
 #endif
 
-int sqlite3BtreeExclusiveLock(Btree *pBt);
-
 #ifndef NDEBUG
 int sqlite3BtreeCursorIsValid(BtCursor*);
 #endif
@@ -418,4 +416,5 @@ void sqlite3BtreeClearCache(Btree*);
 # define sqlite3SchemaMutexHeld(X,Y,Z) 1
 #endif
 
+
 #endif /* SQLITE_BTREE_H */

src/btreeInt.h

@@ -232,7 +232,6 @@
 typedef struct MemPage MemPage;
 typedef struct BtLock BtLock;
 typedef struct CellInfo CellInfo;
-typedef struct BtreePtrmap BtreePtrmap;
 
 /*
 ** This is a magic string that appears at the beginning of every
@@ -276,9 +275,6 @@ struct MemPage {
   u8 intKey;           /* True if table b-trees.  False for index b-trees */
   u8 intKeyLeaf;       /* True if the leaf of an intKey table */
   Pgno pgno;           /* Page number for this page */
-#ifndef SQLITE_OMIT_CONCURRENT
-  Pgno pgnoRoot;       /* Root page of b-tree that this page belongs to */
-#endif
   /* Only the first 8 bytes (above) are zeroed by pager.c when a new page
   ** is allocated. All fields that follow must be initialized before use */
   u8 leaf;             /* True if a leaf page */
@@ -460,9 +456,6 @@ struct BtShared {
   Btree *pWriter;       /* Btree with currently open write transaction */
 #endif
   u8 *pTmpSpace;        /* Temp space sufficient to hold a single cell */
-#ifndef SQLITE_OMIT_CONCURRENT
-  BtreePtrmap *pMap;
-#endif
   int nPreformatSize;   /* Size of last cell written by TransferRow() */
 };
 
@@ -680,19 +673,12 @@ struct BtCursor {
 ** (sqliteMallocRaw), it is not possible to use conditional compilation.
 ** So, this macro is defined instead.
 */
-#ifdef SQLITE_OMIT_AUTOVACUUM
-#define ISAUTOVACUUM(pBt) 0
-#else
+#ifndef SQLITE_OMIT_AUTOVACUUM
 #define ISAUTOVACUUM(pBt) (pBt->autoVacuum)
-#endif
-
-#ifdef SQLITE_OMIT_CONCURRENT
-# define ISCONCURRENT 0
 #else
-# define ISCONCURRENT (pBt->pMap!=0)
+#define ISAUTOVACUUM(pBt) 0
 #endif
 
-#define REQUIRE_PTRMAP (ISAUTOVACUUM(pBt) || ISCONCURRENT)
 
 /*
 ** This structure is passed around through all the PRAGMA integrity_check

src/build.c

@@ -89,10 +89,8 @@ void sqlite3TableLock(
   u8 isWriteLock,    /* True for a write lock */
   const char *zName  /* Name of the table to be locked */
 ){
-#ifdef SQLITE_OMIT_CONCURRENT
   if( iDb==1 ) return;
   if( !sqlite3BtreeSharable(pParse->db->aDb[iDb].pBt) ) return;
-#endif
   lockTable(pParse, iDb, iTab, isWriteLock, zName);
 }
 
@@ -5138,7 +5136,7 @@ void sqlite3BeginTransaction(Parse *pParse, int type){
   }
   v = sqlite3GetVdbe(pParse);
   if( !v ) return;
-  if( type==TK_IMMEDIATE || type==TK_EXCLUSIVE ){
+  if( type!=TK_DEFERRED ){
     for(i=0; i<db->nDb; i++){
       int eTxnType;
       Btree *pBt = db->aDb[i].pBt;
@@ -5153,7 +5151,7 @@ void sqlite3BeginTransaction(Parse *pParse, int type){
       sqlite3VdbeUsesBtree(v, i);
     }
   }
-  sqlite3VdbeAddOp3(v, OP_AutoCommit, 0, 0, (type==TK_CONCURRENT));
+  sqlite3VdbeAddOp0(v, OP_AutoCommit);
 }
 
 /*

src/func.c

@@ -559,9 +559,8 @@ static void randomFunc(
   sqlite3_value **NotUsed2
 ){
   sqlite_int64 r;
-  sqlite3 *db = sqlite3_context_db_handle(context);
   UNUSED_PARAMETER2(NotUsed, NotUsed2);
-  sqlite3FastRandomness(&db->sPrng, sizeof(r), &r);
+  sqlite3_randomness(sizeof(r), &r);
   if( r<0 ){
     /* We need to prevent a random number of 0x8000000000000000
     ** (or -9223372036854775808) since when you do abs() of that
@@ -587,7 +586,6 @@ static void randomBlob(
 ){
   sqlite3_int64 n;
   unsigned char *p;
-  sqlite3 *db = sqlite3_context_db_handle(context);
   assert( argc==1 );
   UNUSED_PARAMETER(argc);
   n = sqlite3_value_int64(argv[0]);
@@ -596,7 +594,7 @@ static void randomBlob(
   }
   p = contextMalloc(context, n);
   if( p ){
-    sqlite3FastRandomness(&db->sPrng, n, p);
+    sqlite3_randomness(n, p);
     sqlite3_result_blob(context, (char*)p, n, sqlite3_free);
   }
 }
@@ -1818,10 +1816,8 @@ static void sumFinalize(sqlite3_context *context){
     if( p->approx ){
       if( p->ovrfl ){
         sqlite3_result_error(context,"integer overflow",-1);
-      }else if( !sqlite3IsNaN(p->rErr) ){
-        sqlite3_result_double(context, p->rSum+p->rErr);
       }else{
-        sqlite3_result_double(context, p->rSum);
+        sqlite3_result_double(context, p->rSum+p->rErr);
       }
     }else{
       sqlite3_result_int64(context, p->iSum);
@@ -1834,8 +1830,7 @@ static void avgFinalize(sqlite3_context *context){
   if( p && p->cnt>0 ){
     double r;
     if( p->approx ){
-      r = p->rSum;
-      if( !sqlite3IsNaN(p->rErr) ) r += p->rErr;
+      r = p->rSum+p->rErr;
     }else{
       r = (double)(p->iSum);
     }
@@ -1848,8 +1843,7 @@ static void totalFinalize(sqlite3_context *context){
   p = sqlite3_aggregate_context(context, 0);
   if( p ){
     if( p->approx ){
-      r = p->rSum;
-      if( !sqlite3IsNaN(p->rErr) ) r += p->rErr;
+      r = p->rSum+p->rErr;
     }else{
       r = (double)(p->iSum);
     }

src/json.c

@@ -2484,9 +2484,7 @@ static void jsonArrayLengthFunc(
   }
   if( pNode->eType==JSON_ARRAY ){
     while( 1 /*exit-by-break*/ ){
-      i = 1;
-      while( i<=pNode->n ){
-        if( (pNode[i].jnFlags & JNODE_REMOVE)==0 ) n++;
+      for(i=1; i<=pNode->n; n++){
         i += jsonNodeSize(&pNode[i]);
       }
       if( (pNode->jnFlags & JNODE_APPEND)==0 ) break;
@@ -2902,7 +2900,6 @@ static void jsonReplaceFunc(
   }
   pParse = jsonParseCached(ctx, argv[0], ctx, argc>1);
   if( pParse==0 ) return;
-  pParse->nJPRef++;
   for(i=1; i<(u32)argc; i+=2){
     zPath = (const char*)sqlite3_value_text(argv[i]);
     pParse->useMod = 1;
@@ -2915,7 +2912,6 @@ static void jsonReplaceFunc(
   jsonReturnJson(pParse, pParse->aNode, ctx, 1);
 replace_err:
   jsonDebugPrintParse(pParse);
-  jsonParseFree(pParse);
 }
 
 
@@ -2950,7 +2946,6 @@ static void jsonSetFunc(
   }
   pParse = jsonParseCached(ctx, argv[0], ctx, argc>1);
   if( pParse==0 ) return;
-  pParse->nJPRef++;
   for(i=1; i<(u32)argc; i+=2){
     zPath = (const char*)sqlite3_value_text(argv[i]);
     bApnd = 0;
@@ -2967,8 +2962,9 @@ static void jsonSetFunc(
   }
   jsonDebugPrintParse(pParse);
   jsonReturnJson(pParse, pParse->aNode, ctx, 1);
+
 jsonSetDone:
-  jsonParseFree(pParse);
+  /* no cleanup required */;
 }
 
 /*

src/main.c

@@ -3269,7 +3269,7 @@ static int openDatabase(
   db->aDb = db->aDbStatic;
   db->lookaside.bDisable = 1;
   db->lookaside.sz = 0;
-  sqlite3FastPrngInit(&db->sPrng);
+
   assert( sizeof(db->aLimit)==sizeof(aHardLimit) );
   memcpy(db->aLimit, aHardLimit, sizeof(db->aLimit));
   db->aLimit[SQLITE_LIMIT_WORKER_THREADS] = SQLITE_DEFAULT_WORKER_THREADS;
@@ -4883,35 +4883,6 @@ void sqlite3_snapshot_free(sqlite3_snapshot *pSnapshot){
 }
 #endif /* SQLITE_ENABLE_SNAPSHOT */
 
-SQLITE_EXPERIMENTAL int sqlite3_wal_info(
-  sqlite3 *db, const char *zDb, 
-  unsigned int *pnPrior, unsigned int *pnFrame
-){
-  int rc = SQLITE_OK;
-
-#ifndef SQLITE_OMIT_WAL
-  Btree *pBt;
-  int iDb;
-
-#ifdef SQLITE_ENABLE_API_ARMOR
-  if( !sqlite3SafetyCheckOk(db) ){
-    return SQLITE_MISUSE_BKPT;
-  }
-#endif
-
-  sqlite3_mutex_enter(db->mutex);
-  iDb = sqlite3FindDbName(db, zDb);
-  if( iDb<0 ){
-    return SQLITE_ERROR;
-  }
-  pBt = db->aDb[iDb].pBt;
-  rc = sqlite3PagerWalInfo(sqlite3BtreePager(pBt), pnPrior, pnFrame);
-  sqlite3_mutex_leave(db->mutex);
-#endif   /* SQLITE_OMIT_WAL */
-
-  return rc;
-}
-
 #ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
 /*
 ** Given the name of a compile-time option, return true if that option

src/os_unix.c

@@ -1224,10 +1224,6 @@ struct unixInodeInfo {
   sem_t *pSem;                    /* Named POSIX semaphore */
   char aSemName[MAX_PATHNAME+2];  /* Name of that semaphore */
 #endif
-#ifdef SQLITE_SHARED_MAPPING
-  sqlite3_int64 nSharedMapping;   /* Size of mapped region in bytes */
-  void *pSharedMapping;           /* Memory mapped region */
-#endif
 };
 
 /*
@@ -1380,13 +1376,6 @@ static void releaseInodeInfo(unixFile *pFile){
     pInode->nRef--;
     if( pInode->nRef==0 ){
       assert( pInode->pShmNode==0 );
-#ifdef SQLITE_SHARED_MAPPING
-      if( pInode->pSharedMapping ){
-        osMunmap(pInode->pSharedMapping, pInode->nSharedMapping);
-        pInode->pSharedMapping = 0;
-        pInode->nSharedMapping = 0;
-      }
-#endif
       sqlite3_mutex_enter(pInode->pLockMutex);
       closePendingFds(pFile);
       sqlite3_mutex_leave(pInode->pLockMutex);
@@ -2250,14 +2239,6 @@ static int nolockUnlock(sqlite3_file *NotUsed, int NotUsed2){
 ** Close the file.
 */
 static int nolockClose(sqlite3_file *id) {
-#ifdef SQLITE_SHARED_MAPPING
-  unixFile *pFd = (unixFile*)id;
-  if( pFd->pInode ){
-    unixEnterMutex();
-    releaseInodeInfo(pFd);
-    unixLeaveMutex();
-  }
-#endif
   return closeUnixFile(id);
 }
 
@@ -4105,9 +4086,6 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
       *(i64*)pArg = pFile->mmapSizeMax;
       if( newLimit>=0 && newLimit!=pFile->mmapSizeMax && pFile->nFetchOut==0 ){
         pFile->mmapSizeMax = newLimit;
-#ifdef SQLITE_SHARED_MAPPING
-        if( pFile->pInode==0 )
-#endif
         if( pFile->mmapSize>0 ){
           unixUnmapfile(pFile);
           rc = unixMapfile(pFile, -1);
@@ -5182,9 +5160,6 @@ static int unixShmUnmap(
 */
 static void unixUnmapfile(unixFile *pFd){
   assert( pFd->nFetchOut==0 );
-#ifdef SQLITE_SHARED_MAPPING
-  if( pFd->pInode ) return;
-#endif
   if( pFd->pMapRegion ){
     osMunmap(pFd->pMapRegion, pFd->mmapSizeActual);
     pFd->pMapRegion = 0;
@@ -5316,28 +5291,6 @@ static int unixMapfile(unixFile *pFd, i64 nMap){
     nMap = pFd->mmapSizeMax;
   }
 
-#ifdef SQLITE_SHARED_MAPPING
-  if( pFd->pInode ){
-    unixInodeInfo *pInode = pFd->pInode;
-    if( pFd->pMapRegion ) return SQLITE_OK;
-    unixEnterMutex();
-    if( pInode->pSharedMapping==0 ){
-      u8 *pNew = osMmap(0, nMap, PROT_READ, MAP_SHARED, pFd->h, 0);
-      if( pNew==MAP_FAILED ){
-        unixLogError(SQLITE_OK, "mmap", pFd->zPath);
-        pFd->mmapSizeMax = 0;
-      }else{
-        pInode->pSharedMapping = pNew;
-        pInode->nSharedMapping = nMap;
-      }
-    }
-    pFd->pMapRegion = pInode->pSharedMapping;
-    pFd->mmapSizeActual = pFd->mmapSize = pInode->nSharedMapping;
-    unixLeaveMutex();
-    return SQLITE_OK;
-  }
-#endif
-
   assert( nMap>0 || (pFd->mmapSize==0 && pFd->pMapRegion==0) );
   if( nMap!=pFd->mmapSize ){
     unixRemapfile(pFd, nMap);
@@ -5775,9 +5728,6 @@ static int fillInUnixFile(
   if( pLockingStyle == &posixIoMethods
 #if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
     || pLockingStyle == &nfsIoMethods
-#endif
-#ifdef SQLITE_SHARED_MAPPING
-    || pLockingStyle == &nolockIoMethods
 #endif
   ){
     unixEnterMutex();

src/pager.c

@@ -658,9 +658,6 @@ struct Pager {
   u32 cksumInit;              /* Quasi-random value added to every checksum */
   u32 nSubRec;                /* Number of records written to sub-journal */
   Bitvec *pInJournal;         /* One bit for each page in the database file */
-#ifndef SQLITE_OMIT_CONCURRENT
-  Bitvec *pAllRead;           /* Pages read within current CONCURRENT trans. */
-#endif
   sqlite3_file *fd;           /* File descriptor for database */
   sqlite3_file *jfd;          /* File descriptor for main journal */
   sqlite3_file *sjfd;         /* File descriptor for sub-journal */
@@ -918,9 +915,7 @@ static int assert_pager_state(Pager *p){
       if( !pagerUseWal(pPager) ){
         assert( p->eLock>=RESERVED_LOCK );
       }
-#ifndef SQLITE_OMIT_CONCURRENT
-      assert( pPager->dbSize==pPager->dbOrigSize || pPager->pAllRead );
-#endif
+      assert( pPager->dbSize==pPager->dbOrigSize );
       assert( pPager->dbOrigSize==pPager->dbFileSize );
       assert( pPager->dbOrigSize==pPager->dbHintSize );
       assert( pPager->setSuper==0 );
@@ -1805,53 +1800,6 @@ static int addToSavepointBitvecs(Pager *pPager, Pgno pgno){
   return rc;
 }
 
-#ifndef SQLITE_OMIT_CONCURRENT
-/*
-** If they are not already, begin recording all pages read from the pager layer
-** by the b-tree layer This is used by concurrent transactions. Return
-** SQLITE_OK if successful, or an SQLite error code (SQLITE_NOMEM) if an error
-** occurs.
-*/
-int sqlite3PagerBeginConcurrent(Pager *pPager){
-  int rc = SQLITE_OK;
-  if( pPager->pAllRead==0 ){
-    pPager->pAllRead = sqlite3BitvecCreate(pPager->dbSize);
-    pPager->dbOrigSize = pPager->dbSize;
-    if( pPager->pAllRead==0 ){
-      rc = SQLITE_NOMEM;
-    }
-  }
-  return rc;
-}
-
-/* !defined(SQLITE_OMIT_CONCURRENT)
-**
-** Stop recording all pages read from the pager layer by the b-tree layer
-** and discard any current records.
-*/
-void sqlite3PagerEndConcurrent(Pager *pPager){
-  sqlite3BitvecDestroy(pPager->pAllRead);
-  pPager->pAllRead = 0;
-}
-
-/* !defined(SQLITE_OMIT_CONCURRENT)
-**
-** Return true if the database is in wal mode. False otherwise.
-*/
-int sqlite3PagerIsWal(Pager *pPager){
-  return pPager->pWal!=0;
-}
-#endif /* SQLITE_OMIT_CONCURRENT */
-
-/*
-** Free the Pager.pInJournal and Pager.pAllRead bitvec objects.
-*/
-static void pagerFreeBitvecs(Pager *pPager){
-  sqlite3BitvecDestroy(pPager->pInJournal);
-  pPager->pInJournal = 0;
-  sqlite3PagerEndConcurrent(pPager);
-}
-
 /*
 ** This function is a no-op if the pager is in exclusive mode and not
 ** in the ERROR state. Otherwise, it switches the pager to PAGER_OPEN
@@ -1876,7 +1824,8 @@ static void pager_unlock(Pager *pPager){
        || pPager->eState==PAGER_ERROR
   );
 
-  pagerFreeBitvecs(pPager);
+  sqlite3BitvecDestroy(pPager->pInJournal);
+  pPager->pInJournal = 0;
   releaseAllSavepoints(pPager);
 
   if( pagerUseWal(pPager) ){
@@ -2143,7 +2092,8 @@ static int pager_end_transaction(Pager *pPager, int hasSuper, int bCommit){
   }
 #endif
 
-  pagerFreeBitvecs(pPager);
+  sqlite3BitvecDestroy(pPager->pInJournal);
+  pPager->pInJournal = 0;
   pPager->nRec = 0;
   if( rc==SQLITE_OK ){
     if( MEMDB || pagerFlushOnCommit(pPager, bCommit) ){
@@ -3155,24 +3105,8 @@ static int pagerRollbackWal(Pager *pPager){
   **   + Reload page content from the database (if refcount>0).
   */
   pPager->dbSize = pPager->dbOrigSize;
-  rc = sqlite3WalUndo(pPager->pWal, pagerUndoCallback, (void *)pPager, 
-#ifdef SQLITE_OMIT_CONCURRENT
-      0
-#else
-      pPager->pAllRead!=0
-#endif
-  );
+  rc = sqlite3WalUndo(pPager->pWal, pagerUndoCallback, (void *)pPager);
   pList = sqlite3PcacheDirtyList(pPager->pPCache);
-
-#ifndef SQLITE_OMIT_CONCURRENT
-  /* If this is an CONCURRENT transaction, then page 1 must be reread from 
-  ** the db file, even if it is not dirty. This is because the b-tree layer 
-  ** may have already zeroed the nFree and iTrunk header fields.  */
-  if( rc==SQLITE_OK && (pList==0 || pList->pgno!=1) && pPager->pAllRead ){
-    rc = pagerUndoCallback((void*)pPager, 1);
-  }
-#endif
-
   while( pList && rc==SQLITE_OK ){
     PgHdr *pNext = pList->pDirty;
     rc = pagerUndoCallback((void *)pPager, pList->pgno);
@@ -3222,8 +3156,6 @@ static int pagerWalFrames(
       if( p->pgno<=nTruncate ){
         ppNext = &p->pDirty;
         nList++;
-        PAGERTRACE(("TO-WAL %d page %d hash(%08x)\n",
-                     PAGERID(pPager), p->pgno, pager_pagehash(p)));
       }
     }
     assert( pList );
@@ -4293,7 +4225,7 @@ static int syncJournal(Pager *pPager, int newHdr){
   assert( assert_pager_state(pPager) );
   assert( !pagerUseWal(pPager) );
 
-  rc = sqlite3PagerExclusiveLock(pPager, 0, 0);
+  rc = sqlite3PagerExclusiveLock(pPager);
   if( rc!=SQLITE_OK ) return rc;
 
   if( !pPager->noSync ){
@@ -4644,12 +4576,6 @@ static int pagerStress(void *p, PgHdr *pPg){
   pPager->aStat[PAGER_STAT_SPILL]++;
   pPg->pDirty = 0;
   if( pagerUseWal(pPager) ){
-#ifndef SQLITE_OMIT_CONCURRENT
-    /* If the transaction is a "BEGIN CONCURRENT" transaction, the page 
-    ** cannot be flushed to disk. Return early in this case. */
-    if( pPager->pAllRead ) return SQLITE_OK;
-#endif
-
     /* Write a single frame for this page to the log. */
     rc = subjournalPageIfRequired(pPg);
     if( rc==SQLITE_OK ){
@@ -5551,18 +5477,6 @@ static int getPageNormal(
   assert( assert_pager_state(pPager) );
   assert( pPager->hasHeldSharedLock==1 );
 
-#ifndef SQLITE_OMIT_CONCURRENT
-  /* If this is an CONCURRENT transaction and the page being read was
-  ** present in the database file when the transaction was opened,
-  ** mark it as read in the pAllRead vector.  */
-  pPg = 0;
-  if( pPager->pAllRead && pgno<=pPager->dbOrigSize ){
-    PAGERTRACE(("USING page %d\n", pgno));
-    rc = sqlite3BitvecSet(pPager->pAllRead, pgno);
-    if( rc!=SQLITE_OK ) goto pager_acquire_err;
-  }
-#endif
-
   if( pgno==0 ) return SQLITE_CORRUPT_BKPT;
   pBase = sqlite3PcacheFetch(pPager->pPCache, pgno, 3);
   if( pBase==0 ){
@@ -5909,14 +5823,11 @@ static int pager_open_journal(Pager *pPager){
 ** Begin a write-transaction on the specified pager object. If a
 ** write-transaction has already been opened, this function is a no-op.
 **
-** If the exFlag argument is 0, then acquire at least a RESERVED
-** lock on the database file. If exFlag is >0, then acquire at least
+** If the exFlag argument is false, then acquire at least a RESERVED
+** lock on the database file. If exFlag is true, then acquire at least
 ** an EXCLUSIVE lock. If such a lock is already held, no locking
 ** functions need be called.
 **
-** If (exFlag<0) and the database is in WAL mode, do not take any locks.
-** The transaction will run in CONCURRENT mode instead.
-**
 ** If the subjInMemory argument is non-zero, then any sub-journal opened
 ** within this transaction will be opened as an in-memory file. This
 ** has no effect if the sub-journal is already opened (as it may be when
@@ -5934,6 +5845,7 @@ int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory){
 
   if( pPager->eState==PAGER_READER ){
     assert( pPager->pInJournal==0 );
+
     if( pagerUseWal(pPager) ){
       /* If the pager is configured to use locking_mode=exclusive, and an
       ** exclusive lock on the database is not already held, obtain it now.
@@ -5949,10 +5861,9 @@ int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory){
       /* Grab the write lock on the log file. If successful, upgrade to
       ** PAGER_RESERVED state. Otherwise, return an error code to the caller.
       ** The busy-handler is not invoked if another connection already
-      ** holds the write-lock. If possible, the upper layer will call it.  */
-      if( exFlag>=0 ){
-        rc = sqlite3WalBeginWriteTransaction(pPager->pWal);
-      }
+      ** holds the write-lock. If possible, the upper layer will call it.
+      */
+      rc = sqlite3WalBeginWriteTransaction(pPager->pWal);
     }else{
       /* Obtain a RESERVED lock on the database file. If the exFlag parameter
       ** is true, then immediately upgrade this to an EXCLUSIVE lock. The
@@ -5960,7 +5871,7 @@ int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory){
       ** lock, but not when obtaining the RESERVED lock.
       */
       rc = pagerLockDb(pPager, RESERVED_LOCK);
-      if( rc==SQLITE_OK && exFlag>0 ){
+      if( rc==SQLITE_OK && exFlag ){
         rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
       }
     }
@@ -6260,7 +6171,7 @@ int sqlite3PagerWrite(PgHdr *pPg){
 ** to sqlite3PagerWrite().  In other words, return TRUE if it is ok
 ** to change the content of the page.
 */
-#if !defined(SQLITE_OMIT_CONCURRENT) || !defined(NDEBUG)
+#ifndef NDEBUG
 int sqlite3PagerIswriteable(DbPage *pPg){
   return pPg->flags & PGHDR_WRITEABLE;
 }
@@ -6416,26 +6327,17 @@ int sqlite3PagerSync(Pager *pPager, const char *zSuper){
 }
 
 /*
-** This function is called to ensure that all locks required to commit the
-** current write-transaction to the database file are held. If the db is
-** in rollback mode, this means the EXCLUSIVE lock on the database file.
+** This function may only be called while a write-transaction is active in
+** rollback. If the connection is in WAL mode, this call is a no-op.
+** Otherwise, if the connection does not already have an EXCLUSIVE lock on
+** the database file, an attempt is made to obtain one.
 **
-** Or, if this is a non-CONCURRENT transaction on a wal-mode database, this
-** function is a no-op.
-**
-** If this is an CONCURRENT transaction on a wal-mode database, this function
-** attempts to obtain the WRITER lock on the wal file and also checks to
-** see that the transaction can be safely committed (does not commit with 
-** any other transaction committed since it was opened).
-**
-** If the required locks are already held or successfully obtained and
-** the transaction can be committed, SQLITE_OK is returned. If a required lock
-** cannot be obtained, SQLITE_BUSY is returned. Or, if the current transaction
-** is CONCURRENT and cannot be committed due to a conflict, SQLITE_BUSY_SNAPSHOT
-** is returned. Otherwise, if some other error occurs (IO error, OOM etc.),
-** and SQLite error code is returned.
+** If the EXCLUSIVE lock is already held or the attempt to obtain it is
+** successful, or the connection is in WAL mode, SQLITE_OK is returned.
+** Otherwise, either SQLITE_BUSY or an SQLITE_IOERR_XXX error code is
+** returned.
 */
-int sqlite3PagerExclusiveLock(Pager *pPager, PgHdr *pPage1, Pgno *piConflict){
+int sqlite3PagerExclusiveLock(Pager *pPager){
   int rc = pPager->errCode;
   assert( assert_pager_state(pPager) );
   if( rc==SQLITE_OK ){
@@ -6447,73 +6349,10 @@ int sqlite3PagerExclusiveLock(Pager *pPager, PgHdr *pPage1, Pgno *piConflict){
     if( 0==pagerUseWal(pPager) ){
       rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
     }
-#ifndef SQLITE_OMIT_CONCURRENT
-    else{
-      if( pPager->pAllRead ){
-        /* This is an CONCURRENT transaction. Attempt to lock the wal database
-        ** here. If SQLITE_BUSY (but not SQLITE_BUSY_SNAPSHOT) is returned,
-        ** invoke the busy-handler and try again for as long as it returns
-        ** non-zero.  */
-        do {
-          rc = sqlite3WalLockForCommit(
-              pPager->pWal, pPage1, pPager->pAllRead, piConflict
-          );
-        }while( rc==SQLITE_BUSY 
-             && pPager->xBusyHandler(pPager->pBusyHandlerArg) 
-        );
-      }
-    }
-#endif /* SQLITE_OMIT_CONCURRENT */
   }
   return rc;
 }
 
-#ifndef SQLITE_OMIT_CONCURRENT
-/*
-** This function is called as part of committing an CONCURRENT transaction.
-** At this point the wal WRITER lock is held, and all pages in the cache 
-** except for page 1 are compatible with the snapshot at the head of the
-** wal file. 
-**
-** This function updates the in-memory data structures and reloads the
-** contents of page 1 so that the client is operating on the snapshot 
-** at the head of the wal file.
-**
-** SQLITE_OK is returned if successful, or an SQLite error code otherwise.
-*/
-int sqlite3PagerUpgradeSnapshot(Pager *pPager, DbPage *pPage1){
-  int rc;
-
-  assert( pPager->pWal && pPager->pAllRead );
-  rc = sqlite3WalUpgradeSnapshot(pPager->pWal);
-  if( rc==SQLITE_OK ){
-    rc = readDbPage(pPage1);
-  }
-
-  return rc;
-}
-
-/* !defined(SQLITE_OMIT_CONCURRENT)
-**
-** Set the in-memory cache of the database file size to nSz pages.
-*/
-void sqlite3PagerSetDbsize(Pager *pPager, Pgno nSz){
-  pPager->dbSize = nSz;
-}
-
-/* !defined(SQLITE_OMIT_CONCURRENT)
-**
-** If this is a WAL mode connection and the WRITER lock is currently held,
-** relinquish it.
-*/
-void sqlite3PagerDropExclusiveLock(Pager *pPager){
-  if( pagerUseWal(pPager) ){
-    sqlite3WalEndWriteTransaction(pPager->pWal);
-  }
-}
-#endif  /* SQLITE_OMIT_CONCURRENT */
-
-
 /*
 ** Sync the database file for the pager pPager. zSuper points to the name
 ** of a super-journal file that should be written into the individual
@@ -7874,11 +7713,6 @@ void sqlite3PagerSnapshotUnlock(Pager *pPager){
 }
 
 #endif /* SQLITE_ENABLE_SNAPSHOT */
-
-int sqlite3PagerWalInfo(Pager *pPager, u32 *pnPrior, u32 *pnFrame){
-  return sqlite3WalInfo(pPager->pWal, pnPrior, pnFrame);
-}
-
 #endif /* !SQLITE_OMIT_WAL */
 
 #ifdef SQLITE_ENABLE_ZIPVFS

src/pager.h

@@ -163,7 +163,7 @@ void *sqlite3PagerGetExtra(DbPage *);
 void sqlite3PagerPagecount(Pager*, int*);
 int sqlite3PagerBegin(Pager*, int exFlag, int);
 int sqlite3PagerCommitPhaseOne(Pager*,const char *zSuper, int);
-int sqlite3PagerExclusiveLock(Pager*, DbPage *pPage1, Pgno*);
+int sqlite3PagerExclusiveLock(Pager*);
 int sqlite3PagerSync(Pager *pPager, const char *zSuper);
 int sqlite3PagerCommitPhaseTwo(Pager*);
 int sqlite3PagerRollback(Pager*);
@@ -171,7 +171,6 @@ int sqlite3PagerOpenSavepoint(Pager *pPager, int n);
 int sqlite3PagerSavepoint(Pager *pPager, int op, int iSavepoint);
 int sqlite3PagerSharedLock(Pager *pPager);
 
-
 #ifndef SQLITE_OMIT_WAL
   int sqlite3PagerCheckpoint(Pager *pPager, sqlite3*, int, int*, int*);
   int sqlite3PagerWalSupported(Pager *pPager);
@@ -226,26 +225,10 @@ void sqlite3PagerTruncateImage(Pager*,Pgno);
 
 void sqlite3PagerRekey(DbPage*, Pgno, u16);
 
-#ifndef SQLITE_OMIT_CONCURRENT
-void sqlite3PagerEndConcurrent(Pager*);
-int sqlite3PagerBeginConcurrent(Pager*);
-void sqlite3PagerDropExclusiveLock(Pager*);
-int sqlite3PagerUpgradeSnapshot(Pager *pPager, DbPage*);
-void sqlite3PagerSetDbsize(Pager *pPager, Pgno);
-int sqlite3PagerIsWal(Pager*);
-#else
-# define sqlite3PagerEndConcurrent(x)
-#endif
-
-#if defined(SQLITE_DEBUG) || !defined(SQLITE_OMIT_CONCURRENT)
-int sqlite3PagerIswriteable(DbPage*);
-#endif
-
-int sqlite3PagerWalInfo(Pager*, u32 *pnPrior, u32 *pnFrame);
-
 /* Functions to support testing and debugging. */
 #if !defined(NDEBUG) || defined(SQLITE_TEST)
   Pgno sqlite3PagerPagenumber(DbPage*);
+  int sqlite3PagerIswriteable(DbPage*);
 #endif
 #ifdef SQLITE_TEST
   int *sqlite3PagerStats(Pager*);

src/parse.y

@@ -105,13 +105,6 @@
 */
 struct TrigEvent { int a; IdList * b; };
 
-/*
-** Generate a syntax error
-*/
-static void parserSyntaxError(Parse *pParse, Token *p){
-  sqlite3ErrorMsg(pParse, "near \"%T\": syntax error", p);
-}
-
 struct FrameBound     { int eType; Expr *pExpr; };
 
 /*
@@ -171,16 +164,7 @@ trans_opt ::= TRANSACTION nm.
 transtype(A) ::= .             {A = TK_DEFERRED;}
 transtype(A) ::= DEFERRED(X).  {A = @X; /*A-overwrites-X*/}
 transtype(A) ::= IMMEDIATE(X). {A = @X; /*A-overwrites-X*/}
-transtype(A) ::= ID(X). {
-   Token *p = &X;
-   if( p->n==9 && sqlite3_strnicmp(p->z,"exclusive",9)==0 ){
-     A = TK_EXCLUSIVE;
-   }else if( p->n==10 && sqlite3_strnicmp(p->z,"concurrent",10)==0 ){
-     A = TK_CONCURRENT;  /*A-overwrites-X*/
-   }else{
-     parserSyntaxError(pParse, p);
-   }
-}
+transtype(A) ::= EXCLUSIVE(X). {A = @X; /*A-overwrites-X*/}
 cmd ::= COMMIT|END(X) trans_opt.   {sqlite3EndTransaction(pParse,@X);}
 cmd ::= ROLLBACK(X) trans_opt.     {sqlite3EndTransaction(pParse,@X);}
 
@@ -311,6 +295,7 @@ columnname(A) ::= nm(A) typetoken(Y). {sqlite3AddColumn(pParse,A,Y);}
 // keywords.  Any non-standard keyword can also be an identifier.
 //
 %token_class id  ID|INDEXED.
+
 // And "ids" is an identifer-or-string.
 //
 %token_class ids  ID|STRING.
@@ -1137,7 +1122,7 @@ expr(A) ::= VARIABLE(X).     {
     Token t = X; /*A-overwrites-X*/
     assert( t.n>=2 );
     if( pParse->nested==0 ){
-      parserSyntaxError(pParse, &t);
+      sqlite3ErrorMsg(pParse, "near \"%T\": syntax error", &t);
       A = 0;
     }else{
       A = sqlite3PExpr(pParse, TK_REGISTER, 0, 0);
@@ -1922,7 +1907,6 @@ filter_clause(A) ::= FILTER LP WHERE expr(X) RP.  { A = X; }
   UPLUS           /* Unary plus */
   TRUTH           /* IS TRUE or IS FALSE or IS NOT TRUE or IS NOT FALSE */
   REGISTER        /* Reference to a VDBE register */
-  CONCURRENT      /* BEGIN CONCURRENT */
   VECTOR          /* Vector */
   SELECT_COLUMN   /* Choose a single column from a multi-column SELECT */
   IF_NULL_ROW     /* the if-null-row operator */

src/pragma.h

@@ -441,15 +441,6 @@ static const PragmaName aPragmaName[] = {
   /* iArg:      */ 0 },
 #endif
 #endif
-#endif
-#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-#if defined(SQLITE_ENABLE_NOOP_UPDATE)
- {/* zName:     */ "noop_update",
-  /* ePragTyp:  */ PragTyp_FLAG,
-  /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
-  /* ColNames:  */ 0, 0,
-  /* iArg:      */ SQLITE_NoopUpdate },
-#endif
 #endif
  {/* zName:     */ "optimize",
   /* ePragTyp:  */ PragTyp_OPTIMIZE,

src/random.c

@@ -129,33 +129,6 @@ void sqlite3_randomness(int N, void *pBuf){
   sqlite3_mutex_leave(mutex);
 }
 
-/*
-** Initialize a fast PRNG.  A Fast PRNG is called "fast" because it does
-** not need a mutex to operate, though it does use a mutex to initialize.
-** The quality of the randomness is not as good as the global PRNG.
-*/
-void sqlite3FastPrngInit(FastPrng *pPrng){
-  sqlite3_randomness(sizeof(*pPrng), pPrng);
-  pPrng->x |= 1;
-}
-
-/*
-** Generate N bytes of pseudo-randomness using a FastPrng
-*/
-void sqlite3FastRandomness(FastPrng *pPrng, int N, void *P){
-  unsigned char *pOut = (unsigned char*)P;
-  while( N-->0 ){
-    /* "x" is a variant of LFSR called "Xorshift" by George Marsaglia */
-    pPrng->x ^= pPrng->x <<13;
-    pPrng->x ^= pPrng->x >>7;
-    pPrng->x ^= pPrng->x <<17;
-    /* "y" is a LCG using Don Kunth's constants from MMIX */
-    pPrng->y = (pPrng->y)*6364136223846793005LL + 1442695040888963407LL;
-    /* XOR the two streams together to give the final result */
-    *(pOut++) = (pPrng->x ^ pPrng->y) & 0xff;
-  }
-}
-
 #ifndef SQLITE_UNTESTABLE
 /*
 ** For testing purposes, we sometimes want to preserve the state of

src/select.c

@@ -2266,7 +2266,7 @@ int sqlite3ColumnsFromExprList(
       zName = sqlite3MPrintf(db, "%.*z:%u", nName, zName, ++cnt);
       sqlite3ProgressCheck(pParse);
       if( cnt>3 ){
-        sqlite3FastRandomness(&db->sPrng, sizeof(cnt), &cnt);
+        sqlite3_randomness(sizeof(cnt), &cnt);
       }
     }
     pCol->zCnName = zName;
@@ -5301,12 +5301,12 @@ static int disableUnusedSubqueryResultColumns(SrcItem *pItem){
   assert( pItem->pSelect!=0 );
   pSub = pItem->pSelect;
   assert( pSub->pEList->nExpr==pTab->nCol );
+  if( (pSub->selFlags & (SF_Distinct|SF_Aggregate))!=0 ){
+    testcase( pSub->selFlags & SF_Distinct );
+    testcase( pSub->selFlags & SF_Aggregate );
+    return 0;
+  }
   for(pX=pSub; pX; pX=pX->pPrior){
-    if( (pX->selFlags & (SF_Distinct|SF_Aggregate))!=0 ){
-      testcase( pX->selFlags & SF_Distinct );
-      testcase( pX->selFlags & SF_Aggregate );
-      return 0;
-    }
     if( pX->pPrior && pX->op!=TK_ALL ){
       /* This optimization does not work for compound subqueries that
       ** use UNION, INTERSECT, or EXCEPT.  Only UNION ALL is allowed. */

src/shell.c.in

@@ -1242,7 +1242,7 @@ static void shellDtostr(
   char z[400];
   if( n<1 ) n = 1;
   if( n>350 ) n = 350;
-  snprintf(z, sizeof(z)-1, "%#+.*e", n, r);
+  sprintf(z, "%#+.*e", n, r);
   sqlite3_result_text(pCtx, z, -1, SQLITE_TRANSIENT);
 }
 

src/sqlite.h.in

@@ -10520,31 +10520,6 @@ SQLITE_EXPERIMENTAL int sqlite3_snapshot_cmp(
 */
 SQLITE_EXPERIMENTAL int sqlite3_snapshot_recover(sqlite3 *db, const char *zDb);
 
-/*
-** CAPI3REF: Wal related information regarding the most recent COMMIT
-** EXPERIMENTAL
-**
-** This function reports on the state of the wal file (if any) for database 
-** zDb, which should be "main", "temp", or the name of the attached database.
-** Its results - the values written to the output parameters - are only
-** defined if the most recent SQL command on the connection was a successful 
-** COMMIT that wrote data to wal-mode database zDb.
-**
-** Assuming the above conditions are met, output parameter (*pnFrame) is set
-** to the total number of frames in the wal file. Parameter (*pnPrior) is
-** set to the number of frames that were present in the wal file before the
-** most recent transaction was committed. So that the number of frames written
-** by the most recent transaction is (*pnFrame)-(*pnPrior).
-**
-** If successful, SQLITE_OK is returned. Otherwise, an SQLite error code. It
-** is not an error if this function is called at a time when the results
-** are undefined.
-*/
-SQLITE_EXPERIMENTAL int sqlite3_wal_info(
-  sqlite3 *db, const char *zDb, 
-  unsigned int *pnPrior, unsigned int *pnFrame
-);
-
 /*
 ** CAPI3REF: Serialize a database
 **

src/sqliteInt.h

@@ -1260,7 +1260,6 @@ typedef struct DbFixer DbFixer;
 typedef struct Schema Schema;
 typedef struct Expr Expr;
 typedef struct ExprList ExprList;
-typedef struct FastPrng FastPrng;
 typedef struct FKey FKey;
 typedef struct FpDecode FpDecode;
 typedef struct FuncDestructor FuncDestructor;
@@ -1388,14 +1387,6 @@ typedef int VList;
 # define SQLITE_DEFAULT_WAL_SYNCHRONOUS SQLITE_DEFAULT_SYNCHRONOUS
 #endif
 
-/*
-** State of a simple PRNG used for the per-connection and per-pager
-** pseudo-random number generators.
-*/
-struct FastPrng {
-  sqlite3_uint64 x, y;
-};
-
 /*
 ** Each database file to be accessed by the system is an instance
 ** of the following structure.  There are normally two of these structures
@@ -1643,7 +1634,6 @@ struct sqlite3 {
   u32 dbOptFlags;               /* Flags to enable/disable optimizations */
   u8 enc;                       /* Text encoding */
   u8 autoCommit;                /* The auto-commit flag. */
-  u8 eConcurrent;               /* CONCURRENT_* value */
   u8 temp_store;                /* 1: file 2: memory 0: default */
   u8 mallocFailed;              /* True if we have seen a malloc failure */
   u8 bBenignMalloc;             /* Do not require OOMs if true */
@@ -1657,7 +1647,6 @@ struct sqlite3 {
   u8 nSqlExec;                  /* Number of pending OP_SqlExec opcodes */
   u8 eOpenState;                /* Current condition of the connection */
   int nextPagesize;             /* Pagesize after VACUUM if >0 */
-  FastPrng sPrng;               /* State of the per-connection PRNG */
   i64 nChange;                  /* Value returned by sqlite3_changes() */
   i64 nTotalChange;             /* Value returned by sqlite3_total_changes() */
   int aLimit[SQLITE_N_LIMIT];   /* Limits */
@@ -1767,13 +1756,6 @@ struct sqlite3 {
 #endif
 };
 
-/*
-** Candidate values for sqlite3.eConcurrent
-*/
-#define CONCURRENT_NONE   0
-#define CONCURRENT_OPEN   1
-#define CONCURRENT_SCHEMA 2
-
 /*
 ** A macro to discover the encoding of a database.
 */
@@ -1835,9 +1817,6 @@ struct sqlite3 {
 #define SQLITE_CorruptRdOnly  HI(0x00002) /* Prohibit writes due to error */
 #define SQLITE_ReadUncommit   HI(0x00004) /* READ UNCOMMITTED in shared-cache */
 
-/* Flags used by the Pragma noop_update enhancement */
-#define SQLITE_NoopUpdate     HI(0x0001000) /* UPDATE operations are no-ops */
-
 /* Flags used only if debugging */
 #ifdef SQLITE_DEBUG
 #define SQLITE_SqlTrace       HI(0x0100000) /* Debug print SQL as it executes */
@@ -4978,8 +4957,6 @@ Vdbe *sqlite3GetVdbe(Parse*);
 void sqlite3PrngSaveState(void);
 void sqlite3PrngRestoreState(void);
 #endif
-void sqlite3FastPrngInit(FastPrng*);
-void sqlite3FastRandomness(FastPrng*, int N, void *P);
 void sqlite3RollbackAll(sqlite3*,int);
 void sqlite3CodeVerifySchema(Parse*, int);
 void sqlite3CodeVerifyNamedSchema(Parse*, const char *zDb);

src/test1.c

@@ -8583,41 +8583,6 @@ static int SQLITE_TCLAPI test_dbconfig_maindbname_icecube(
   }
 }
 
-/*
-** Usage: sqlite3_wal_info DB DBNAME
-*/
-static int SQLITE_TCLAPI test_wal_info(
-  void * clientData,
-  Tcl_Interp *interp,
-  int objc,
-  Tcl_Obj *CONST objv[]
-){
-  int rc;
-  sqlite3 *db;
-  char *zName;
-  unsigned int nPrior;
-  unsigned int nFrame;
-
-  if( objc!=3 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "DB DBNAME");
-    return TCL_ERROR;
-  }
-  if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
-  zName = Tcl_GetString(objv[2]);
-
-  rc = sqlite3_wal_info(db, zName, &nPrior, &nFrame);
-  if( rc!=SQLITE_OK ){
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(sqlite3ErrName(rc), -1));
-    return TCL_ERROR;
-  }else{
-    Tcl_Obj *pNew = Tcl_NewObj();
-    Tcl_ListObjAppendElement(interp, pNew, Tcl_NewWideIntObj((i64)nPrior));
-    Tcl_ListObjAppendElement(interp, pNew, Tcl_NewWideIntObj((i64)nFrame));
-    Tcl_SetObjResult(interp, pNew);
-  }
-  return TCL_OK;
-}
-
 /*
 ** Usage: sqlite3_mmap_warm DB DBNAME
 */
@@ -9219,9 +9184,8 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
      { "sqlite3_snapshot_open_blob", test_snapshot_open_blob, 0 },
      { "sqlite3_snapshot_cmp_blob", test_snapshot_cmp_blob, 0 },
 #endif
-     { "sqlite3_delete_database", test_delete_database, 0 },
-     { "sqlite3_wal_info", test_wal_info, 0 },
-     { "atomic_batch_write",      test_atomic_batch_write,     0   },
+     { "sqlite3_delete_database", test_delete_database,    0 },
+     { "atomic_batch_write",      test_atomic_batch_write, 0 },
      { "sqlite3_mmap_warm",       test_mmap_warm,          0 },
      { "sqlite3_config_sorterref", test_config_sorterref,   0 },
      { "sqlite3_autovacuum_pages", test_autovacuum_pages,   0 },

src/test_config.c

@@ -669,12 +669,6 @@ Tcl_SetVar2(interp, "sqlite_options", "mergesort", "1", TCL_GLOBAL_ONLY);
   Tcl_SetVar2(interp, "sqlite_options", "truncate_opt", "1", TCL_GLOBAL_ONLY);
 #endif
 
-#ifndef SQLITE_OMIT_CONCURRENT
-  Tcl_SetVar2(interp, "sqlite_options", "concurrent", "1", TCL_GLOBAL_ONLY);
-#else
-  Tcl_SetVar2(interp, "sqlite_options", "concurrent", "0", TCL_GLOBAL_ONLY);
-#endif
-
 #ifdef SQLITE_OMIT_UTF16
   Tcl_SetVar2(interp, "sqlite_options", "utf16", "0", TCL_GLOBAL_ONLY);
 #else

src/update.c

@@ -465,17 +465,6 @@ void sqlite3Update(
   */
   chngRowid = chngPk = 0;
   for(i=0; i<pChanges->nExpr; i++){
-#if defined(SQLITE_ENABLE_NOOP_UPDATE) && !defined(SQLITE_OMIT_FLAG_PRAGMAS)
-    if( db->flags & SQLITE_NoopUpdate ){
-      Token x;
-      sqlite3ExprDelete(db, pChanges->a[i].pExpr);
-      x.z = pChanges->a[i].zEName;
-      x.n = sqlite3Strlen30(x.z);
-      pChanges->a[i].pExpr =
-        sqlite3PExpr(pParse, TK_UPLUS, sqlite3ExprAlloc(db, TK_ID, &x, 0), 0);
-      if( db->mallocFailed ) goto update_cleanup;
-    }
-#endif
     u8 hCol = sqlite3StrIHash(pChanges->a[i].zEName);
     /* If this is an UPDATE with a FROM clause, do not resolve expressions
     ** here. The call to sqlite3Select() below will do that. */

src/util.c

@@ -1025,29 +1025,29 @@ void sqlite3FpDecode(FpDecode *p, double r, int iRound, int mxRound){
     double rr[2];
     rr[0] = r;
     rr[1] = 0.0;
-    if( rr[0]>9.223372036854774784e+18 ){
-      while( rr[0]>9.223372036854774784e+118 ){
+    if( rr[0]>1.84e+19 ){
+      while( rr[0]>1.84e+119 ){
         exp += 100;
         dekkerMul2(rr, 1.0e-100, -1.99918998026028836196e-117);
       }
-      while( rr[0]>9.223372036854774784e+28 ){
+      while( rr[0]>1.84e+29 ){
         exp += 10;
         dekkerMul2(rr, 1.0e-10, -3.6432197315497741579e-27);
       }
-      while( rr[0]>9.223372036854774784e+18 ){
+      while( rr[0]>1.84e+19 ){
         exp += 1;
         dekkerMul2(rr, 1.0e-01, -5.5511151231257827021e-18);
       }
     }else{
-      while( rr[0]<9.223372036854774784e-83  ){
+      while( rr[0]<1.84e-82  ){
         exp -= 100;
         dekkerMul2(rr, 1.0e+100, -1.5902891109759918046e+83);
       }
-      while( rr[0]<9.223372036854774784e+07  ){
+      while( rr[0]<1.84e+08  ){
         exp -= 10;
         dekkerMul2(rr, 1.0e+10, 0.0);
       }
-      while( rr[0]<9.22337203685477478e+17  ){
+      while( rr[0]<1.84e+18  ){
         exp -= 1;
         dekkerMul2(rr, 1.0e+01, 0.0);
       }

src/vacuum.c

@@ -396,7 +396,6 @@ end_of_vacuum:
   ** is closed by the DETACH.
   */
   db->autoCommit = 1;
-  assert( db->eConcurrent==0 );
 
   if( pDb ){
     sqlite3BtreeClose(pDb->pBt);