Java FTS5 API renaming, for consistency.

FossilOrigin-Name: 5e4cc9f386364858c6457c40f13f01e1826a59086aa7f0fa10244ea846f5acfd

diff --git a/ext/jni/GNUmakefile b/ext/jni/GNUmakefile
index 2b48768e4c818e3ee6495cdf268ca4a32c6cba68..eb4cbf71d2f31970ac6973ba835703d9f8368b43 100644 (file)
--- a/ext/jni/GNUmakefile
+++ b/ext/jni/GNUmakefile
@@ -27,7 +27,7 @@ dir.bld     := $(dir.jni)/bld
 dir.bld.c   := $(dir.bld)
 dir.src.jni := $(dir.src)/org/sqlite/jni
 dir.src.jni.tester := $(dir.src.jni)/tester
-mkdir       := mkdir -p
+mkdir       ?= mkdir -p
 $(dir.bld.c):
        $(mkdir) $@
 

diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c
index ea8dcd74421b184ba8263595c9e034ba4b2f6000..726f88c118cba8a6242905bf92cb6dd598f034bb 100644 (file)
--- a/ext/jni/src/c/sqlite3-jni.c
+++ b/ext/jni/src/c/sqlite3-jni.c
@@ -4538,7 +4538,7 @@ static int s3jni_trace_impl(unsigned traceflag, void *pC, void *pP, void *pX){
       jP = jPUnref = S3JniRefLocal(ps->jDb);
       break;
     default:
-      assert(!"cannot happen - unkown trace flag");
+      assert(!"cannot happen - unknown trace flag");
       rc =  SQLITE_ERROR;
   }
   if( 0==rc ){

diff --git a/ext/jni/src/c/sqlite3-jni.h b/ext/jni/src/c/sqlite3-jni.h
index f291269717cde3e80dfb6bf7563ddaf8d8efd33f..36cb80567d93e65278323f8875cf8ff7efef987e 100644 (file)
--- a/ext/jni/src/c/sqlite3-jni.h
+++ b/ext/jni/src/c/sqlite3-jni.h
@@ -2219,7 +2219,7 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_Fts5ExtensionApi_xPhraseSize
 /*
  * Class:     org_sqlite_jni_Fts5ExtensionApi
  * Method:    xQueryPhrase
- * Signature: (Lorg/sqlite/jni/Fts5Context;ILorg/sqlite/jni/Fts5ExtensionApi/xQueryPhraseCallback;)I
+ * Signature: (Lorg/sqlite/jni/Fts5Context;ILorg/sqlite/jni/Fts5ExtensionApi/XQueryPhraseCallback;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_Fts5ExtensionApi_xQueryPhrase
   (JNIEnv *, jobject, jobject, jint, jobject);
@@ -2251,7 +2251,7 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_Fts5ExtensionApi_xSetAuxdata
 /*
  * Class:     org_sqlite_jni_Fts5ExtensionApi
  * Method:    xTokenize
- * Signature: (Lorg/sqlite/jni/Fts5Context;[BLorg/sqlite/jni/Fts5/xTokenize_callback;)I
+ * Signature: (Lorg/sqlite/jni/Fts5Context;[BLorg/sqlite/jni/Fts5/XTokenizeCallback;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_Fts5ExtensionApi_xTokenize
   (JNIEnv *, jobject, jobject, jbyteArray, jobject);
@@ -2311,7 +2311,7 @@ extern "C" {
 /*
  * Class:     org_sqlite_jni_fts5_tokenizer
  * Method:    xTokenize
- * Signature: (Lorg/sqlite/jni/Fts5Tokenizer;I[BLorg/sqlite/jni/Fts5/xTokenize_callback;)I
+ * Signature: (Lorg/sqlite/jni/Fts5Tokenizer;I[BLorg/sqlite/jni/Fts5/XTokenizeCallback;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_fts5_1tokenizer_xTokenize
   (JNIEnv *, jobject, jobject, jint, jbyteArray, jobject);

diff --git a/ext/jni/src/org/sqlite/jni/Fts5.java b/ext/jni/src/org/sqlite/jni/Fts5.java
index 6e61c4149d2d2eb7a4a7e3679bef58930071993c..104f027f9f414c6e47645b10499ef11e2669b691 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/Fts5.java
+++ b/ext/jni/src/org/sqlite/jni/Fts5.java
@@ -26,7 +26,7 @@ public final class Fts5 {
   /**
      Callback type for use with xTokenize() variants
   */
-  public static interface xTokenize_callback {
+  public static interface XTokenizeCallback {
     int call(int tFlags, byte[] txt, int iStart, int iEnd);
   }
 

diff --git a/ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java b/ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java
index a575ebdb916bc44769ceaf10165eae05a943ec33..b6c97c935a06c95c06267eba094bb77c8f641ea3 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java
+++ b/ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java
@@ -27,7 +27,7 @@ public final class Fts5ExtensionApi extends NativePointerHolder<Fts5ExtensionApi
   private final int iVersion = 2;
 
   /* Callback type for used by xQueryPhrase(). */
-  public static interface xQueryPhraseCallback {
+  public static interface XQueryPhraseCallback {
     int call(Fts5ExtensionApi fapi, Fts5Context cx);
   }
 
@@ -91,7 +91,7 @@ public final class Fts5ExtensionApi extends NativePointerHolder<Fts5ExtensionApi
 
   @Canonical
   public native int xQueryPhrase(@NotNull Fts5Context cx, int iPhrase,
-                                 @NotNull xQueryPhraseCallback callback);
+                                 @NotNull XQueryPhraseCallback callback);
   @Canonical
   public native int xRowCount(@NotNull Fts5Context fcx,
                               @NotNull OutputPointer.Int64 nRow);
@@ -110,7 +110,7 @@ public final class Fts5ExtensionApi extends NativePointerHolder<Fts5ExtensionApi
 
   @Canonical
   public native int xTokenize(@NotNull Fts5Context cx, @NotNull byte[] pText,
-                              @NotNull Fts5.xTokenize_callback callback);
+                              @NotNull Fts5.XTokenizeCallback callback);
 
   @Canonical
   public native Object xUserData(Fts5Context cx);

diff --git a/ext/jni/src/org/sqlite/jni/fts5_tokenizer.java b/ext/jni/src/org/sqlite/jni/fts5_tokenizer.java
index 053434e266250c0e72bca8a743e1215829579edc..cd94dfa28c371de608a2b9c85e189c54b73290ad 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/fts5_tokenizer.java
+++ b/ext/jni/src/org/sqlite/jni/fts5_tokenizer.java
@@ -31,7 +31,7 @@ public final class fts5_tokenizer extends NativePointerHolder<fts5_tokenizer> {
 
   public native int xTokenize(@NotNull Fts5Tokenizer t, int tokFlags,
                               @NotNull byte pText[],
-                              @NotNull Fts5.xTokenize_callback callback);
+                              @NotNull Fts5.XTokenizeCallback callback);
 
 
   // int (*xTokenize)(Fts5Tokenizer*,

diff --git a/manifest b/manifest
index 1b3b64cfe43324d0e02ebee2770423c5a9b25ad0..73e619873de5414eb3fe544e88d85847ee703168 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sJNI\sroutines\swhich\sset\san\sOutputPointer.value,\salways\sdo\sso,\seven\son\serror,\sfor\sconsistency.
-D 2023-09-04T06:15:37.421
+C Java\sFTS5\sAPI\srenaming,\sfor\sconsistency.
+D 2023-09-06T06:54:25.034
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -234,11 +234,11 @@ F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c
 F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9
 F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282
 F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8
-F ext/jni/GNUmakefile 2ae5e34ad21da48a8c1dd6e9e421d6bbb78716e3a03ad29dd86d9bd530ee3fc0
+F ext/jni/GNUmakefile 13a0d923fdbcbc363e5ed067423da3a19f6b25a49ae83ebddb00569f94b81b25
 F ext/jni/README.md 1332b1fa27918bd5d9ca2d0d4f3ac3a6ab86b9e3699dc5bfe32904a027f3d2a9
 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
-F ext/jni/src/c/sqlite3-jni.c 1b406fc279306db41e32297c194038973bc4c6befafbb83be0bb255debe45ed0
-F ext/jni/src/c/sqlite3-jni.h 6a6dfa22fc760f3a355cdc42cae07ea06ae3ee6d4fbf60bb11220a250926064c
+F ext/jni/src/c/sqlite3-jni.c 98f83a07c6956f51b9e758e1e560ad9826c67c1fe7f256e527293bd9808c4768
+F ext/jni/src/c/sqlite3-jni.h 875992ddf3a8c33d68a49ac26fbe2060f3ee98fb49127f140fed1e69f1da3be6
 F ext/jni/src/org/sqlite/jni/AbstractCollationCallback.java 95e88ba04f4aac51ffec65693e878e234088b2f21b387f4e4285c8b72b33e436
 F ext/jni/src/org/sqlite/jni/AggregateFunction.java 7312486bc65fecdb91753c0a4515799194e031f45edbe16a6373cea18f404dc4
 F ext/jni/src/org/sqlite/jni/AuthorizerCallback.java e6135be32f12bf140bffa39be7fd1a45ad83b2661ed49c08dbde04c8485feb38
@@ -250,9 +250,9 @@ F ext/jni/src/org/sqlite/jni/CollationNeededCallback.java 07df5fa161a0b811542952
 F ext/jni/src/org/sqlite/jni/CommitHookCallback.java 77cf8bb4f5548113e9792978f3f8a454614f420fa0ad73939421cbff4e7776f2
 F ext/jni/src/org/sqlite/jni/ConfigLogCallback.java 636ed6b89ed03f15bc2a6f6f47bf7853b8328e5a8269e52e80630708efa703a6
 F ext/jni/src/org/sqlite/jni/ConfigSqllogCallback.java e3656909eab7ed0f7e457c5b82df160ca22dd5e954c0a306ec1fca61b0d266b4
-F ext/jni/src/org/sqlite/jni/Fts5.java 09b3bfca6762420fa57a24df0ef797e5b31071a5dd1891d0e22a811b6e520b42
+F ext/jni/src/org/sqlite/jni/Fts5.java 0ca3cb814cb92e1ec07ccda72bcdb7eb45615abbc155e515d1cda3ee1404143d
 F ext/jni/src/org/sqlite/jni/Fts5Context.java 0a5a02047a6a1dd3e4a38b0e542a8dd2de365033ba30e6ae019a676305959890
-F ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java 6ac342951c5805b48ba1e46dd41dff3b74c609dc5bf1c26fca5738db36493031
+F ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java 24c7fb75c4464c2c3a893c31ec23a86a1bf5289fda8901a9cf4a923de42eea52
 F ext/jni/src/org/sqlite/jni/Fts5PhraseIter.java 6642beda341c0b1b46af4e2d7f6f9ab03a7aede43277b2c92859176d6bce3be9
 F ext/jni/src/org/sqlite/jni/Fts5Tokenizer.java 91489893596b6528c0df5cd7180bd5b55809c26e2b797fb321dfcdbc1298c060
 F ext/jni/src/org/sqlite/jni/NativePointerHolder.java 564087036449a16df148dcf0a067408bd251170bf23286c655f46b5f973e8b2d
@@ -277,7 +277,7 @@ F ext/jni/src/org/sqlite/jni/annotation/Nullable.java 6f962a98c9a5c6e9d21c50ae87
 F ext/jni/src/org/sqlite/jni/annotation/package-info.java f66bfb621c6494e67c03ed38a9e26a3bd6af99b9f9f6ef79556bcec30a025a22
 F ext/jni/src/org/sqlite/jni/fts5_api.java 386ecbcfcd03c24afbca52dc8bdf00791b6f2cbc0dd7be53e354071ada94f7bc
 F ext/jni/src/org/sqlite/jni/fts5_extension_function.java bec9f17a7e784d57eca99d812a65ecc9dd74c8df62d6d90cc1ecb3e37de14d47
-F ext/jni/src/org/sqlite/jni/fts5_tokenizer.java a92c2e55bda492e4c76d48ddc73369bcc0d5e8727940840f9339e3292ea58fa7
+F ext/jni/src/org/sqlite/jni/fts5_tokenizer.java 1b48d45763c571b70b6a0b419780ec8a4163f97a684e326d6e93eb0cb596fa95
 F ext/jni/src/org/sqlite/jni/package-info.java a3946db2504de747a1993c4f6e8ce604bec5a8e5a134b292c3b07527bc321a99
 F ext/jni/src/org/sqlite/jni/sqlite3.java 62b1b81935ccf3393472d17cb883dc5ff39c388ec3bc1de547f098a0217158fc
 F ext/jni/src/org/sqlite/jni/sqlite3_backup.java d0bb06dd6225e76999ff6b7ab20f2643b1c4d4167431b3a93ea41943e41f094b
@@ -2117,8 +2117,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 84433c72b0b08e7906ef87758caffe98f95df812945a7aea675bbc20791e33c0
-R 137bff2b9d70db03844846385ed7bc3f
+P d0df62f0af19a69f7ceb3ad1dceda0d8cc2ca5016a6e2a3a1e36356424c3ca49
+R 1c9c032947a0621b2a97abc848cee358
 U stephan
-Z 9ac4c3726b9a591fa96f8b45cdf4fa42
+Z 2634b10b864fb044031f2a08908448d5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d1d0cfd9c5df03929f3ba3ff8287339237404409..d37b01c322f2d7cd119d19ed1c65642565a9e259 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d0df62f0af19a69f7ceb3ad1dceda0d8cc2ca5016a6e2a3a1e36356424c3ca49
\ No newline at end of file
+5e4cc9f386364858c6457c40f13f01e1826a59086aa7f0fa10244ea846f5acfd
\ No newline at end of file