From f55fb6615be38fc3e19e8fa3bef352374cd9e02d Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Wed, 16 Mar 2016 19:48:10 +0000
Subject: [PATCH 1/4] Have fts5 cache the decoded structure of fts5 indexes in
 memory. Use "PRAGMA data_version" to detect stale caches.

FossilOrigin-Name: 33ef2210ef19e55c8d460bfe9d3dc146034c8acc
---
 ext/fts5/fts5Int.h              |   2 +
 ext/fts5/fts5_index.c           | 115 +++++++++++++++++++++++++++-----
 ext/fts5/fts5_main.c            |  39 +++++++----
 ext/fts5/fts5_storage.c         |   4 ++
 ext/fts5/test/fts5corrupt3.test |   4 ++
 ext/fts5/test/fts5dlidx.test    |   4 +-
 manifest                        |  27 ++++----
 manifest.uuid                   |   2 +-
 8 files changed, 153 insertions(+), 44 deletions(-)

diff --git a/ext/fts5/fts5Int.h b/ext/fts5/fts5Int.h
index 35f15abbaf..961206f2b3 100644
--- a/ext/fts5/fts5Int.h
+++ b/ext/fts5/fts5Int.h
@@ -480,6 +480,7 @@ int sqlite3Fts5IndexReads(Fts5Index *p);
 int sqlite3Fts5IndexReinit(Fts5Index *p);
 int sqlite3Fts5IndexOptimize(Fts5Index *p);
 int sqlite3Fts5IndexMerge(Fts5Index *p, int nMerge);
+int sqlite3Fts5IndexReset(Fts5Index *p);
 
 int sqlite3Fts5IndexLoadConfig(Fts5Index *p);
 
@@ -622,6 +623,7 @@ int sqlite3Fts5StorageDeleteAll(Fts5Storage *p);
 int sqlite3Fts5StorageRebuild(Fts5Storage *p);
 int sqlite3Fts5StorageOptimize(Fts5Storage *p);
 int sqlite3Fts5StorageMerge(Fts5Storage *p, int nMerge);
+int sqlite3Fts5StorageReset(Fts5Storage *p);
 
 /*
 ** End of interface to code in fts5_storage.c.
diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 323e6cefdc..78003396d6 100644
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -304,6 +304,10 @@ struct Fts5Index {
   sqlite3_stmt *pIdxDeleter;      /* "DELETE FROM %_idx WHERE segid=? */
   sqlite3_stmt *pIdxSelect;
   int nRead;                      /* Total number of blocks read */
+
+  sqlite3_stmt *pDataVersion;
+  i64 iStructVersion;             /* data_version when pStruct read */
+  Fts5Structure *pStruct;         /* Current db structure (or NULL) */
 };
 
 struct Fts5DoclistIter {
@@ -959,6 +963,48 @@ static void fts5StructureExtendLevel(
   }
 }
 
