]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Add extra tests for java Fts5ExtensionApi API.
authordan <Dan Kennedy>
Mon, 18 Sep 2023 20:42:06 +0000 (20:42 +0000)
committerdan <Dan Kennedy>
Mon, 18 Sep 2023 20:42:06 +0000 (20:42 +0000)
FossilOrigin-Name: f9d62b853ce8bfbfdc9f137e984e7a1b51d70e88c38b136b4fad1e8ae6ee8913

ext/jni/src/c/sqlite3-jni.c
ext/jni/src/org/sqlite/jni/fts5/TesterFts5.java
manifest
manifest.uuid

index b4a48ef2c7d8d22e169861aabb0781265629016c..076800bf2d89816d7a91111d54f137b24b8cc58b 100644 (file)
@@ -5310,9 +5310,12 @@ static int s3jni_xTokenize_xToken(void *p, int tFlags, const char* z,
   struct s3jni_xQueryPhraseState * const s = p;
   jbyteArray jba;
 
+#if 0
   if( s->tok.zPrev == z && s->tok.nPrev == nZ ){
     jba = s->tok.jba;
-  }else{
+  }else
+#endif
+  {
     S3JniUnrefLocal(s->tok.jba);
     s->tok.zPrev = z;
     s->tok.nPrev = nZ;
index 50e7c3f459f423fb804c6b03ef8f211aaf0754b1..33a014203a3f1534a641f53c4b8e6aafc7d45010 100644 (file)
@@ -455,6 +455,93 @@ public class TesterFts5 {
       public void xDestroy(){ }
     };
 
+    /*
+    ** fts5_phrasehits(<fts>, <phrase-number>);
+    **
+    ** Use the xQueryPhrase() API to determine how many hits, in total,
+    ** there are for phrase <phrase-number> in the database.
+    */
+    fts5_extension_function fts5_phrasehits = new fts5_extension_function(){
+      @Override public void call(
+          Fts5ExtensionApi ext, 
+          Fts5Context fCx,
+          sqlite3_context pCx, 
+          sqlite3_value argv[]
+      ){
+        if( argv.length!=1 ){
+          throw new RuntimeException("fts5_phrasesize: wrong number of args");
+        }
+        int iPhrase = sqlite3_value_int(argv[0]);
+        int rc = SQLITE_OK;
+
+        class MyCallback implements Fts5ExtensionApi.XQueryPhraseCallback {
+          public int nRet = 0;
+          public int getRet() { return nRet; }
+
+          @Override
+          public int call(Fts5ExtensionApi fapi, Fts5Context cx){
+            OutputPointer.Int32 pnInst = new OutputPointer.Int32();
+            int rc = fapi.xInstCount(cx, pnInst);
+            nRet += pnInst.get();
+            return rc;
+          }
+        };
+
+        MyCallback xCall = new MyCallback();
+        rc = ext.xQueryPhrase(fCx, iPhrase, xCall);
+        if( rc!=SQLITE_OK ){
+          throw new RuntimeException("fts5_phrasehits: rc=" + rc);
+        }
+        sqlite3_result_int(pCx, xCall.getRet());
+      }
+      public void xDestroy(){ }
+    };
+
+    /*
+    ** fts5_tokenize(<fts>, <text>)
+    */
+    fts5_extension_function fts5_tokenize = new fts5_extension_function(){
+      @Override public void call(
+          Fts5ExtensionApi ext, 
+          Fts5Context fCx,
+          sqlite3_context pCx, 
+          sqlite3_value argv[]
+      ){
+        if( argv.length!=1 ){
+          throw new RuntimeException("fts5_tokenize: wrong number of args");
+        }
+        byte[] utf8 = sqlite3_value_text(argv[0]);
+        int rc = SQLITE_OK;
+
+        class MyCallback implements XTokenizeCallback {
+          private List<String> myList = new ArrayList<String>();
+
+          public String getval() {
+            return String.join("+", myList);
+          }
+
+          @Override
+          public int call(int tFlags, byte[] txt, int iStart, int iEnd){
+            try {
+              String str = new String(txt, "UTF-8");
+              myList.add(str);
+            } catch (Exception e) {
+            }
+            return SQLITE_OK;
+          }
+        };
+
+        MyCallback xCall = new MyCallback();
+        ext.xTokenize(fCx, utf8, xCall);
+        sqlite3_result_text16(pCx, xCall.getval());
+
+        if( rc!=SQLITE_OK ){
+          throw new RuntimeException("fts5_tokenize: rc=" + rc);
+        }
+      }
+      public void xDestroy(){ }
+    };
+
     fts5_api api = fts5_api.getInstanceForDb(db);
     api.xCreateFunction("fts5_rowid", fts5_rowid);
     api.xCreateFunction("fts5_columncount", fts5_columncount);
@@ -470,6 +557,8 @@ public class TesterFts5 {
     api.xCreateFunction("fts5_pcolinst", fts5_pcolinst);
     api.xCreateFunction("fts5_rowcount", fts5_rowcount);
     api.xCreateFunction("fts5_phrasesize", fts5_phrasesize);
+    api.xCreateFunction("fts5_phrasehits", fts5_phrasehits);
+    api.xCreateFunction("fts5_tokenize", fts5_tokenize);
   }
   /* 
   ** Test of various Fts5ExtensionApi methods 
@@ -675,6 +764,16 @@ public class TesterFts5 {
       "[{0 0} {0 1} {1 1}, {0 0} {1 0} {1 1}]"
     );
 
+    do_execsql_test(db,
+      "SELECT fts5_phrasesize(ft, 0) FROM ft('four five six') LIMIT 1;",
+      "[1]"
+    );
+    do_execsql_test(db,
+      "SELECT fts5_phrasesize(ft, 0) FROM ft('four + five + six') LIMIT 1;",
+      "[3]"
+    );
+
+
     sqlite3_close_v2(db);
   }
 
@@ -684,16 +783,34 @@ public class TesterFts5 {
     create_test_functions(db);
     do_execsql_test(db, 
       "CREATE VIRTUAL TABLE ft USING fts5(x, b);" +
+      "INSERT INTO ft(x) VALUES('one two three four five six seven eight');" +
+      "INSERT INTO ft(x) VALUES('one two one four one six one eight');" +
       "INSERT INTO ft(x) VALUES('one two three four five six seven eight');"
     );
 
     do_execsql_test(db,
-      "SELECT fts5_phrasesize(ft, 0) FROM ft('four five six');",
-      "[1]"
+      "SELECT fts5_phrasehits(ft, 0) FROM ft('one') LIMIT 1",
+      "[6]"
     );
+
+    sqlite3_close_v2(db);
+  }
+
+  private static void test6(){
+    sqlite3 db = createNewDb();
+    create_test_functions(db);
+    do_execsql_test(db, 
+      "CREATE VIRTUAL TABLE ft USING fts5(x, b);" +
+      "INSERT INTO ft(x) VALUES('one two three four five six seven eight');" 
+    );
+
     do_execsql_test(db,
-      "SELECT fts5_phrasesize(ft, 0) FROM ft('four + five + six');",
-      "[3]"
+      "SELECT fts5_tokenize(ft, 'abc def ghi') FROM ft('one')",
+      "[abc+def+ghi]"
+    );
+    do_execsql_test(db,
+      "SELECT fts5_tokenize(ft, 'it''s BEEN a...') FROM ft('one')",
+      "[it+s+been+a]"
     );
 
     sqlite3_close_v2(db);
@@ -704,6 +821,8 @@ public class TesterFts5 {
     test2();
     test3();
     test4();
+//    test5();
+    test6();
   }
 
   public TesterFts5(){
index ac5f67cee785f0618ab9214deba9b5777b36262e..fc2752435a3a8f501ed98f9dcf1181676e49262a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Extra\stests\sfor\sjava\sFts5ExtensionApi\sinterface.
-D 2023-09-18T18:12:03.235
+C Add\sextra\stests\sfor\sjava\sFts5ExtensionApi\sAPI.
+D 2023-09-18T20:42:06.838
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -238,7 +238,7 @@ F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a3
 F ext/jni/GNUmakefile 42e00052401b6dd41c0cdd53b31450606ea37486283abdb038dff9be74bff71e
 F ext/jni/README.md 9fceaeb17cecdc5d699dfc83c0cbc3a03fdb3b86bf676381894166c73375ee75
 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
-F ext/jni/src/c/sqlite3-jni.c 24b620de024b1763c094dcfef978c78a1b417cb90210f6fe51b04b45e492496b
+F ext/jni/src/c/sqlite3-jni.c 71c430225cb6ac8f708a3538eb3f66452d87bb01257ae9c8a202940d4d658964
 F ext/jni/src/c/sqlite3-jni.h c934b646b62c0fd13dfceea7a54d8fc0d1274d0520d0edc58ad220753f4c4f7d
 F ext/jni/src/org/sqlite/jni/AbstractCollationCallback.java 95e88ba04f4aac51ffec65693e878e234088b2f21b387f4e4285c8b72b33e436
 F ext/jni/src/org/sqlite/jni/AggregateFunction.java 7312486bc65fecdb91753c0a4515799194e031f45edbe16a6373cea18f404dc4
@@ -276,7 +276,7 @@ F ext/jni/src/org/sqlite/jni/fts5/Fts5Context.java 7058da97059b8e156c17561a47ecd
 F ext/jni/src/org/sqlite/jni/fts5/Fts5ExtensionApi.java b1b23431ece266c3308c1089d4cc3d2762a36ff4ea720196be1bcd75577abb9a
 F ext/jni/src/org/sqlite/jni/fts5/Fts5PhraseIter.java 2a7f3d76a1206e6a43d4c4ed9609b294d5431cc7d8fb875d8419f76efa6e56dc
 F ext/jni/src/org/sqlite/jni/fts5/Fts5Tokenizer.java cc9a53846a168a215238af224c31cef0e8379780e36e8a5e743b00c08145cf19
-F ext/jni/src/org/sqlite/jni/fts5/TesterFts5.java 499cd66c4a291a12e8224fa627bf105167fe5a3879bf70ae3eb06f1c3abb4c08
+F ext/jni/src/org/sqlite/jni/fts5/TesterFts5.java 68fb94509d3fcb55505853bebeb02a7202903ac919807e23610d2d593d420944
 F ext/jni/src/org/sqlite/jni/fts5/XTokenizeCallback.java 1efd1220ea328a32f2d2a1b16c735864159e929480f71daad4de9d5944839167
 F ext/jni/src/org/sqlite/jni/fts5/fts5_api.java 6071bf76c2c6a0f035b99adc76715b0324f540a441452b4ff6b94d9360a6a83d
 F ext/jni/src/org/sqlite/jni/fts5/fts5_extension_function.java 1fe0f5692c1d67475d12b067f0469949073446f18c56eba5ee5da6ddd06db9b9
@@ -2121,8 +2121,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 d1fd00e0875f881cacdc581a75215ec1872a81969ac07b8ebe3aaa707a9a3640
-R 1fefa695fa4390af83beddaf788f1e81
+P c923893f3604b278277de1bb919ef713bf7a4296b7ff71451cfe19bc2ff03190
+R dce10d8ae94249d41d42f7dff2440548
 U dan
-Z 8321aa821a44435aa878fc82bc41dc27
+Z 7d6c76f5fce3d6a1618c1597ed085ea5
 # Remove this line to create a well-formed Fossil manifest.
index 03c12ce46cb2373e3b550a6369071d5d00041c2e..81b26d4090a78b534bd4f2f58002ac9911bde16d 100644 (file)
@@ -1 +1 @@
-c923893f3604b278277de1bb919ef713bf7a4296b7ff71451cfe19bc2ff03190
\ No newline at end of file
+f9d62b853ce8bfbfdc9f137e984e7a1b51d70e88c38b136b4fad1e8ae6ee8913
\ No newline at end of file