From: stephan <stephan@noemail.net>
Date: Sat, 2 Sep 2023 14:36:41 +0000 (+0000)
Subject: Add sqlite3_config(SQLITE_CONFIG_LOG) support to Java and correct clearing of SQLITE_... 
X-Git-Tag: version-3.44.0~216^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de4d1c357f8bf8cf246b4cd3159306be141e0c38;p=thirdparty%2Fsqlite.git

Add sqlite3_config(SQLITE_CONFIG_LOG) support to Java and correct clearing of SQLITE_CONFIG_SQLLOG. Correct missing names in propagated UDF exception messages.

FossilOrigin-Name: 652e2e82100ac3d8238d15ef6d43de4162fd02d695db4936ad5706fe4f2d7dc3
---

diff --git a/ext/jni/GNUmakefile b/ext/jni/GNUmakefile
index 92819688d8..1e0b33be0a 100644
--- a/ext/jni/GNUmakefile
+++ b/ext/jni/GNUmakefile
@@ -77,6 +77,7 @@ JAVA_FILES.main := $(patsubst %,$(dir.src.jni)/%,\
   CollationCallback.java \
   CollationNeededCallback.java \
   CommitHookCallback.java \
+  ConfigLogCallback.java \
   ConfigSqllogCallback.java \
   NativePointerHolder.java \
   OutputPointer.java \
diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c
index 3158622994..2f89e3c250 100644
--- a/ext/jni/src/c/sqlite3-jni.c
+++ b/ext/jni/src/c/sqlite3-jni.c
@@ -657,16 +657,17 @@ struct S3JniGlobalType {
     } jPhraseIter;
   } fts5;
 #endif
-#ifdef SQLITE_ENABLE_SQLLOG
   struct {
+#ifdef SQLITE_ENABLE_SQLLOG
     S3JniHook sqllog      /* sqlite3_config(SQLITE_CONFIG_SQLLOG) callback */;
+#endif
+    S3JniHook configlog   /* sqlite3_config(SQLITE_CONFIG_LOG) callback */;
     S3JniHook * aFree     /* free-item list, for recycling. */;
     sqlite3_mutex * mutex /* mutex for aFree */;
     volatile const void * locker /* object on whose behalf the mutex
                                     is held.  Only for sanity checking
                                     in debug builds. */;
   } hook;
-#endif
 #ifdef SQLITE_JNI_ENABLE_METRICS
   /* Internal metrics. */
   struct {
@@ -2781,6 +2782,60 @@ S3JniApi(sqlite3_config() /*for a small subset of options.*/,
       return SQLITE_MISUSE;
   }
 }
+/* C-to-Java SQLITE_CONFIG_LOG wrapper. */
+static void s3jni_config_log(void *ignored, int errCode, const char *z){
+  S3JniDeclLocal_env;
+  S3JniHook hook = S3JniHook_empty;
+
+  S3JniHook_localdup(&SJG.hook.configlog, &hook);
+  if( hook.jObj ){
+    jstring const jArg1 = z ? s3jni_utf8_to_jstring(z, -1) : 0;
+    if( z ? !!jArg1 : 1 ){
+      (*env)->CallVoidMethod(env, hook.jObj, hook.midCallback, errCode, jArg1);
+    }
+    S3JniIfThrew{
+      S3JniExceptionWarnCallbackThrew("SQLITE_CONFIG_LOG callback");
+      S3JniExceptionClear;
+    }
+    S3JniHook_localundup(hook);
+    S3JniUnrefLocal(jArg1);
+  }
+}
+
+S3JniApi(sqlite3_config() /* for SQLITE_CONFIG_LOG */,
+         jint, 1config__Lorg_sqlite_jni_ConfigLogCallback_2
+)(JniArgsEnvClass, jobject jLog){
+  S3JniHook * const pHook = &SJG.hook.configlog;
+  int rc = 0;
+
+  S3JniGlobal_mutex_enter;
+  if( !jLog ){
+    rc = sqlite3_config( SQLITE_CONFIG_LOG, NULL, NULL );
+    if( 0==rc ){
+      S3JniHook_unref(pHook);
+    }
+  }else if( pHook->jObj && (*env)->IsSameObject(env, jLog, pHook->jObj) ){
+    /* No-op */
+  }else {
+    jclass const klazz = (*env)->GetObjectClass(env, jLog);
+    jmethodID const midCallback = (*env)->GetMethodID(env, klazz, "call",
+                                                      "(ILjava/lang/String;)V");
+    S3JniUnrefLocal(klazz);
+    if( midCallback ){
+      rc = sqlite3_config( SQLITE_CONFIG_LOG, s3jni_config_log, NULL );
+      if( 0==rc ){
+        S3JniHook_unref(pHook);
+        pHook->midCallback = midCallback;
+        pHook->jObj = S3JniRefGlobal(jLog);
+      }
+    }else{
+      S3JniExceptionWarnIgnore;
+      rc = SQLITE_ERROR;
+    }
+  }
+  S3JniGlobal_mutex_leave;
+  return rc;
+}
 
 #ifdef SQLITE_ENABLE_SQLLOG
 /* C-to-Java SQLITE_CONFIG_SQLLOG wrapper. */
