database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

More Java API renaming for consistency.

Browse Source 
FossilOrigin-Name: 4e457778de189d8393e88f399dc521c8a5ad4ddd80a5fd69295bcb104fac5cbf
This commit is contained in:
stephan
2023-08-25 13:23:45 +00:00
parent a899186c86
commit ad818380cc
11 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/jni/src/c/sqlite3-jni.c
View File

@ -4439,7 +4439,7 @@ static jint s3jni_fts5_xTokenize(JniArgsEnvObj, S3NphRef const *pRef,
s.jCallback = jCallback;
s.jFcx = jFcx;
s.fext = fext;
s.midCallback = (*env)->GetMethodID(env, klazz, "xToken", "(I[BII)I");
s.midCallback = (*env)->GetMethodID(env, klazz, "call", "(I[BII)I");
S3JniUnrefLocal(klazz);
S3JniIfThrew {
S3JniExceptionReport;

4
ext/jni/src/c/sqlite3-jni.h
View File

@ -1963,7 +1963,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/xTokenizeCallback;)I
* Signature: (Lorg/sqlite/jni/Fts5Context;[BLorg/sqlite/jni/Fts5/xTokenize_callback;)I
*/
JNIEXPORT jint JNICALL Java_org_sqlite_jni_Fts5ExtensionApi_xTokenize
(JNIEnv *, jobject, jobject, jbyteArray, jobject);
@ -2021,7 +2021,7 @@ extern "C" {
/*
* Class: org_sqlite_jni_fts5_tokenizer
* Method: xTokenize
* Signature: (Lorg/sqlite/jni/Fts5Tokenizer;I[BLorg/sqlite/jni/Fts5/xTokenizeCallback;)I
* Signature: (Lorg/sqlite/jni/Fts5Tokenizer;I[BLorg/sqlite/jni/Fts5/xTokenize_callback;)I
*/
JNIEXPORT jint JNICALL Java_org_sqlite_jni_fts5_1tokenizer_xTokenize
(JNIEnv *, jobject, jobject, jint, jbyteArray, jobject);

8
ext/jni/src/org/sqlite/jni/Fts5.java
View File

@ -25,9 +25,11 @@ public final class Fts5 {
/* Not used */
private Fts5(){}
//! Callback type for use with xTokenize() variants
public static interface xTokenizeCallback {
int xToken(int tFlags, byte[] txt, int iStart, int iEnd);
/**
Callback type for use with xTokenize() variants
*/
public static interface xTokenize_callback {
int call(int tFlags, byte[] txt, int iStart, int iEnd);
}
public static final int FTS5_TOKENIZE_QUERY = 0x0001;

2
ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java
View File

@ -78,7 +78,7 @@ public final class Fts5ExtensionApi extends NativePointerHolder<Fts5ExtensionApi
whether pAux has an xDestroy() method. */
public native int xSetAuxdata(@NotNull Fts5Context cx, @Nullable Object pAux);
public native int xTokenize(@NotNull Fts5Context cx, @NotNull byte[] pText,
@NotNull Fts5.xTokenizeCallback callback);
@NotNull Fts5.xTokenize_callback callback);
public native Object xUserData(Fts5Context cx);
//^^^ returns the pointer passed as the 3rd arg to the C-level

2
ext/jni/src/org/sqlite/jni/busy_handler_callback.java
View File

@ -18,7 +18,7 @@ package org.sqlite.jni;
Callback for use with sqlite3_busy_handler()
*/
public abstract class busy_handler_callback
implements sqlite3_callback_proxy, sqlite3_xDestroy_callback {
implements sqlite3_callback_proxy, xDestroy_callback {
/**
Must function as documented for the C-level
sqlite3_busy_handler() callback argument, minus the (void*)

2
ext/jni/src/org/sqlite/jni/collation_callback.java
View File

@ -17,7 +17,7 @@ package org.sqlite.jni;
Callback for use with sqlite3_create_collation()
*/
public abstract class collation_callback
implements sqlite3_callback_proxy, sqlite3_xDestroy_callback {
implements sqlite3_callback_proxy, xDestroy_callback {
/**
Must compare the given byte arrays using memcmp() semantics.
*/

2
ext/jni/src/org/sqlite/jni/fts5_tokenizer.java
View File

@ -30,7 +30,7 @@ public final class fts5_tokenizer extends NativePointerHolder<fts5_tokenizer> {
public native int xTokenize(@NotNull Fts5Tokenizer t, int tokFlags,
@NotNull byte pText[],
@NotNull Fts5.xTokenizeCallback callback);
@NotNull Fts5.xTokenize_callback callback);
// int (*xTokenize)(Fts5Tokenizer*,

2
ext/jni/src/org/sqlite/jni/sqlite3_xDestroy_callback.java → ext/jni/src/org/sqlite/jni/xDestroy_callback.java
View File

@ -19,7 +19,7 @@ package org.sqlite.jni;
the symbol name xDestroy() for this purpose in the C API
documentation.
*/
public interface sqlite3_xDestroy_callback {
public interface xDestroy_callback {
/**
Must perform any cleanup required by this object. Must not
throw.