+static Fts5Structure *fts5StructureReadUncached(Fts5Index *p){
+  Fts5Structure *pRet = 0;
+  Fts5Config *pConfig = p->pConfig;
+  int iCookie;                    /* Configuration cookie */
+  Fts5Data *pData;
+
+  pData = fts5DataRead(p, FTS5_STRUCTURE_ROWID);
+  if( p->rc==SQLITE_OK ){
+    /* TODO: Do we need this if the leaf-index is appended? Probably... */
+    memset(&pData->p[pData->nn], 0, FTS5_DATA_PADDING);
+    p->rc = fts5StructureDecode(pData->p, pData->nn, &iCookie, &pRet);
+    if( p->rc==SQLITE_OK && pConfig->iCookie!=iCookie ){
+      p->rc = sqlite3Fts5ConfigLoad(pConfig, iCookie);
+    }
+    fts5DataRelease(pData);
+    if( p->rc!=SQLITE_OK ){
+      fts5StructureRelease(pRet);
+      pRet = 0;
+    }
+  }
+
+  return pRet;
+}
+
+static i64 fts5IndexDataVersion(Fts5Index *p){
+  i64 iVersion = 0;
+
+  if( p->pDataVersion==0 ){
+    p->rc = fts5IndexPrepareStmt(p, &p->pDataVersion, 
+        sqlite3_mprintf("PRAGMA %Q.data_version", p->pConfig->zDb)
+    );
+    if( p->rc ) return 0;
+  }
+
+  if( SQLITE_ROW==sqlite3_step(p->pDataVersion) ){
+    iVersion = sqlite3_column_int64(p->pDataVersion, 0);
+  }
+  p->rc = sqlite3_reset(p->pDataVersion);
+
+  return iVersion;
+}
+
 /*
 ** Read, deserialize and return the structure record.
 **
@@ -971,28 +1017,51 @@ static void fts5StructureExtendLevel(
 ** is called, it is a no-op.
 */
 static Fts5Structure *fts5StructureRead(Fts5Index *p){
-  Fts5Config *pConfig = p->pConfig;
-  Fts5Structure *pRet = 0;        /* Object to return */
-  int iCookie;                    /* Configuration cookie */
-  Fts5Data *pData;
+  Fts5Structure *pRet;            /* Object to return */
 
-  pData = fts5DataRead(p, FTS5_STRUCTURE_ROWID);
-  if( p->rc ) return 0;
-  /* TODO: Do we need this if the leaf-index is appended? Probably... */
-  memset(&pData->p[pData->nn], 0, FTS5_DATA_PADDING);
-  p->rc = fts5StructureDecode(pData->p, pData->nn, &iCookie, &pRet);
-  if( p->rc==SQLITE_OK && pConfig->iCookie!=iCookie ){
-    p->rc = sqlite3Fts5ConfigLoad(pConfig, iCookie);
+  if( p->pStruct ){
+    pRet = p->pStruct;
+#ifdef SQLITE_DEBUG
+    {
+      Fts5Structure *pTest = fts5StructureReadUncached(p);
+      if( pTest ){
+        int i, j;
+        assert_nc( pRet->nSegment==pTest->nSegment );
+        assert_nc( pRet->nLevel==pTest->nLevel );
+        for(i=0; i<pTest->nLevel; i++){
+          assert_nc( pRet->aLevel[i].nMerge==pTest->aLevel[i].nMerge );
+          assert_nc( pRet->aLevel[i].nSeg==pTest->aLevel[i].nSeg );
+          for(j=0; j<pTest->aLevel[i].nSeg; j++){
+            Fts5StructureSegment *p1 = &pTest->aLevel[i].aSeg[j];
+            Fts5StructureSegment *p2 = &pRet->aLevel[i].aSeg[j];
+            assert_nc( p1->iSegid==p2->iSegid );
+            assert_nc( p1->pgnoFirst==p2->pgnoFirst );
+            assert_nc( p1->pgnoLast==p2->pgnoLast );
+          }
+        }
+        fts5StructureRelease(pTest);
+      }
+    }
+#endif
+  }else{
+    pRet = fts5StructureReadUncached(p);
   }
 
-  fts5DataRelease(pData);
-  if( p->rc!=SQLITE_OK ){
-    fts5StructureRelease(pRet);
-    pRet = 0;
+  if( pRet ){
+    fts5StructureRef(pRet);
+    p->pStruct = pRet;
+    p->iStructVersion = fts5IndexDataVersion(p);
   }
   return pRet;
 }
 
+static void fts5StructureInvalidate(Fts5Index *p){
+  if( p->pStruct ){
+    fts5StructureRelease(p->pStruct);
+    p->pStruct = 0;
+  }
+}
+
 /*
 ** Return the total number of segments in index structure pStruct. This
 ** function is only ever used as part of assert() conditions.
@@ -4328,6 +4397,7 @@ static void fts5FlushOneHash(Fts5Index *p){
   ** for the new level-0 segment.  */
   pStruct = fts5StructureRead(p);
   iSegid = fts5AllocateSegid(p, pStruct);
+  fts5StructureInvalidate(p);
 
   if( iSegid ){
     const int pgsz = p->pConfig->pgsz;
@@ -4547,6 +4617,7 @@ int sqlite3Fts5IndexOptimize(Fts5Index *p){
   assert( p->rc==SQLITE_OK );
   fts5IndexFlush(p);
   pStruct = fts5StructureRead(p);
+  fts5StructureInvalidate(p);
 
   if( pStruct ){
     pNew = fts5IndexOptimizeStruct(p, pStruct);
@@ -4577,6 +4648,7 @@ int sqlite3Fts5IndexMerge(Fts5Index *p, int nMerge){
   Fts5Structure *pStruct = fts5StructureRead(p);
   if( pStruct ){
     int nMin = p->pConfig->nUsermerge;
+    fts5StructureInvalidate(p);
     if( nMerge<0 ){
       Fts5Structure *pNew = fts5IndexOptimizeStruct(p, pStruct);
       fts5StructureRelease(pStruct);
@@ -5004,6 +5076,7 @@ int sqlite3Fts5IndexSync(Fts5Index *p, int bCommit){
 int sqlite3Fts5IndexRollback(Fts5Index *p){
   fts5CloseReader(p);
   fts5IndexDiscardData(p);
+  fts5StructureInvalidate(p);
   /* assert( p->rc==SQLITE_OK ); */
   return SQLITE_OK;
 }
@@ -5015,6 +5088,7 @@ int sqlite3Fts5IndexRollback(Fts5Index *p){
 */
 int sqlite3Fts5IndexReinit(Fts5Index *p){
   Fts5Structure s;
+  fts5StructureInvalidate(p);
   memset(&s, 0, sizeof(Fts5Structure));
   fts5DataWrite(p, FTS5_AVERAGES_ROWID, (const u8*)"", 0);
   fts5StructureWrite(p, &s);
@@ -5073,11 +5147,13 @@ int sqlite3Fts5IndexClose(Fts5Index *p){
   int rc = SQLITE_OK;
   if( p ){
     assert( p->pReader==0 );
+    fts5StructureInvalidate(p);
     sqlite3_finalize(p->pWriter);
     sqlite3_finalize(p->pDeleter);
     sqlite3_finalize(p->pIdxWriter);
     sqlite3_finalize(p->pIdxDeleter);
     sqlite3_finalize(p->pIdxSelect);
+    sqlite3_finalize(p->pDataVersion);
     sqlite3Fts5HashFree(p->pHash);
     sqlite3_free(p->zDataTbl);
     sqlite3_free(p);
@@ -6333,3 +6409,12 @@ int sqlite3Fts5IndexInit(sqlite3 *db){
   }
   return rc;
 }
+
+
+int sqlite3Fts5IndexReset(Fts5Index *p){
+  assert( p->pStruct==0 || p->iStructVersion!=0 );
+  if( fts5IndexDataVersion(p)!=p->iStructVersion ){
+    fts5StructureInvalidate(p);
+  }
+  return fts5IndexReturn(p);
+}
diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c
index dcd131c74a..4feb3e1a2f 100644
--- a/ext/fts5/fts5_main.c
+++ b/ext/fts5/fts5_main.c
@@ -597,27 +597,38 @@ static int fts5BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
   return SQLITE_OK;
 }
 
+static int fts5NewTransaction(Fts5Table *pTab){
+  Fts5Cursor *pCsr;
+  for(pCsr=pTab->pGlobal->pCsr; pCsr; pCsr=pCsr->pNext){
+    if( pCsr->base.pVtab==(sqlite3_vtab*)pTab ) return SQLITE_OK;
+  }
+  return sqlite3Fts5StorageReset(pTab->pStorage);
+}
+
 /*
 ** Implementation of xOpen method.
 */
 static int fts5OpenMethod(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCsr){
   Fts5Table *pTab = (Fts5Table*)pVTab;
   Fts5Config *pConfig = pTab->pConfig;
-  Fts5Cursor *pCsr;               /* New cursor object */
+  Fts5Cursor *pCsr = 0;           /* New cursor object */
   int nByte;                      /* Bytes of space to allocate */
-  int rc = SQLITE_OK;             /* Return code */
+  int rc;                         /* Return code */
 
-  nByte = sizeof(Fts5Cursor) + pConfig->nCol * sizeof(int);
-  pCsr = (Fts5Cursor*)sqlite3_malloc(nByte);
-  if( pCsr ){
-    Fts5Global *pGlobal = pTab->pGlobal;
-    memset(pCsr, 0, nByte);
-    pCsr->aColumnSize = (int*)&pCsr[1];
-    pCsr->pNext = pGlobal->pCsr;
-    pGlobal->pCsr = pCsr;
-    pCsr->iCsrId = ++pGlobal->iNextId;
-  }else{
-    rc = SQLITE_NOMEM;
+  rc = fts5NewTransaction(pTab);
+  if( rc==SQLITE_OK ){
+    nByte = sizeof(Fts5Cursor) + pConfig->nCol * sizeof(int);
+    pCsr = (Fts5Cursor*)sqlite3_malloc(nByte);
+    if( pCsr ){
+      Fts5Global *pGlobal = pTab->pGlobal;
+      memset(pCsr, 0, nByte);
+      pCsr->aColumnSize = (int*)&pCsr[1];
+      pCsr->pNext = pGlobal->pCsr;
+      pGlobal->pCsr = pCsr;
+      pCsr->iCsrId = ++pGlobal->iNextId;
+    }else{
+      rc = SQLITE_NOMEM;
+    }
   }
   *ppCsr = (sqlite3_vtab_cursor*)pCsr;
   return rc;
@@ -1578,8 +1589,8 @@ static int fts5SyncMethod(sqlite3_vtab *pVtab){
 ** Implementation of xBegin() method. 
 */
 static int fts5BeginMethod(sqlite3_vtab *pVtab){
-  UNUSED_PARAM(pVtab);  /* Call below is a no-op for NDEBUG builds */
   fts5CheckTransactionState((Fts5Table*)pVtab, FTS5_BEGIN, 0);
+  fts5NewTransaction((Fts5Table*)pVtab);
   return SQLITE_OK;
 }
 
diff --git a/ext/fts5/fts5_storage.c b/ext/fts5/fts5_storage.c
index e4f5dd8f51..bd1c1f88e9 100644
--- a/ext/fts5/fts5_storage.c
+++ b/ext/fts5/fts5_storage.c
@@ -639,6 +639,10 @@ int sqlite3Fts5StorageMerge(Fts5Storage *p, int nMerge){
   return sqlite3Fts5IndexMerge(p->pIndex, nMerge);
 }
 
+int sqlite3Fts5StorageReset(Fts5Storage *p){
+  return sqlite3Fts5IndexReset(p->pIndex);
+}
+
 /*
 ** Allocate a new rowid. This is used for "external content" tables when
 ** a NULL value is inserted into the rowid column. The new rowid is allocated
diff --git a/ext/fts5/test/fts5corrupt3.test b/ext/fts5/test/fts5corrupt3.test
index 7a8cb5c465..9653bcaac2 100644
--- a/ext/fts5/test/fts5corrupt3.test
+++ b/ext/fts5/test/fts5corrupt3.test
@@ -179,6 +179,10 @@ for {set i 1} {1} {incr i} {
   if {$end<=$i} break
   lset var end [expr $end - $i]
   set struct [binary format c* $var]
+
+  db close
+  sqlite3 db test.db
+
   db eval {
     BEGIN;
     UPDATE t1_data SET block = $struct WHERE id=10;
diff --git a/ext/fts5/test/fts5dlidx.test b/ext/fts5/test/fts5dlidx.test
index 232b5021f1..655beb984b 100644
--- a/ext/fts5/test/fts5dlidx.test
+++ b/ext/fts5/test/fts5dlidx.test
@@ -178,7 +178,7 @@ do_execsql_test 3.2 {
   ORDER BY rowid DESC;
 } {16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1}
 
-do_execsql_test 3.2 {
+do_execsql_test 3.3 {
   INSERT INTO abc(abc) VALUES('integrity-check');
   INSERT INTO abc(abc) VALUES('optimize');
   INSERT INTO abc(abc) VALUES('integrity-check');
@@ -187,7 +187,7 @@ do_execsql_test 3.2 {
 set v [lindex $vocab 0]
 set i 0
 foreach v $vocab {
-  do_execsql_test 3.3.[incr i] {
+  do_execsql_test 3.4.[incr i] {
     SELECT rowid FROM abc WHERE abc MATCH $v
   } {1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16}
 }
diff --git a/manifest b/manifest
index bf413d574c..7c682009be 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_OMIT_CODEC_FROM_TCL\scompile-time\soption.
-D 2016-03-16T01:03:10.251
+C Have\sfts5\scache\sthe\sdecoded\sstructure\sof\sfts5\sindexes\sin\smemory.\sUse\s"PRAGMA\sdata_version"\sto\sdetect\sstale\scaches.
+D 2016-03-16T19:48:10.873
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -98,15 +98,15 @@ F ext/fts3/unicode/mkunicode.tcl 2debed3f582d77b3fdd0b8830880250021571fd8
 F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
 F ext/fts5/extract_api_docs.tcl a36e54ec777172ddd3f9a88daf593b00848368e0
 F ext/fts5/fts5.h ff9c2782e8ed890b0de2f697a8d63971939e70c7
-F ext/fts5/fts5Int.h 4060504b7979601d99e1385c2b5713036854979a
+F ext/fts5/fts5Int.h 4e507abebae0d7d3ac9b8daebf049d5153d00961
 F ext/fts5/fts5_aux.c daa57fb45216491814520bbb587e97bf81ced458
 F ext/fts5/fts5_buffer.c 4c1502d4c956cd092c89ce4480867f9d8bf325cd
 F ext/fts5/fts5_config.c 5af9c360e99669d29f06492c370892394aba0857
 F ext/fts5/fts5_expr.c be309fb227003c931107bfcc12d5be4f2fd2bb8c
 F ext/fts5/fts5_hash.c f3a7217c86eb8f272871be5f6aa1b6798960a337
-F ext/fts5/fts5_index.c d4f0c12e4f04bbc3a06b6da052039f2ce3e45438
-F ext/fts5/fts5_main.c b8501e1a6a11591c53b18ce7aea7e5386cfb0421
-F ext/fts5/fts5_storage.c f8343db90d8c95a4d4b52f6676e354b4649ffd6e
+F ext/fts5/fts5_index.c 317040cb17cdad05e973376b39239b29c75f90b5
+F ext/fts5/fts5_main.c b4a0fc5bf17f2f1f056ee76cdd7d2af08b360f55
+F ext/fts5/fts5_storage.c a3361410422e69639ca2bcd5a56a0933dadf84d2
 F ext/fts5/fts5_tcl.c f8731e0508299bd43f1a2eff7dbeaac870768966
 F ext/fts5/fts5_test_mi.c 783b86697ebf773c18fc109992426c0173a055bc
 F ext/fts5/fts5_test_tok.c db08af63673c3a7d39f053b36fd6e065017706be
@@ -141,9 +141,9 @@ F ext/fts5/test/fts5conflict.test 26f4e46c4d31e16221794832a990dc4e30e18de5
 F ext/fts5/test/fts5content.test 9a952c95518a14182dc3b59e3c8fa71cda82a4e1
 F ext/fts5/test/fts5corrupt.test c2ad090192708150d50d961278df10ae7a4b8b62
 F ext/fts5/test/fts5corrupt2.test 26c0a39dd9ff73207e6229f83b50b21d37c7658c
-F ext/fts5/test/fts5corrupt3.test b9558d5b0ca44a8b6247fbb5d4a47592a8976892
+F ext/fts5/test/fts5corrupt3.test f77f65e386231daf62902466b40ff998b2c8ce4f
 F ext/fts5/test/fts5detail.test ef5c690535a797413acaf5ad9b8ab5d49972df69
-F ext/fts5/test/fts5dlidx.test 13871a14641017ae42f6f1055a8067bafd44cb3d
+F ext/fts5/test/fts5dlidx.test 007e9390c94638760797dbec2990c97c3fa08dfe
 F ext/fts5/test/fts5doclist.test 8edb5b57e5f144030ed74ec00ef6fa4294fed79b
 F ext/fts5/test/fts5ea.test b01e3a18cdfabbff8104a96a5242a06a68a998a0
 F ext/fts5/test/fts5eb.test c516ae0c934be6fd29ec95ea8b5f11f461311535
@@ -1456,7 +1456,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e0b116edd64a55c971c368685aa343cb6beed0f1
-R 1b0c52bbc749be5b9a732d29d3d099e5
-U drh
-Z 5dddb7cbfc6ef15baab9797e73067d60
+P 45f7f0c80bd91a0c7ff859c27fd9e82e551bd83e
+R 7875ababc9def91b1b2c4626dd7ef0ad
+T *branch * fts5-data-version
+T *sym-fts5-data-version *
+T -sym-trunk *
+U dan
+Z 015dc4987d82758ea8c0d324359dc366
diff --git a/manifest.uuid b/manifest.uuid
index 3aa4fcd861..3d6ceeb2ed 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45f7f0c80bd91a0c7ff859c27fd9e82e551bd83e
\ No newline at end of file
+33ef2210ef19e55c8d460bfe9d3dc146034c8acc
\ No newline at end of file

From c9460ab989d1a01aac7535811df01094ce0c8e9b Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Thu, 17 Mar 2016 12:39:56 +0000
Subject: [PATCH 2/4] Fix some OOM-handling issues in the fts5 changes on this
 branch.

FossilOrigin-Name: 020a0bda59fe93b9361ceeed0d5a8ba4177380c8
---
 ext/fts5/fts5_index.c | 83 ++++++++++++++++++++++---------------------
 manifest              | 12 +++----
 manifest.uuid         |  2 +-
 3 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 78003396d6..3fb1458526 100644
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -990,17 +990,19 @@ static Fts5Structure *fts5StructureReadUncached(Fts5Index *p){
 static i64 fts5IndexDataVersion(Fts5Index *p){
   i64 iVersion = 0;
 
-  if( p->pDataVersion==0 ){
-    p->rc = fts5IndexPrepareStmt(p, &p->pDataVersion, 
-        sqlite3_mprintf("PRAGMA %Q.data_version", p->pConfig->zDb)
-    );
-    if( p->rc ) return 0;
-  }
+  if( p->rc==SQLITE_OK ){
+    if( p->pDataVersion==0 ){
+      p->rc = fts5IndexPrepareStmt(p, &p->pDataVersion, 
+          sqlite3_mprintf("PRAGMA %Q.data_version", p->pConfig->zDb)
+          );
+      if( p->rc ) return 0;
+    }
 
-  if( SQLITE_ROW==sqlite3_step(p->pDataVersion) ){
-    iVersion = sqlite3_column_int64(p->pDataVersion, 0);
+    if( SQLITE_ROW==sqlite3_step(p->pDataVersion) ){
+      iVersion = sqlite3_column_int64(p->pDataVersion, 0);
+    }
+    p->rc = sqlite3_reset(p->pDataVersion);
   }
-  p->rc = sqlite3_reset(p->pDataVersion);
 
   return iVersion;
 }
@@ -1019,39 +1021,40 @@ static i64 fts5IndexDataVersion(Fts5Index *p){
 static Fts5Structure *fts5StructureRead(Fts5Index *p){
   Fts5Structure *pRet;            /* Object to return */
 
-  if( p->pStruct ){
-    pRet = p->pStruct;
-#ifdef SQLITE_DEBUG
-    {
-      Fts5Structure *pTest = fts5StructureReadUncached(p);
-      if( pTest ){
-        int i, j;
-        assert_nc( pRet->nSegment==pTest->nSegment );
-        assert_nc( pRet->nLevel==pTest->nLevel );
-        for(i=0; i<pTest->nLevel; i++){
-          assert_nc( pRet->aLevel[i].nMerge==pTest->aLevel[i].nMerge );
-          assert_nc( pRet->aLevel[i].nSeg==pTest->aLevel[i].nSeg );
-          for(j=0; j<pTest->aLevel[i].nSeg; j++){
-            Fts5StructureSegment *p1 = &pTest->aLevel[i].aSeg[j];
-            Fts5StructureSegment *p2 = &pRet->aLevel[i].aSeg[j];
-            assert_nc( p1->iSegid==p2->iSegid );
-            assert_nc( p1->pgnoFirst==p2->pgnoFirst );
-            assert_nc( p1->pgnoLast==p2->pgnoLast );
-          }
-        }
-        fts5StructureRelease(pTest);
-      }
-    }
-#endif
-  }else{
-    pRet = fts5StructureReadUncached(p);
-  }
-
-  if( pRet ){
-    fts5StructureRef(pRet);
-    p->pStruct = pRet;
+  if( p->pStruct==0 ){
     p->iStructVersion = fts5IndexDataVersion(p);
+    if( p->rc==SQLITE_OK ){
+      p->pStruct = pRet = fts5StructureReadUncached(p);
+    }
+    if( p->rc!=SQLITE_OK ) return 0;
+    assert( p->iStructVersion!=0 );
+    assert( p->pStruct!=0 );
   }
+#ifdef SQLITE_DEBUG
+  else{
+    Fts5Structure *pTest = fts5StructureReadUncached(p);
+    if( pTest ){
+      int i, j;
+      assert_nc( p->pStruct->nSegment==pTest->nSegment );
+      assert_nc( p->pStruct->nLevel==pTest->nLevel );
+      for(i=0; i<pTest->nLevel; i++){
+        assert_nc( p->pStruct->aLevel[i].nMerge==pTest->aLevel[i].nMerge );
+        assert_nc( p->pStruct->aLevel[i].nSeg==pTest->aLevel[i].nSeg );
+        for(j=0; j<pTest->aLevel[i].nSeg; j++){
+          Fts5StructureSegment *p1 = &pTest->aLevel[i].aSeg[j];
+          Fts5StructureSegment *p2 = &p->pStruct->aLevel[i].aSeg[j];
+          assert_nc( p1->iSegid==p2->iSegid );
+          assert_nc( p1->pgnoFirst==p2->pgnoFirst );
+          assert_nc( p1->pgnoLast==p2->pgnoLast );
+        }
+      }
+      fts5StructureRelease(pTest);
+    }
+  }
+#endif
+
+  pRet = p->pStruct;
+  fts5StructureRef(pRet);
   return pRet;
 }
 
diff --git a/manifest b/manifest
index 4ea9b53d9e..8f5bdc1491 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\schanges\son\sthe\sreusable-pragma\sbranch\sinto\sthis\sone.
-D 2016-03-16T20:53:33.830
+C Fix\ssome\sOOM-handling\sissues\sin\sthe\sfts5\schanges\son\sthis\sbranch.
+D 2016-03-17T12:39:56.371
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -104,7 +104,7 @@ F ext/fts5/fts5_buffer.c 4c1502d4c956cd092c89ce4480867f9d8bf325cd
 F ext/fts5/fts5_config.c 5af9c360e99669d29f06492c370892394aba0857
 F ext/fts5/fts5_expr.c 35e9d92c89e7c7ea0759b73d24da1ecb7630a24b
 F ext/fts5/fts5_hash.c f3a7217c86eb8f272871be5f6aa1b6798960a337
-F ext/fts5/fts5_index.c 317040cb17cdad05e973376b39239b29c75f90b5
+F ext/fts5/fts5_index.c afac2ffe3198776626b99366e18af1f32ea9eb85
 F ext/fts5/fts5_main.c b4a0fc5bf17f2f1f056ee76cdd7d2af08b360f55
 F ext/fts5/fts5_storage.c a3361410422e69639ca2bcd5a56a0933dadf84d2
 F ext/fts5/fts5_tcl.c f8731e0508299bd43f1a2eff7dbeaac870768966
@@ -1456,7 +1456,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 33ef2210ef19e55c8d460bfe9d3dc146034c8acc db1ce7e13e656fcd2766f1b1f225cbfefe8f73ad
-R 9bcd2375f3bee3eec21a0e0d6e512aed
+P 6c4a17b963916d19c9433d7a251338042f32e9fa
+R bc1955b591517ca84e5bb3a7a87f0726
 U dan
-Z 9f0b8bb8494a2ee2e21e8a8509116058
+Z 380059b0b3811052efb55863df364c4f
diff --git a/manifest.uuid b/manifest.uuid
index 71f9d7efce..d6022948ee 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6c4a17b963916d19c9433d7a251338042f32e9fa
\ No newline at end of file
+020a0bda59fe93b9361ceeed0d5a8ba4177380c8
\ No newline at end of file

From cf9bce34ab757b637ebe36f04a7997dc5a1fc379 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Sat, 19 Mar 2016 14:47:28 +0000
Subject: [PATCH 3/4] Add test file fts5multiclient.test.

FossilOrigin-Name: 7832466f9177cca59455ba272802145297fcd53d
---
 ext/fts5/test/fts5multiclient.test | 48 ++++++++++++++++++++++++++++++
 manifest                           | 11 +++----
 manifest.uuid                      |  2 +-
 3 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 ext/fts5/test/fts5multiclient.test

diff --git a/ext/fts5/test/fts5multiclient.test b/ext/fts5/test/fts5multiclient.test
new file mode 100644
index 0000000000..a1e9aa0d30
--- /dev/null
+++ b/ext/fts5/test/fts5multiclient.test
@@ -0,0 +1,48 @@
+# 2016 March 17
+#
+# 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.
+#
+#*************************************************************************
+#
+
+source [file join [file dirname [info script]] fts5_common.tcl]
+source $testdir/lock_common.tcl
+
+set testprefix fts5multiclient
+return_if_no_fts5
+
+foreach_detail_mode $testprefix {
+
+do_multiclient_test tn {
+
+  do_test 1.$tn.1 {
+    sql1 { CREATE VIRTUAL TABLE t1 USING fts5(x, detail=%DETAIL%) }
+    sql1 { INSERT INTO t1 VALUES('a b c') }
+    sql2 { SELECT rowid FROM t1('b') }
+  } {1}
+
+  do_test 1.$tn.2 {
+    sql2 { INSERT INTO t1 VALUES('a b c') }
+    sql1 { SELECT rowid FROM t1('b') }
+  } {1 2}
+
+  do_test 1.$tn.3 {
+    sql2 { INSERT INTO t1 VALUES('a b c') }
+    sql1 { SELECT rowid FROM t1('b') }
+  } {1 2 3}
+
+  do_test 1.$tn.4 {
+    sql2 { INSERT INTO t1 VALUES('a b c') }
+    sql1 { INSERT INTO t1 VALUES('a b c') }
+    sql3 { INSERT INTO t1(t1) VALUES('integrity-check') }
+  } {}
+
+};# do_multiclient_test
+};# foreach_detail_mode
+finish_test
+
diff --git a/manifest b/manifest
index 8f5bdc1491..346832e33f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\sOOM-handling\sissues\sin\sthe\sfts5\schanges\son\sthis\sbranch.
-D 2016-03-17T12:39:56.371
+C Add\stest\sfile\sfts5multiclient.test.
+D 2016-03-19T14:47:28.441
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -165,6 +165,7 @@ F ext/fts5/test/fts5integrity.test f5e4f8d284385875068ad0f3e894ce43e9de835d
 F ext/fts5/test/fts5matchinfo.test f7dde99697bcb310ea8faa8eb2714d9f4dfc0e1b
 F ext/fts5/test/fts5merge.test 9f65f090d214ff865c56bef4f864aaa1182af6e3
 F ext/fts5/test/fts5merge2.test a6da3c16d694235938d1939f503cfa53f0943d75
+F ext/fts5/test/fts5multiclient.test 5bd54a6bc8ff818be233a50a8dec93da99098f2a
 F ext/fts5/test/fts5near.test b214cddb1c1f1bddf45c75af768f20145f7e71cc
 F ext/fts5/test/fts5onepass.test 7ed9608e258132cb8d55e7c479b08676ad68810c
 F ext/fts5/test/fts5optimize.test 9d3ac53bb9cae58cb070d795db86bcb2f9fec105
@@ -1456,7 +1457,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6c4a17b963916d19c9433d7a251338042f32e9fa
-R bc1955b591517ca84e5bb3a7a87f0726
+P 020a0bda59fe93b9361ceeed0d5a8ba4177380c8
+R f14c9b8edfca8f7bf113e7bd0b21996b
 U dan
-Z 380059b0b3811052efb55863df364c4f
+Z d493def8e880a32e2aca451bc5e776cf
diff --git a/manifest.uuid b/manifest.uuid
index d6022948ee..91ed807a0b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-020a0bda59fe93b9361ceeed0d5a8ba4177380c8
\ No newline at end of file
+7832466f9177cca59455ba272802145297fcd53d
\ No newline at end of file

From 3c6707f72b6efeaa7b3933fae427010a444914cb Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Mon, 21 Mar 2016 15:18:13 +0000
Subject: [PATCH 4/4] Rearrange code so that tests pass whether SQLITE_DEBUG is
 defined or not.

FossilOrigin-Name: 89296a46c3b891ee0b637ff6f89d828d6e46e7b5
---
 ext/fts5/fts5_index.c | 15 +++++++--------
 manifest              | 12 ++++++------
 manifest.uuid         |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 3fb1458526..eb1d3c4b61 100644
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -1019,17 +1019,14 @@ static i64 fts5IndexDataVersion(Fts5Index *p){
 ** is called, it is a no-op.
 */
 static Fts5Structure *fts5StructureRead(Fts5Index *p){
-  Fts5Structure *pRet;            /* Object to return */
 
   if( p->pStruct==0 ){
     p->iStructVersion = fts5IndexDataVersion(p);
     if( p->rc==SQLITE_OK ){
-      p->pStruct = pRet = fts5StructureReadUncached(p);
+      p->pStruct = fts5StructureReadUncached(p);
     }
-    if( p->rc!=SQLITE_OK ) return 0;
-    assert( p->iStructVersion!=0 );
-    assert( p->pStruct!=0 );
   }
+
 #ifdef SQLITE_DEBUG
   else{
     Fts5Structure *pTest = fts5StructureReadUncached(p);
@@ -1053,9 +1050,11 @@ static Fts5Structure *fts5StructureRead(Fts5Index *p){
   }
 #endif
 
-  pRet = p->pStruct;
-  fts5StructureRef(pRet);
-  return pRet;
+  if( p->rc!=SQLITE_OK ) return 0;
+  assert( p->iStructVersion!=0 );
+  assert( p->pStruct!=0 );
+  fts5StructureRef(p->pStruct);
+  return p->pStruct;
 }
 
 static void fts5StructureInvalidate(Fts5Index *p){
diff --git a/manifest b/manifest
index 346832e33f..65691a0210 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\sfile\sfts5multiclient.test.
-D 2016-03-19T14:47:28.441
+C Rearrange\scode\sso\sthat\stests\spass\swhether\sSQLITE_DEBUG\sis\sdefined\sor\snot.
+D 2016-03-21T15:18:13.028
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -104,7 +104,7 @@ F ext/fts5/fts5_buffer.c 4c1502d4c956cd092c89ce4480867f9d8bf325cd
 F ext/fts5/fts5_config.c 5af9c360e99669d29f06492c370892394aba0857
 F ext/fts5/fts5_expr.c 35e9d92c89e7c7ea0759b73d24da1ecb7630a24b
 F ext/fts5/fts5_hash.c f3a7217c86eb8f272871be5f6aa1b6798960a337
-F ext/fts5/fts5_index.c afac2ffe3198776626b99366e18af1f32ea9eb85
+F ext/fts5/fts5_index.c 39939320ee5185cbfd0a8c8c7e1c878ebde7c43d
 F ext/fts5/fts5_main.c b4a0fc5bf17f2f1f056ee76cdd7d2af08b360f55
 F ext/fts5/fts5_storage.c a3361410422e69639ca2bcd5a56a0933dadf84d2
 F ext/fts5/fts5_tcl.c f8731e0508299bd43f1a2eff7dbeaac870768966
@@ -1457,7 +1457,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 020a0bda59fe93b9361ceeed0d5a8ba4177380c8
-R f14c9b8edfca8f7bf113e7bd0b21996b
+P 7832466f9177cca59455ba272802145297fcd53d
+R e2f3ffc019af1c2320d4d618c0233909
 U dan
-Z d493def8e880a32e2aca451bc5e776cf
+Z 04b6e502bb8ccbe0b89bf7d08daf8ee8
diff --git a/manifest.uuid b/manifest.uuid
index 91ed807a0b..62bde4070e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7832466f9177cca59455ba272802145297fcd53d
\ No newline at end of file
+89296a46c3b891ee0b637ff6f89d828d6e46e7b5
\ No newline at end of file