@@ -2822,10 +2877,9 @@ void sqlite3_init_sqllog(void){
 }
 #endif
 
-S3JniApi(sqlite3_config() /* for SQLLOG */,
+S3JniApi(sqlite3_config() /* for SQLITE_CONFIG_SQLLOG */,
          jint, 1config__Lorg_sqlite_jni_ConfigSqllogCallback_2)(
-           JniArgsEnvClass, jobject jLog
-         ){
+           JniArgsEnvClass, jobject jLog){
 #ifndef SQLITE_ENABLE_SQLLOG
   return SQLITE_MISUSE;
 #else
@@ -2834,7 +2888,7 @@ S3JniApi(sqlite3_config() /* for SQLLOG */,
 
   S3JniGlobal_mutex_enter;
   if( !jLog ){
-    rc = sqlite3_config( SQLITE_CONFIG_SQLLOG, s3jni_config_sqllog, 0 );
+    rc = sqlite3_config( SQLITE_CONFIG_SQLLOG, NULL );
     if( 0==rc ){
       S3JniHook_unref(pHook);
     }
@@ -2848,7 +2902,7 @@ S3JniApi(sqlite3_config() /* for SQLLOG */,
                                                       "I)V");
     S3JniUnrefLocal(klazz);
     if( midCallback ){
-      rc = sqlite3_config( SQLITE_CONFIG_SQLLOG, s3jni_config_sqllog, 0 );
+      rc = sqlite3_config( SQLITE_CONFIG_SQLLOG, s3jni_config_sqllog, NULL );
       if( 0==rc ){
         S3JniHook_unref(pHook);
         pHook->midCallback = midCallback;
@@ -2988,6 +3042,7 @@ S3JniApi(sqlite3_create_function() sqlite3_create_function_v2()
     S3JniUdf_free(env, s, 1);
     goto error_cleanup;
   }
+  s->zFuncName = zFuncName /* pass on ownership */;
   if( UDF_WINDOW == s->type ){
     rc = sqlite3_create_window_function(pDb, zFuncName, nArg, eTextRep, s,
                                         udf_xStep, udf_xFinal, udf_xValue,
@@ -3009,7 +3064,6 @@ S3JniApi(sqlite3_create_function() sqlite3_create_function_v2()
 error_cleanup:
   /* Reminder: on sqlite3_create_function() error, s will be
   ** destroyed via create_function(). */
-  sqlite3_free(zFuncName);
   return (jint)rc;
 }
 
@@ -4058,6 +4112,10 @@ S3JniApi(sqlite3_shutdown(),jint,1shutdown)(
   JniArgsEnvClass
 ){
   s3jni_reset_auto_extension(env);
+#ifdef SQLITE_ENABLE_SQLLOG
+  S3JniHook_unref(&SJG.hook.sqllog);
+#endif
+  S3JniHook_unref(&SJG.hook.configlog);
   /* Free up S3JniDb recycling bin. */
   S3JniDb_mutex_enter; {
     while( S3JniGlobal.perDb.aFree ){
diff --git a/ext/jni/src/c/sqlite3-jni.h b/ext/jni/src/c/sqlite3-jni.h
index edf1825946..77d796ae73 100644
--- a/ext/jni/src/c/sqlite3-jni.h
+++ b/ext/jni/src/c/sqlite3-jni.h
@@ -1147,6 +1147,14 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1config__I
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1config__Lorg_sqlite_jni_ConfigSqllogCallback_2
   (JNIEnv *, jclass, jobject);
 
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_config
+ * Signature: (Lorg/sqlite/jni/ConfigLogCallback;)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1config__Lorg_sqlite_jni_ConfigLogCallback_2
+  (JNIEnv *, jclass, jobject);
+
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_context_db_handle
diff --git a/ext/jni/src/org/sqlite/jni/ConfigLogCallback.java b/ext/jni/src/org/sqlite/jni/ConfigLogCallback.java
new file mode 100644
index 0000000000..2198f1e104
--- /dev/null
+++ b/ext/jni/src/org/sqlite/jni/ConfigLogCallback.java
@@ -0,0 +1,25 @@
+/*
+** 2023-08-23
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This file is part of the JNI bindings for the sqlite3 C API.
+*/
+package org.sqlite.jni;
+
+/**
+   A callback for use with sqlite3_config().
+*/
+public interface ConfigLogCallback {
+  /**
+     Must function as described for a C-level callback for
+     {@link SQLite3Jni#sqlite3_config(ConfigLogCallback)}, with the slight signature change.
+  */
+  void call(int errCode, String msg);
+}
diff --git a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
index 66aa504fe6..747eac410d 100644
--- a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
+++ b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
@@ -563,11 +563,17 @@ public final class SQLite3Jni {
      <p>Note that sqlite3_config() is not threadsafe with regards to
      the rest of the library. This must not be called when any other
      library APIs are being called.
-
   */
   @Canonical(comment="Option subset: SQLITE_CONFIG_SQLLOG")
   public static native int sqlite3_config( @Nullable ConfigSqllogCallback logger );
 
+  /**
+     The sqlite3_config() overload for handling the SQLITE_CONFIG_LOG
+     option.
+  */
+  @Canonical(comment="Option subset: SQLITE_CONFIG_LOG")
+  public static native int sqlite3_config( @Nullable ConfigLogCallback logger );
+
   @Canonical
   public static native sqlite3 sqlite3_context_db_handle(
     @NotNull sqlite3_context cx
diff --git a/ext/jni/src/org/sqlite/jni/Tester1.java b/ext/jni/src/org/sqlite/jni/Tester1.java
index dd2c73657f..b8600cb13c 100644
--- a/ext/jni/src/org/sqlite/jni/Tester1.java
+++ b/ext/jni/src/org/sqlite/jni/Tester1.java
@@ -1590,6 +1590,7 @@ public class Tester1 implements Runnable {
     Integer nRepeat = 1;
     boolean forceFail = false;
     boolean sqlLog = false;
+    boolean configLog = false;
     boolean squelchTestOutput = false;
     for( int i = 0; i < args.length; ){
       String arg = args[i++];
@@ -1610,6 +1611,8 @@ public class Tester1 implements Runnable {
           forceFail = true;
         }else if(arg.equals("sqllog")){
           sqlLog = true;
+        }else if(arg.equals("configlog")){
+          configLog = true;
         }else if(arg.equals("naps")){
           takeNaps = true;
         }else if(arg.equals("q") || arg.equals("quiet")){
@@ -1633,7 +1636,7 @@ public class Tester1 implements Runnable {
           };
         int rc = sqlite3_config( log );
         affirm( 0==rc );
-        rc = sqlite3_config( null );
+        rc = sqlite3_config( (ConfigSqllogCallback)null );
         affirm( 0==rc );
         rc = sqlite3_config( log );
         affirm( 0==rc );
@@ -1642,6 +1645,19 @@ public class Tester1 implements Runnable {
               "without SQLITE_ENABLE_SQLLOG.");
       }
     }
+    if( configLog ){
+      final ConfigLogCallback log = new ConfigLogCallback() {
+          @Override public void call(int code, String msg){
+            outln("ConfigLogCallback: ",ResultCode.getEntryForInt(code),": ", msg);
+          };
+        };
+      int rc = sqlite3_config( log );
+      affirm( 0==rc );
+      rc = sqlite3_config( (ConfigLogCallback)null );
+      affirm( 0==rc );
+      rc = sqlite3_config( log );
+      affirm( 0==rc );
+    }
 
     quietMode = squelchTestOutput;
     outln("If you just saw warning messages regarding CallStaticObjectMethod, ",
diff --git a/manifest b/manifest
index 4430edf981..3661b98108 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Expose\ssqlite3_complete()\sto\sJNI.\sSlightly\swiden\sthe\sdefinition\sof\s"canonical"\sfor\sthe\spurposes\sof\sthe\s@Canonical\sannotation.\sAdd\sa\sfew\snew\stests.
-D 2023-09-02T12:53:25.655
+C Add\ssqlite3_config(SQLITE_CONFIG_LOG)\ssupport\sto\sJava\sand\scorrect\sclearing\sof\sSQLITE_CONFIG_SQLLOG.\sCorrect\smissing\snames\sin\spropagated\sUDF\sexception\smessages.
+D 2023-09-02T14:36:41.961
 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 dc6e78f9717470d262b4b3ec17c337834295f9df81717c1539da84106324fd1e
+F ext/jni/GNUmakefile 7bd7f0c28d664b71b08f9d8ff507eb8329f1f3e7b5d88f774f90a1a5259a3fe8
 F ext/jni/README.md 1332b1fa27918bd5d9ca2d0d4f3ac3a6ab86b9e3699dc5bfe32904a027f3d2a9
 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
-F ext/jni/src/c/sqlite3-jni.c 88e7ced81dcb82200b16cebf6d67564c3844f9af1c17717a94afda38793b7a08
-F ext/jni/src/c/sqlite3-jni.h eed8d955de3b55c50242d44104f3f5bf299625f69b97e747541509c04019c9ce
+F ext/jni/src/c/sqlite3-jni.c 066404920b85b3e06b7ce20e84cb3ebc5754c069f044db23205d34b3b1c15134
+F ext/jni/src/c/sqlite3-jni.h 2a04e2bf686e5eaa3ae9bcf11b1c38fb348e09071f081361eb224eae2a65194f
 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
@@ -248,6 +248,7 @@ F ext/jni/src/org/sqlite/jni/CallbackProxy.java 064a8a00e4c63cc501c30504f93ca996
 F ext/jni/src/org/sqlite/jni/CollationCallback.java df327348e1a34ee65210208d694d690e5ee0bfe901410122e07caf6c98b2b7c8
 F ext/jni/src/org/sqlite/jni/CollationNeededCallback.java 07df5fa161a0b81154295258037f662e7c372735c2899c76e81cb3abd9fd3b39
 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 3ebfbd5b95fdb9d7bc40306f2e682abd12e247d9224e92510b8dd103b4f96fe8
 F ext/jni/src/org/sqlite/jni/Fts5Context.java 0a5a02047a6a1dd3e4a38b0e542a8dd2de365033ba30e6ae019a676305959890
@@ -261,10 +262,10 @@ F ext/jni/src/org/sqlite/jni/ProgressHandlerCallback.java 7b9ff2218129ece98ba60c
 F ext/jni/src/org/sqlite/jni/ResultCode.java ba701f20213a5f259e94cfbfdd36eb7ac7ce7797f2c6c7fca2004ff12ce20f86
 F ext/jni/src/org/sqlite/jni/RollbackHookCallback.java d12352c0e22840de484ffa9b11ed5058bb0daca2e9f218055d3c54c947a273c4
 F ext/jni/src/org/sqlite/jni/SQLFunction.java 544a875d33fd160467d82e2397ac33157b29971d715a821a4fad3c899113ee8c
-F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 900c43e4789a0faf822febdbe0ae58719832d43ad6b78bee2cfc4a20c38fdab5
+F ext/jni/src/org/sqlite/jni/SQLite3Jni.java d73d372747aafed21d25b5b27c1e893f332e5977f0ad70f458412edcc747c28a
 F ext/jni/src/org/sqlite/jni/ScalarFunction.java 6d387bb499fbe3bc13c53315335233dbf6a0c711e8fa7c521683219b041c614c
 F ext/jni/src/org/sqlite/jni/TableColumnMetadata.java 54511b4297fa28dcb3f49b24035e34ced10e3fd44fd0e458e784f4d6b0096dab
-F ext/jni/src/org/sqlite/jni/Tester1.java f67a63e3b138495b0c51dcb4f0e1ee1fcb91d772107afabf6d90256ea0ce3c4a
+F ext/jni/src/org/sqlite/jni/Tester1.java d3f99cde2487dd8c9a0be9fc9146fecd28a70c6df8bfd1fd476e68c2c940114e
 F ext/jni/src/org/sqlite/jni/TesterFts5.java 1d127690daac4751300b277a14c09faa0cefd1efa365580cd8d95ea658e1ee59
 F ext/jni/src/org/sqlite/jni/TraceV2Callback.java beb0b064c1a5f8bfe585a324ed39a4e33edbe379a3fc60f1401661620d3ca7c0
 F ext/jni/src/org/sqlite/jni/UpdateHookCallback.java 8376f4a931f2d5612b295c003c9515ba933ee76d8f95610e89c339727376e36c
@@ -2115,8 +2116,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 a1872ae959cca11d5d8bc224aaeb0b53e772d999df9924b2e9ea84ceedb99148
-R 728b2c246df3114419f3af688349a1b0
+P a59fe0cd9552128ca4186f4e66f0d188f2a57c7647f43828e42cb95801f350ce
+R e1d1983d1d616224caf72675cc27855c
 U stephan
-Z abdadbf4f03136eea88913bb00194ef2
+Z 290673eb8d4334de0d33df1e73324ad2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a4982f259e..e20ba8d16d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a59fe0cd9552128ca4186f4e66f0d188f2a57c7647f43828e42cb95801f350ce
\ No newline at end of file
+652e2e82100ac3d8238d15ef6d43de4162fd02d695db4936ad5706fe4f2d7dc3
\ No newline at end of file