Avoid making redundant copies of position-lists within the fts5 code.

FossilOrigin-Name: 5165de548b84825cb000d33e5d3de12b0ef112c0

diff --git a/ext/fts3/unicode/mkunicode.tcl b/ext/fts3/unicode/mkunicode.tcl
index 32807a5cc57b10266f4816c19e95502007e88b9c..6eea9bbc64ff9b092643da34ce08ed8c44ecfb5f 100644 (file)
--- a/ext/fts3/unicode/mkunicode.tcl
+++ b/ext/fts3/unicode/mkunicode.tcl
@@ -487,7 +487,6 @@ proc print_fold {zFunc} {
   puts [subst -nocommands {
   int ret = c;
 
-  assert( c>=0 );
   assert( sizeof(unsigned short)==2 && sizeof(unsigned char)==1 );
 
   if( c<128 ){

diff --git a/ext/fts5/fts5Int.h b/ext/fts5/fts5Int.h
index f914c983b169ff3145fd6b5b5baf9785d883ddf7..7221a979ddfe138f59b5dd6cd4e0fd83dff04b4b 100644 (file)
--- a/ext/fts5/fts5Int.h
+++ b/ext/fts5/fts5Int.h
@@ -285,6 +285,7 @@ int sqlite3Fts5IterNext(Fts5IndexIter*);
 int sqlite3Fts5IterNextFrom(Fts5IndexIter*, i64 iMatch);
 i64 sqlite3Fts5IterRowid(Fts5IndexIter*);
 int sqlite3Fts5IterPoslist(Fts5IndexIter*, const u8 **pp, int *pn);
+int sqlite3Fts5IterPoslistBuffer(Fts5IndexIter *pIter, Fts5Buffer *pBuf);
 
 /*
 ** Close an iterator opened by sqlite3Fts5IndexQuery().

diff --git a/ext/fts5/fts5_expr.c b/ext/fts5/fts5_expr.c
index 3b8601bcbd08e5a0c85139ea0bc5909e3293ac9e..1d1e359b63585e530277028bd802ff55a25d7f55 100644 (file)
--- a/ext/fts5/fts5_expr.c
+++ b/ext/fts5/fts5_expr.c
@@ -672,49 +672,67 @@ static int fts5ExprNearNextMatch(
   Fts5Expr *pExpr,                /* Expression that pNear is a part of */
   Fts5ExprNode *pNode             /* The "NEAR" node (FTS5_STRING) */
 ){
-  int rc = SQLITE_OK;
   Fts5ExprNearset *pNear = pNode->pNear;
-  while( 1 ){
-    int i;
 
-    /* Advance the iterators until they all point to the same rowid */
-    rc = fts5ExprNearNextRowidMatch(pExpr, pNode);
-    if( rc!=SQLITE_OK || pNode->bEof ) break;
+  if( pNear->nPhrase==1 
+   && pNear->apPhrase[0]->nTerm==1 
+   && pNear->iCol<0
+  ){
+    /* If this "NEAR" object is actually a single phrase that consists of
+    ** a single term only, then the row that it currently points to must
+    ** be a match. All that is required is to populate pPhrase->poslist
+    ** with the position-list data for the only term.  */
+    Fts5ExprPhrase *pPhrase = pNear->apPhrase[0];
+    Fts5IndexIter *pIter = pPhrase->aTerm[0].pIter;
+    assert( pPhrase->poslist.nSpace==0 );
+    pNode->iRowid = sqlite3Fts5IterRowid(pIter);
+    return sqlite3Fts5IterPoslist(pIter, 
+        (const u8**)&pPhrase->poslist.p, &pPhrase->poslist.n
+    );
+  }else{
+    int rc = SQLITE_OK;
 
-    /* Check that each phrase in the nearset matches the current row.
-    ** Populate the pPhrase->poslist buffers at the same time. If any
-    ** phrase is not a match, break out of the loop early.  */
-    for(i=0; rc==SQLITE_OK && i<pNear->nPhrase; i++){
-      Fts5ExprPhrase *pPhrase = pNear->apPhrase[i];
-      if( pPhrase->nTerm>1 || pNear->iCol>=0 ){
-        int bMatch = 0;
-        rc = fts5ExprPhraseIsMatch(pExpr, pNear->iCol, pPhrase, &bMatch);
-        if( bMatch==0 ) break;
-      }else{
-        int n;
-        const u8 *a;
-        rc = sqlite3Fts5IterPoslist(pPhrase->aTerm[0].pIter, &a, &n);
-        fts5BufferSet(&rc, &pPhrase->poslist, n, a);
+    while( 1 ){
+      int i;
+
+      /* Advance the iterators until they all point to the same rowid */
+      rc = fts5ExprNearNextRowidMatch(pExpr, pNode);
+      if( rc!=SQLITE_OK || pNode->bEof ) break;
+
+      /* Check that each phrase in the nearset matches the current row.
+      ** Populate the pPhrase->poslist buffers at the same time. If any
+      ** phrase is not a match, break out of the loop early.  */
+      for(i=0; rc==SQLITE_OK && i<pNear->nPhrase; i++){
+        Fts5ExprPhrase *pPhrase = pNear->apPhrase[i];
+        if( pPhrase->nTerm>1 || pNear->iCol>=0 ){
+          int bMatch = 0;
+          rc = fts5ExprPhraseIsMatch(pExpr, pNear->iCol, pPhrase, &bMatch);
+          if( bMatch==0 ) break;
+        }else{
+          rc = sqlite3Fts5IterPoslistBuffer(
+              pPhrase->aTerm[0].pIter, &pPhrase->poslist
+          );
+        }
       }
-    }
 
-    if( rc==SQLITE_OK && i==pNear->nPhrase ){
-      int bMatch = 1;
-      if( pNear->nPhrase>1 ){
-        rc = fts5ExprNearIsMatch(pNear, &bMatch);
+      if( rc==SQLITE_OK && i==pNear->nPhrase ){
+        int bMatch = 1;
+        if( pNear->nPhrase>1 ){
+          rc = fts5ExprNearIsMatch(pNear, &bMatch);
+        }
+        if( rc!=SQLITE_OK || bMatch ) break;
       }
-      if( rc!=SQLITE_OK || bMatch ) break;
-    }
 
-    /* If control flows to here, then the current rowid is not a match.
-    ** Advance all term iterators in all phrases to the next rowid. */
-    if( rc==SQLITE_OK ){
-      rc = fts5ExprNearAdvanceFirst(pExpr, pNode, 0, 0);
+      /* If control flows to here, then the current rowid is not a match.
+      ** Advance all term iterators in all phrases to the next rowid. */
+      if( rc==SQLITE_OK ){
+        rc = fts5ExprNearAdvanceFirst(pExpr, pNode, 0, 0);
+      }
+      if( pNode->bEof || rc!=SQLITE_OK ) break;
     }
-    if( pNode->bEof || rc!=SQLITE_OK ) break;
-  }
 
-  return rc;
+    return rc;
+  }
 }
 
 /*
@@ -1050,7 +1068,7 @@ static void fts5ExprPhraseFree(Fts5ExprPhrase *pPhrase){
         sqlite3Fts5IterClose(pTerm->pIter);
       }
     }
-    fts5BufferFree(&pPhrase->poslist);
+    if( pPhrase->poslist.nSpace>0 ) fts5BufferFree(&pPhrase->poslist);
     sqlite3_free(pPhrase);
   }
 }

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index dd0f42fa3096291160055160c9b41c84ca21eff7..8759cf5901bf8a984761c9ac0cba92b14c1e5455 100644 (file)
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -4057,6 +4057,27 @@ int sqlite3Fts5IndexMerge(Fts5Index *p, int nMerge){
   return fts5IndexReturn(p);
 }
 
+/*
+** Iterator pIter currently points to a valid entry (not EOF). This
+** function appends the position list data for the current entry to
+** buffer pBuf. It does not make a copy of the position-list size
+** field.
+*/
+static void fts5SegiterPoslist(
+  Fts5Index *p,
+  Fts5SegIter *pSeg,
+  Fts5Buffer *pBuf
+){
+  if( p->rc==SQLITE_OK ){
+    Fts5ChunkIter iter;
+    fts5ChunkIterInit(p, pSeg, &iter);
+    while( fts5ChunkIterEof(p, &iter)==0 ){
+      fts5BufferAppendBlob(&p->rc, pBuf, iter.n, iter.p);
+      fts5ChunkIterNext(p, &iter);
+    }
+    fts5ChunkIterRelease(&iter);
+  }
+}
 
 /*
 ** Iterator pMulti currently points to a valid entry (not EOF). This
@@ -4069,27 +4090,18 @@ int sqlite3Fts5IndexMerge(Fts5Index *p, int nMerge){
 static void fts5MultiIterPoslist(
   Fts5Index *p,
   Fts5MultiSegIter *pMulti,
-  int bSz,
+  int bSz,                        /* Append a size field before the data */
   Fts5Buffer *pBuf
 ){
   if( p->rc==SQLITE_OK ){
-    Fts5ChunkIter iter;
     Fts5SegIter *pSeg = &pMulti->aSeg[ pMulti->aFirst[1].iFirst ];
     assert( fts5MultiIterEof(p, pMulti)==0 );
 
-    fts5ChunkIterInit(p, pSeg, &iter);
-
-    if( fts5ChunkIterEof(p, &iter)==0 ){
-      if( bSz ){
-        /* WRITEPOSLISTSIZE */
-        fts5BufferAppendVarint(&p->rc, pBuf, iter.nRem * 2);
-      }
-      while( fts5ChunkIterEof(p, &iter)==0 ){
-        fts5BufferAppendBlob(&p->rc, pBuf, iter.n, iter.p);
-        fts5ChunkIterNext(p, &iter);
-      }
+    if( bSz ){
+      /* WRITEPOSLISTSIZE */
+      fts5BufferAppendVarint(&p->rc, pBuf, pSeg->nPos*2);
     }
-    fts5ChunkIterRelease(&iter);
+    fts5SegiterPoslist(p, pSeg, pBuf);
   }
 }
 
@@ -4686,15 +4698,39 @@ int sqlite3Fts5IterPoslist(Fts5IndexIter *pIter, const u8 **pp, int *pn){
     *pn = pIter->pDoclist->nPoslist;
     *pp = pIter->pDoclist->aPoslist;
   }else{
-    Fts5Index *p = pIter->pIndex;
-    fts5BufferZero(&pIter->poslist);
-    fts5MultiIterPoslist(p, pIter->pMulti, 0, &pIter->poslist);
-    *pn = pIter->poslist.n;
-    *pp = pIter->poslist.p;
+    Fts5MultiSegIter *pMulti = pIter->pMulti;
+    Fts5SegIter *pSeg = &pMulti->aSeg[ pMulti->aFirst[1].iFirst ];
+    *pn = pSeg->nPos;
+    if( pSeg->iLeafOffset+pSeg->nPos <= pSeg->pLeaf->n ){
+      *pp = &pSeg->pLeaf->p[pSeg->iLeafOffset];
+    }else{
+      fts5BufferZero(&pIter->poslist);
+      fts5SegiterPoslist(pIter->pIndex, pSeg, &pIter->poslist);
+      *pp = pIter->poslist.p;
+    }
   }
   return fts5IndexReturn(pIter->pIndex);
 }
 
+/*
+** This function is similar to sqlite3Fts5IterPoslist(), except that it
+** copies the position list into the buffer supplied as the second 
+** argument.
+*/
+int sqlite3Fts5IterPoslistBuffer(Fts5IndexIter *pIter, Fts5Buffer *pBuf){
+  Fts5Index *p = pIter->pIndex;
+  Fts5DoclistIter *pDoclist = pIter->pDoclist;
+  assert( p->rc==SQLITE_OK );
+  if( pDoclist ){
+    fts5BufferSet(&p->rc, pBuf, pDoclist->nPoslist, pDoclist->aPoslist);
+  }else{
+    Fts5MultiSegIter *pMulti = pIter->pMulti;
+    fts5BufferZero(pBuf);
+    fts5MultiIterPoslist(p, pMulti, 0, pBuf);
+  }
+  return fts5IndexReturn(p);
+}
+
 /*
 ** Close an iterator opened by an earlier call to sqlite3Fts5IndexQuery().
 */

diff --git a/ext/fts5/fts5_unicode2.c b/ext/fts5/fts5_unicode2.c
index 11e211c0dec6a1794cfb5e150026df5001525453..493cabf4310c3f308b06684d7dcbfbc09ec6b444 100644 (file)
--- a/ext/fts5/fts5_unicode2.c
+++ b/ext/fts5/fts5_unicode2.c
@@ -321,7 +321,6 @@ int sqlite3Fts5UnicodeFold(int c, int bRemoveDiacritic){
 
   int ret = c;
 
-  assert( c>=0 );
   assert( sizeof(unsigned short)==2 && sizeof(unsigned char)==1 );
 
   if( c<128 ){

diff --git a/ext/fts5/tool/loadfts5.tcl b/ext/fts5/tool/loadfts5.tcl
index 3110954a8cc9902d786bdd1fb82eaa796eff748a..b61b567c6056685fb6686c6e2f3f87800a6674c5 100644 (file)
--- a/ext/fts5/tool/loadfts5.tcl
+++ b/ext/fts5/tool/loadfts5.tcl
@@ -109,7 +109,7 @@ db transaction {
   if {$O(prefix)!=""} { set pref ", prefix='$O(prefix)'" }
   catch {
     db eval "CREATE VIRTUAL TABLE t1 USING $O(vtab) (path, content$O(tok)$pref)"
-    # db eval "INSERT INTO t1(t1, rank) VALUES('pgsz', 4050);"
+    db eval "INSERT INTO t1(t1, rank) VALUES('pgsz', 4050);"
   }
   if {$O(automerge)>=0} {
     if {$O(vtab) == "fts5"} {

diff --git a/manifest b/manifest
index 4511ac2102e4693819303d8c441b59bd911f675f..3367ab84dee891afb6fd8005a4f2ae64a4223346 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\stest\scoverage\sof\sfts5_vocab.c.
-D 2015-05-22T07:44:44.808
+C Avoid\smaking\sredundant\scopies\sof\sposition-lists\swithin\sthe\sfts5\scode.
+D 2015-05-23T15:43:05.567
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2c28e557780395095c307a6e5cb539419027eb5e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -102,22 +102,22 @@ F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/fts3/tool/fts3view.c 8e53d0190a7b3443764bbd32ad47be2bd852026d
 F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c
 F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
-F ext/fts3/unicode/mkunicode.tcl b321eea0c1604954a098775ce0b7860bc449f686
+F ext/fts3/unicode/mkunicode.tcl ed0534dd51efce39878bce33944c6073d37a1e20
 F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
 F ext/fts5/extract_api_docs.tcl 55a6d648d516f35d9a1e580ac00de27154e1904a
 F ext/fts5/fts5.c 74d18b4dc7518c7cd85609f1541e83bc564619a2
 F ext/fts5/fts5.h 4266c6231094005b051dbfc8dd85d2bc57243d34
-F ext/fts5/fts5Int.h ba0fd64be01cf7bf47ad20fcd23b629fdde6c4dc
+F ext/fts5/fts5Int.h 271d2197ac32049adf3c947d671b6e682d8432b6
 F ext/fts5/fts5_aux.c d53f00f31ad615ca4f139dd8751f9041afa00971
 F ext/fts5/fts5_buffer.c 861599a0abe2383f0cd0352c57001140a26b0930
 F ext/fts5/fts5_config.c 11f969ed711a0a8b611d47431d74c372ad78c713
-F ext/fts5/fts5_expr.c f9a2ef4efbc4b133e0173e4bf7d7ebff33eddcf1
+F ext/fts5/fts5_expr.c 638df4962683986e8c6e627d06934ee87ed68da2
 F ext/fts5/fts5_hash.c 54dd25348a46ea62ea96322c572e08cd1fb37304
-F ext/fts5/fts5_index.c 2c4500c35072b049d1391bbb4e64e4c0e3d3dd43
+F ext/fts5/fts5_index.c 985bfa5ab258918b34b4c44866ce9f9a0f2a6b0e
 F ext/fts5/fts5_storage.c 5d2b51adb304643d8f825ba89283d628418b20c2
 F ext/fts5/fts5_tcl.c 7ea165878e4ae3598e89acd470a0ee1b5a00e33c
 F ext/fts5/fts5_tokenize.c 24649425adfea2c4877d8f69f2754b70374940ec
-F ext/fts5/fts5_unicode2.c c75022368f940a38afa1d2f0164c78b11ab2f383
+F ext/fts5/fts5_unicode2.c da3cf712f05cd8347c8c5bc00964cc0361c88da9
 F ext/fts5/fts5_vocab.c 3d06e4306660fcd92a596c1e57c8be58dcc779dd
 F ext/fts5/fts5parse.y 777da8e5819f75c217982c79c29d014c293acac9
 F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
@@ -173,7 +173,7 @@ F ext/fts5/test/fts5unicode3.test 273f9086ad33935566bbc0d0c94d0d9687ef686b
 F ext/fts5/test/fts5unindexed.test f388605341a476b6ab622b4c267cd168f59a5944
 F ext/fts5/test/fts5version.test dc34a735af6625a1a7a4a916a38d122071343887
 F ext/fts5/test/fts5vocab.test 389e5fe4928eae5fddcf26bcc5a6890b0791aa75
-F ext/fts5/tool/loadfts5.tcl add4d349ae5463c5f60b26e821c24e60ed8054d3
+F ext/fts5/tool/loadfts5.tcl 7ef3e62131f0434a78e4f5c5b056b09d221710a8
 F ext/fts5/tool/showfts5.tcl 921f33b30c3189deefd2b2cc81f951638544aaf1
 F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
 F ext/icu/icu.c d415ccf984defeb9df2c0e1afcfaa2f6dc05eacb
@@ -1331,7 +1331,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P fea8a4db9d8c7b9a946017a0dc984cbca6ce240e
-R 0a9b7fd2943b1fd62b28165e907889dd
+P 065ab83a6ce36e16d3b95a61505aa3cff0bfea84
+R c8769c201431bb53a20a3f0848ead683
 U dan
-Z c38b4b46643fdff88e3ee48e8e4a1b8f
+Z a11fb9d59a1c2f9d5ef19052d7f0a43f

diff --git a/manifest.uuid b/manifest.uuid
index 54bfcc0d8cf8e88418d23766f3f4501650674327..9d1be15fc62a2a931cd20713d7df9fe339178ca3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-065ab83a6ce36e16d3b95a61505aa3cff0bfea84
\ No newline at end of file
+5165de548b84825cb000d33e5d3de12b0ef112c0
\ No newline at end of file