Change the fts3 test interface used to configure the advisory node size paraemeter.

FossilOrigin-Name: 87fc0ce151c89beb5a43b65c0b1706f340c0c173

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 9f418692cf5984f4c0536fe4722ec798cf87ad15..c87a3241ffab32d6b9e73a90ae2e06cf87897443 100644 (file)
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -577,14 +577,6 @@ static int fts3InitVtab(
   const char *zTokenizer = 0;               /* Name of tokenizer to use */
   sqlite3_tokenizer *pTokenizer = 0;        /* Tokenizer for this table */
 
-#ifdef SQLITE_TEST
-  const char *zTestParam = 0;
-  if( strncmp(argv[argc-1], "test:", 5)==0 ){
-    zTestParam = argv[argc-1];
-    argc--;
-  }
-#endif
-
   nDb = (int)strlen(argv[1]) + 1;
   nName = (int)strlen(argv[2]) + 1;
   for(i=3; i<argc; i++){
@@ -672,11 +664,6 @@ static int fts3InitVtab(
   rc = fts3DeclareVtab(p);
   if( rc!=SQLITE_OK ) goto fts3_init_out;
 
-#ifdef SQLITE_TEST
-  if( zTestParam ){
-    p->nNodeSize = atoi(&zTestParam[5]);
-  }
-#endif
   *ppVTab = &p->base;
 
 fts3_init_out:
@@ -2281,12 +2268,6 @@ int sqlite3Fts3Init(sqlite3 *db){
     }
   }
 
-#ifdef SQLITE_TEST
-  if( rc==SQLITE_OK ){
-    rc = sqlite3Fts3ExprInitTestInterface(db);
-  }
-#endif
-
   /* Create the virtual table wrapper around the hash-table and overload 
   ** the two scalar functions. If this is successful, register the
   ** module with sqlite.

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 78b55aa85f91b6697e3471b416b9592188c527e9..7ed589095ac26cac2eb719b4826b08fda3f2717e 100644 (file)
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -2217,6 +2217,11 @@ static int fts3SpecialInsert(Fts3Table *p, sqlite3_value *pVal){
       rc = SQLITE_OK;
       sqlite3Fts3PendingTermsClear(p);
     }
+#ifdef SQLITE_TEST
+  }else if( nVal>9 && 0==sqlite3_strnicmp(zVal, "nodesize=", 9) ){
+    p->nNodeSize = atoi(&zVal[9]);
+    rc = SQLITE_OK;
+#endif
   }else{
     rc = SQLITE_ERROR;
   }

diff --git a/main.mk b/main.mk
index bcad3cc094f2c44ccb3e05199339c5ebce6cd9f8..2e15cc421d049494b4693bc8514f8897b9e5158a 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -262,7 +262,7 @@ TESTSRC2 = \
   $(TOP)/src/utf.c $(TOP)/src/util.c $(TOP)/src/vdbeapi.c $(TOP)/src/vdbeaux.c \
   $(TOP)/src/vdbe.c $(TOP)/src/vdbemem.c $(TOP)/src/where.c parse.c            \
   $(TOP)/ext/fts3/fts3.c $(TOP)/ext/fts3/fts3_expr.c                           \
-  $(TOP)/ext/fts3/fts3_tokenizer.c                                             \
+  $(TOP)/ext/fts3/fts3_tokenizer.c $(TOP)/ext/fts3/fts3_write.c                \
   $(TOP)/ext/async/sqlite3async.c
 
 # Header files used by all library source files.

diff --git a/manifest b/manifest
index 244deb89aa67e3781313fc1e4660d9ddb9f1dda7..f2584d546592a06e49659221ddf49254664a0e9b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rationalize\ssome\scode\sin\sfts3\sused\sby\soptimize\soperations,\squeries\sof\sthe\spending-terms\shash\stable\sand\ssegment\smerges.\sAdd\sthe\s"INSERT\sINTO\stbl(tbl)\sVALUES('optimize')"\ssyntax.
-D 2009-12-11T12:29:05
+C Change\sthe\sfts3\stest\sinterface\sused\sto\sconfigure\sthe\sadvisory\snode\ssize\sparaemeter.
+D 2009-12-11T16:03:45
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -56,7 +56,7 @@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c b79e729c851bb0bfe5c1d6755e88bba26331d2dd
+F ext/fts3/fts3.c c059f8e743276b589cd07e311a42d9b699cc7bb7
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h 1419e2973b44ee78f0ae8f7e03abfa2bdaf14f54
 F ext/fts3/fts3_expr.c fcf6812dbfd9cb9a2cabaf50e741411794f83e7e
@@ -68,7 +68,7 @@ F ext/fts3/fts3_snippet.c 6c2eb6d872d66b2a9aa5663f2662e993f18a6496
 F ext/fts3/fts3_tokenizer.c 1a49ee3d79cbf0b9386250370d9cbfe4bb89c8ff
 F ext/fts3/fts3_tokenizer.h 7ff73caa3327589bf6550f60d93ebdd1f6a0fb5c
 F ext/fts3/fts3_tokenizer1.c 11a604a53cff5e8c28882727bf794e5252e5227b
-F ext/fts3/fts3_write.c 883db716247dd36a5d881e817c95b47e869c14cd
+F ext/fts3/fts3_write.c 3f49f2cde3285c6e3559a756812c4a525abcfb25
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/icu/README.txt 3b130aa66e7a681136f6add198b076a2f90d1e33
 F ext/icu/icu.c 12e763d288d23b5a49de37caa30737b971a2f1e2
@@ -88,7 +88,7 @@ F ext/rtree/tkt3363.test 2bf324f7908084a5f463de3109db9c6e607feb1b
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-F main.mk a92b99b264c3b277f8cf74d50aadc22c55967ef0
+F main.mk 93d7ab227d0110d996d0db430a9a27d42980c7be
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@ -402,7 +402,7 @@ F test/fts3expr.test 05dab77387801e4900009917bb18f556037d82da
 F test/fts3expr2.test 18da930352e5693eaa163a3eacf96233b7290d1a
 F test/fts3malloc.test d02ee86b21edd2b43044e0d6dfdcd26cb6efddcb
 F test/fts3near.test dc196dd17b4606f440c580d45b3d23aa975fd077
-F test/fts3rnd.test b1fd9a0b8bd95014b1c2cb9d5a8f27b5b3afc50d
+F test/fts3rnd.test 03e88da0bd300e48f9c9a154362d501fab259f9f
 F test/func.test af106ed834001738246d276659406823e35cde7b
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/fuzz.test a4174c3009a3e2c2e14b31b364ebf7ddb49de2c9
@@ -778,7 +778,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 6b740c7cd57d618623ed028be4213dfef860054a
-R 5a68bfd74081748d8df270fc22751e08
+P 29476da353df4c67fe744c1c5f466ba5b9c1a54b
+R 8ca2da08c312091c8993186dd9f053b6
 U dan
-Z e468921fcf4b1ed0f9a093998ca6e7b2
+Z db31ff17c7c3485d488732b71bbeecde

diff --git a/manifest.uuid b/manifest.uuid
index a43e9ceb88ea9d9757d1e5e93eb323f4b47fe6fc..1a5f2d036ada151b7ab43c8579978e6096c68a20 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29476da353df4c67fe744c1c5f466ba5b9c1a54b
\ No newline at end of file
+87fc0ce151c89beb5a43b65c0b1706f340c0c173
\ No newline at end of file

diff --git a/test/fts3rnd.test b/test/fts3rnd.test
index 100c127ed20fed4b99d2e770f940056a3886ea01..53304b1548ce0630d542524a636be87b4e66dbb8 100644 (file)
--- a/test/fts3rnd.test
+++ b/test/fts3rnd.test
@@ -214,7 +214,8 @@ foreach nodesize {50 500 1000 2000} {
   #
   db transaction {
     catchsql { DROP TABLE t1 }
-    execsql "CREATE VIRTUAL TABLE t1 USING fts3(a, b, c, test:$nodesize)"
+    execsql "CREATE VIRTUAL TABLE t1 USING fts3(a, b, c)"
+    execsql "INSERT INTO t1(t1) VALUES('nodesize=$nodesize')"
     for {set i 0} {$i < 100} {incr i} { insert_row $i }
   }