Optimize range constraints on the rowid column of fts3/4 tables even if there is...

FossilOrigin-Name: 85dc12625d300fe48f3c096f54ebcb8b6ef4e30a

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index a1ea533a896304028d9277f99a2a055a31260a95..a31d3f13fec145244154bbdec6121300df46a424 100644 (file)
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -3164,10 +3164,17 @@ static int fts3FilterMethod(
   ** row by docid.
   */
   if( eSearch==FTS3_FULLSCAN_SEARCH ){
-    zSql = sqlite3_mprintf(
-        "SELECT %s ORDER BY rowid %s",
-        p->zReadExprlist, (pCsr->bDesc ? "DESC" : "ASC")
-    );
+    if( pDocidGe || pDocidLe ){
+      zSql = sqlite3_mprintf(
+          "SELECT %s WHERE rowid BETWEEN %lld AND %lld ORDER BY rowid %s",
+          p->zReadExprlist, pCsr->iMinDocid, pCsr->iMaxDocid,
+          (pCsr->bDesc ? "DESC" : "ASC")
+      );
+    }else{
+      zSql = sqlite3_mprintf("SELECT %s ORDER BY rowid %s", 
+          p->zReadExprlist, (pCsr->bDesc ? "DESC" : "ASC")
+      );
+    }
     if( zSql ){
       rc = sqlite3_prepare_v2(p->db, zSql, -1, &pCsr->pStmt, 0);
       sqlite3_free(zSql);

diff --git a/manifest b/manifest
index 5e1d55e7c773c2cf3724c9ad65ffe37e19ab4bb0..2b2c56f7bceed468c8ff1cd32c85ddb8373767aa 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings.
-D 2015-01-27T21:24:33.191
+C Optimize\srange\sconstraints\son\sthe\srowid\scolumn\sof\sfts3/4\stables\seven\sif\sthere\sis\sno\sMATCH\sclause\sin\sthe\squery.
+D 2015-01-29T11:52:22.452
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -78,7 +78,7 @@ F ext/fts3/README.content fdc666a70d5257a64fee209f97cf89e0e6e32b51
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c 3b2f792afc04d01d387455932428c8f9ae861cc5
+F ext/fts3/fts3.c 56a78f7e65e9e59bd0e75a1e10ce406f62034ca8
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h 394858c12a17740f7a1f6bd372c4606d4425a8d1
 F ext/fts3/fts3_aux.c 5c211e17a64885faeb16b9ba7772f9d5445c2365
@@ -590,7 +590,7 @@ F test/fts3matchinfo.test 58544fa4d254000fa4e7f494b0a832f7ba61d45e
 F test/fts3near.test 7e3354d46f155a822b59c0e957fd2a70c1d7e905
 F test/fts3prefix.test b36d4f00b128a51e7b386cc013a874246d9d7dc1
 F test/fts3prefix2.test e1f0a822ca661dced7f12ce392e14eaf65609dce
-F test/fts3query.test 4fefd43ff24993bc2c9b2778f2bec0cc7629e7ed
+F test/fts3query.test d81ffb0ab1d4e1a2a330b8eb1e160b60603f4745
 F test/fts3rnd.test 1320d8826a845e38a96e769562bf83d7a92a15d0
 F test/fts3shared.test 57e26a801f21027b7530da77db54286a6fe4997e
 F test/fts3snippet.test 03c2f3be7d3b7c8bb105ed237f204833392bd57f
@@ -1237,7 +1237,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 adc9283dd9bc3a6463f8c4fe23dd58a3712c349d
-R 57729c2b510493b06603a65c6ea41133
-U mistachkin
-Z 7155fc25674fe331bcb8023f01301b6b
+P e7d2ec048c88237c124fbe598f8f7e950d43d90f
+R e192a378398ddf2aeb616257a71bd844
+U dan
+Z 0e830c66fc49965a9a24bd9be18f84a6

diff --git a/manifest.uuid b/manifest.uuid
index fe72374448823b31c5c02fe76159b8e89ad178ad..9133dd07375e55ca9c30ff548d86f979a824975a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e7d2ec048c88237c124fbe598f8f7e950d43d90f
\ No newline at end of file
+85dc12625d300fe48f3c096f54ebcb8b6ef4e30a
\ No newline at end of file

diff --git a/test/fts3query.test b/test/fts3query.test
index 2d12351ae98053c1a16220dfa05d025ca9403da3..0b3c2ce1bd99188e788b687cfe27e7b182aeb5d0 100644 (file)
--- a/test/fts3query.test
+++ b/test/fts3query.test
@@ -208,5 +208,77 @@ do_select_tests 6.2 {
   {{ZZZthe hand XXXgesturesYYY (called beatsZZZ}}
 }
 
+# Test some range queries on the rowid field.
+# 
+do_execsql_test 7.1 {
+  CREATE VIRTUAL TABLE ft4 USING fts4(x);
+  CREATE TABLE t4(x);
+}
+
+set SMALLINT -9223372036854775808
+set LARGEINT  9223372036854775807
+do_test 7.2 {
+  db transaction {
+    foreach {iFirst nEntry} [subst {
+      0                      100
+      $SMALLINT              100
+      [expr $LARGEINT - 99]  100
+    }] {
+      for {set i 0} {$i < $nEntry} {incr i} {
+        set iRowid [expr $i + $iFirst]
+        execsql {
+          INSERT INTO ft4(rowid, x) VALUES($iRowid, 'x y z');
+          INSERT INTO  t4(rowid, x) VALUES($iRowid, 'x y z');
+        }
+      }
+    }
+  }
+} {}
+
+foreach {tn iFirst iLast} [subst {
+  1   5 10
+  2   $SMALLINT [expr $SMALLINT+5]
+  3   $SMALLINT [expr $SMALLINT+50]
+  4   [expr $LARGEINT-5] $LARGEINT
+  5   $LARGEINT $LARGEINT
+  6   $SMALLINT $LARGEINT
+  7   $SMALLINT $SMALLINT
+  8   $LARGEINT $SMALLINT
+}] {
+  set res [db eval { 
+    SELECT rowid FROM t4 WHERE rowid BETWEEN $iFirst AND $iLast 
+  } ]
+
+  do_execsql_test 7.2.$tn.1.[llength $res] {
+    SELECT rowid FROM ft4 WHERE rowid BETWEEN $iFirst AND $iLast
+  } $res
+  do_execsql_test 7.2.$tn.2.[llength $res] {
+    SELECT rowid FROM ft4 WHERE rowid BETWEEN $iFirst AND $iLast
+    ORDER BY rowid DESC
+  } [lsort -decr -integer $res]
+}
+
+foreach ii [db eval {SELECT rowid FROM t4}] {
+  set res1 [db eval {SELECT rowid FROM t4 WHERE rowid > $ii}]
+  set res2 [db eval {SELECT rowid FROM t4 WHERE rowid < $ii}]
+
+  do_execsql_test 7.3.$ii.1 {
+    SELECT rowid FROM ft4 WHERE rowid > $ii
+  } $res1
+
+  do_execsql_test 7.3.$ii.2 {
+    SELECT rowid FROM ft4 WHERE rowid < $ii
+  } $res2
+
+  do_execsql_test 7.3.$ii.3 {
+    SELECT rowid FROM ft4 WHERE rowid > $ii ORDER BY rowid DESC
+  } [lsort -integer -decr $res1]
+
+  do_execsql_test 7.3.$ii.4 {
+    SELECT rowid FROM ft4 WHERE rowid < $ii ORDER BY rowid DESC
+  } [lsort -integer -decr $res2]
+}
 
 finish_test
+
+