From: stephan <stephan@noemail.net>
Date: Tue, 26 Sep 2023 21:37:52 +0000 (+0000)
Subject: Start reworking JNI methods such that they pass void pointers from Java to C instead... 
X-Git-Tag: version-3.44.0~171^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36f60e6c1afad0e9cf6b571348f243ffe3ef7f4b;p=thirdparty%2Fsqlite.git

Start reworking JNI methods such that they pass void pointers from Java to C instead of passing their strongly-typed wrappers, as that is reportedly significantly faster than passing the wrapper objects to C and extracting the pointers there. There are still many, many functions left to rework for this.

FossilOrigin-Name: 66c814dd473731703ee00e1ff610acfdccf09d1b87dd2355795ed697d4ed5d3e
---

diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c
index a35d9b81cf..15223b2f56 100644
--- a/ext/jni/src/c/sqlite3-jni.c
+++ b/ext/jni/src/c/sqlite3-jni.c
@@ -1441,26 +1441,9 @@ static void * NativePointerHolder__get(JNIEnv * env, jobject jNph,
 #define PtrGet_sqlite3_stmt(OBJ) PtrGet_T(sqlite3_stmt, OBJ)
 #define PtrGet_sqlite3_value(OBJ) PtrGet_T(sqlite3_value, OBJ)
 
-#if 0
-/*
-** Enters the S3JniDb mutex and PtrGet_sqlite3()'s jObj. If that's
-** NULL then it leaves the mutex, else the mutex is still entered
-** when this returns and the caller is obligated to leave it.
-*/
-static sqlite3* PtrGet__sqlite3_lock(JNIEnv * const env, jobject jObj){
-  sqlite3 *rv;
-  S3JniDb_mutex_enter;
-  rv = PtrGet_sqlite3(jObj);
-  if( !rv ){ S3JniDb_mutex_leave; }
-  return rv;
-}
-#undef PtrGet_sqlite3
-#define PtrGet_sqlite3(JOBJ) PtrGet__sqlite3_lock(env, (JOBJ))
-#endif
-
 /*
 ** Extracts the new S3JniDb instance from the free-list, or allocates
-** one if needed, associats it with pDb, and returns.  Returns NULL on
+** one if needed, associates it with pDb, and returns.  Returns NULL on
 ** OOM. pDb MUST, on success of the calling operation, subsequently be
 ** associated with jDb via NativePointerHolder_set().
 */
@@ -1475,7 +1458,7 @@ static S3JniDb * S3JniDb_alloc(JNIEnv * const env, jobject jDb){
   }
   S3JniDb_mutex_leave;
   if( 0==rv ){
-    rv = s3jni_malloc( sizeof(S3JniDb));
+    rv = s3jni_malloc(sizeof(S3JniDb));
     if( rv ){
       s3jni_incr( &SJG.metrics.nPdbAlloc );
     }
@@ -3408,13 +3391,12 @@ S3JniApi(sqlite3_extended_result_codes(),jboolean,1extended_1result_1codes)(
 }
 
 S3JniApi(sqlite3_finalize(),jint,1finalize)(
-  JniArgsEnvClass, jobject jpStmt
+  JniArgsEnvClass, jlong jpStmt
 ){
   int rc = 0;
-  sqlite3_stmt * const pStmt = PtrGet_sqlite3_stmt(jpStmt);
-  if( pStmt ){
+  if( jpStmt ){
+    sqlite3_stmt * const pStmt = (void*)jpStmt;
     rc = sqlite3_finalize(pStmt);
-    NativePointerHolder_set(S3JniNph(sqlite3_stmt), jpStmt, 0);
   }
   return rc;
 }
@@ -3637,7 +3619,7 @@ S3JniApi(sqlite3_open_v2(),jint,1open_1v2)(
 
 /* Proxy for the sqlite3_prepare[_v2/3]() family. */
 jint sqlite3_jni_prepare_v123( int prepVersion, JNIEnv * const env, jclass self,
-                               jobject jDb, jbyteArray baSql,
+                               jlong jpDb, jbyteArray baSql,
                                jint nMax, jint prepFlags,
                                jobject jOutStmt, jobject outTail){
   sqlite3_stmt * pStmt = 0;
@@ -3656,13 +3638,13 @@ jint sqlite3_jni_prepare_v123( int prepVersion, JNIEnv * const env, jclass self,
     goto end;
   }
   switch( prepVersion ){
-    case 1: rc = sqlite3_prepare(PtrGet_sqlite3(jDb), (const char *)pBuf,
+    case 1: rc = sqlite3_prepare((sqlite3*)jpDb, (const char *)pBuf,
                                  (int)nMax, &pStmt, &zTail);
       break;
-    case 2: rc = sqlite3_prepare_v2(PtrGet_sqlite3(jDb), (const char *)pBuf,
+    case 2: rc = sqlite3_prepare_v2((sqlite3*)jpDb, (const char *)pBuf,
                                     (int)nMax, &pStmt, &zTail);
       break;
-    case 3: rc = sqlite3_prepare_v3(PtrGet_sqlite3(jDb), (const char *)pBuf,
+    case 3: rc = sqlite3_prepare_v3((sqlite3*)jpDb, (const char *)pBuf,
                                     (int)nMax, (unsigned int)prepFlags,
                                     &pStmt, &zTail);
       break;
@@ -3697,24 +3679,24 @@ end:
   return (jint)rc;
 }
 S3JniApi(sqlite3_prepare(),jint,1prepare)(
-  JNIEnv * const env, jclass self, jobject jDb, jbyteArray baSql,
+  JNIEnv * const env, jclass self, jlong jpDb, jbyteArray baSql,
                      jint nMax, jobject jOutStmt, jobject outTail
 ){
-  return sqlite3_jni_prepare_v123(1, env, self, jDb, baSql, nMax, 0,
+  return sqlite3_jni_prepare_v123(1, env, self, jpDb, baSql, nMax, 0,
                                   jOutStmt, outTail);
 }
 S3JniApi(sqlite3_prepare_v2(),jint,1prepare_1v2)(
-  JNIEnv * const env, jclass self, jobject jDb, jbyteArray baSql,
+  JNIEnv * const env, jclass self, jlong jpDb, jbyteArray baSql,
                          jint nMax, jobject jOutStmt, jobject outTail
 ){
-  return sqlite3_jni_prepare_v123(2, env, self, jDb, baSql, nMax, 0,
+  return sqlite3_jni_prepare_v123(2, env, self, jpDb, baSql, nMax, 0,
                                   jOutStmt, outTail);
 }
 S3JniApi(sqlite3_prepare_v3(),jint,1prepare_1v3)(
-  JNIEnv * const env, jclass self, jobject jDb, jbyteArray baSql,
+  JNIEnv * const env, jclass self, jlong jpDb, jbyteArray baSql,
                          jint nMax, jint prepFlags, jobject jOutStmt, jobject outTail
 ){
-  return sqlite3_jni_prepare_v123(3, env, self, jDb, baSql, nMax,
+  return sqlite3_jni_prepare_v123(3, env, self, jpDb, baSql, nMax,
                                   prepFlags, jOutStmt, outTail);
 }
 
diff --git a/ext/jni/src/c/sqlite3-jni.h b/ext/jni/src/c/sqlite3-jni.h
index 717a932676..7c64c48849 100644
--- a/ext/jni/src/c/sqlite3-jni.h
+++ b/ext/jni/src/c/sqlite3-jni.h
@@ -1406,10 +1406,10 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1error_1offset
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_finalize
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;)I
+ * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1finalize
-  (JNIEnv *, jclass, jobject);
+  (JNIEnv *, jclass, jlong);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
@@ -1510,26 +1510,26 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1open_1v2
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_prepare
- * Signature: (Lorg/sqlite/jni/sqlite3;[BILorg/sqlite/jni/OutputPointer/sqlite3_stmt;Lorg/sqlite/jni/OutputPointer/Int32;)I
+ * Signature: (J[BILorg/sqlite/jni/OutputPointer/sqlite3_stmt;Lorg/sqlite/jni/OutputPointer/Int32;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1prepare
-  (JNIEnv *, jclass, jobject, jbyteArray, jint, jobject, jobject);
+  (JNIEnv *, jclass, jlong, jbyteArray, jint, jobject, jobject);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_prepare_v2
- * Signature: (Lorg/sqlite/jni/sqlite3;[BILorg/sqlite/jni/OutputPointer/sqlite3_stmt;Lorg/sqlite/jni/OutputPointer/Int32;)I
+ * Signature: (J[BILorg/sqlite/jni/OutputPointer/sqlite3_stmt;Lorg/sqlite/jni/OutputPointer/Int32;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1prepare_1v2
-  (JNIEnv *, jclass, jobject, jbyteArray, jint, jobject, jobject);
+  (JNIEnv *, jclass, jlong, jbyteArray, jint, jobject, jobject);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_prepare_v3
- * Signature: (Lorg/sqlite/jni/sqlite3;[BIILorg/sqlite/jni/OutputPointer/sqlite3_stmt;Lorg/sqlite/jni/OutputPointer/Int32;)I
+ * Signature: (J[BIILorg/sqlite/jni/OutputPointer/sqlite3_stmt;Lorg/sqlite/jni/OutputPointer/Int32;)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1prepare_1v3
-  (JNIEnv *, jclass, jobject, jbyteArray, jint, jint, jobject, jobject);
+  (JNIEnv *, jclass, jlong, jbyteArray, jint, jint, jobject, jobject);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
diff --git a/ext/jni/src/org/sqlite/jni/NativePointerHolder.java b/ext/jni/src/org/sqlite/jni/NativePointerHolder.java
index 251eb7faad..2b0e8cfbdd 100644
--- a/ext/jni/src/org/sqlite/jni/NativePointerHolder.java
+++ b/ext/jni/src/org/sqlite/jni/NativePointerHolder.java
@@ -29,5 +29,18 @@ package org.sqlite.jni;
 public class NativePointerHolder<ContextType> {
   //! Only set from JNI, where access permissions don't matter.
   private volatile long nativePointer = 0;
+  /**
+     For use ONLY by package-level APIs which act as proxies for
+     close/finalize operations. Such ops must call this to zero out
+     the pointer so that this object is not carrying a stale
+     pointer. This function returns the prior value of the pointer and
+     sets it to 0.
+  */
+  final long clearNativePointer() {
+    final long rv = nativePointer;
+    nativePointer= 0;
+    return rv;
+  }
+
   public final long getNativePointer(){ return nativePointer; }
 }
diff --git a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
index 9257afbb69..5a83d642d8 100644
--- a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
+++ b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
@@ -738,7 +738,12 @@ public final class SQLite3Jni {
   public static native int sqlite3_error_offset(@NotNull sqlite3 db);
 
   @Canonical
-  public static native int sqlite3_finalize(@NotNull sqlite3_stmt stmt);
+  private static native int sqlite3_finalize(long ptrToStmt);
+
+  @Canonical
+  public static int sqlite3_finalize(@NotNull sqlite3_stmt stmt){
+    return null==stmt ? 0 : sqlite3_finalize(stmt.clearNativePointer());
+  }
 
   @Canonical
   public static native int sqlite3_initialize();
@@ -850,7 +855,7 @@ public final class SQLite3Jni {
   */
   @Canonical
   private static native int sqlite3_prepare(
-    @NotNull sqlite3 db, @NotNull byte[] sqlUtf8, int maxBytes,
+    @NotNull long ptrToDb, @NotNull byte[] sqlUtf8, int maxBytes,
     @NotNull OutputPointer.sqlite3_stmt outStmt,
     @Nullable OutputPointer.Int32 pTailOffset
   );
@@ -869,14 +874,16 @@ public final class SQLite3Jni {
     @NotNull OutputPointer.sqlite3_stmt outStmt,
     @Nullable OutputPointer.Int32 pTailOffset
   ){
-    return sqlite3_prepare(db, sqlUtf8, sqlUtf8.length, outStmt, pTailOffset);
+    return sqlite3_prepare(db.getNativePointer(), sqlUtf8, sqlUtf8.length,
+                           outStmt, pTailOffset);
   }
 
   public static int sqlite3_prepare(
     @NotNull sqlite3 db, @NotNull byte[] sqlUtf8,
     @NotNull OutputPointer.sqlite3_stmt outStmt
   ){
-    return sqlite3_prepare(db, sqlUtf8, sqlUtf8.length, outStmt, null);
+    return sqlite3_prepare(db.getNativePointer(), sqlUtf8, sqlUtf8.length,
+                           outStmt, null);
   }
 
   public static int sqlite3_prepare(
@@ -884,7 +891,8 @@ public final class SQLite3Jni {
     @NotNull OutputPointer.sqlite3_stmt outStmt
   ){
     final byte[] utf8 = sql.getBytes(StandardCharsets.UTF_8);
-    return sqlite3_prepare(db, utf8, utf8.length, outStmt, null);
+    return sqlite3_prepare(db.getNativePointer(), utf8, utf8.length,
+                           outStmt, null);
   }
 
   /**
@@ -907,7 +915,7 @@ public final class SQLite3Jni {
   */
   @Canonical
   private static native int sqlite3_prepare_v2(
-    @NotNull sqlite3 db, @NotNull byte[] sqlUtf8, int maxBytes,
+    @NotNull long ptrToDb, @NotNull byte[] sqlUtf8, int maxBytes,
     @NotNull OutputPointer.sqlite3_stmt outStmt,
     @Nullable OutputPointer.Int32 pTailOffset
   );
@@ -923,14 +931,16 @@ public final class SQLite3Jni {
     @NotNull OutputPointer.sqlite3_stmt outStmt,
     @Nullable OutputPointer.Int32 pTailOffset
   ){
-    return sqlite3_prepare_v2(db, sqlUtf8, sqlUtf8.length, outStmt, pTailOffset);
+    return sqlite3_prepare_v2(db.getNativePointer(), sqlUtf8, sqlUtf8.length,
+                              outStmt, pTailOffset);
   }
 
   public static int sqlite3_prepare_v2(
     @NotNull sqlite3 db, @NotNull byte[] sqlUtf8,
     @NotNull OutputPointer.sqlite3_stmt outStmt
   ){
-    return sqlite3_prepare_v2(db, sqlUtf8, sqlUtf8.length, outStmt, null);
+    return sqlite3_prepare_v2(db.getNativePointer(), sqlUtf8, sqlUtf8.length,
+                              outStmt, null);
   }
 
   public static int sqlite3_prepare_v2(
@@ -938,7 +948,8 @@ public final class SQLite3Jni {
     @NotNull OutputPointer.sqlite3_stmt outStmt
   ){
     final byte[] utf8 = sql.getBytes(StandardCharsets.UTF_8);
-    return sqlite3_prepare_v2(db, utf8, utf8.length, outStmt, null);
+    return sqlite3_prepare_v2(db.getNativePointer(), utf8, utf8.length,
+                              outStmt, null);
   }
 
   /**
@@ -958,7 +969,7 @@ public final class SQLite3Jni {
   */
   @Canonical
   private static native int sqlite3_prepare_v3(
-    @NotNull sqlite3 db, @NotNull byte[] sqlUtf8, int maxBytes,
+    @NotNull long ptrToDb, @NotNull byte[] sqlUtf8, int maxBytes,
     int prepFlags, @NotNull OutputPointer.sqlite3_stmt outStmt,
     @Nullable OutputPointer.Int32 pTailOffset
   );
@@ -974,7 +985,8 @@ public final class SQLite3Jni {
     @NotNull OutputPointer.sqlite3_stmt outStmt,
     @Nullable OutputPointer.Int32 pTailOffset
   ){
-    return sqlite3_prepare_v3(db, sqlUtf8, sqlUtf8.length, prepFlags, outStmt, pTailOffset);
+    return sqlite3_prepare_v3(db.getNativePointer(), sqlUtf8, sqlUtf8.length,
+                              prepFlags, outStmt, pTailOffset);
   }
 
   /**
@@ -985,7 +997,8 @@ public final class SQLite3Jni {
     @NotNull sqlite3 db, @NotNull byte[] sqlUtf8, int prepFlags,
     @NotNull OutputPointer.sqlite3_stmt outStmt
   ){
-    return sqlite3_prepare_v3(db, sqlUtf8, sqlUtf8.length, prepFlags, outStmt, null);
+    return sqlite3_prepare_v3(db.getNativePointer(), sqlUtf8, sqlUtf8.length,
+                              prepFlags, outStmt, null);
   }
 
   /**
@@ -998,7 +1011,8 @@ public final class SQLite3Jni {
     @NotNull OutputPointer.sqlite3_stmt outStmt
   ){
     final byte[] utf8 = sql.getBytes(StandardCharsets.UTF_8);
-    return sqlite3_prepare_v3(db, utf8, utf8.length, prepFlags, outStmt, null);
+    return sqlite3_prepare_v3(db.getNativePointer(), utf8, utf8.length,
+                              prepFlags, outStmt, null);
   }
 
   /**
diff --git a/manifest b/manifest
index 56def1ca67..24094aee0b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\sthe\stestfixture\stesting\sutility.
-D 2023-09-26T21:22:46.800
+C Start\sreworking\sJNI\smethods\ssuch\sthat\sthey\spass\svoid\spointers\sfrom\sJava\sto\sC\sinstead\sof\spassing\stheir\sstrongly-typed\swrappers,\sas\sthat\sis\sreportedly\ssignificantly\sfaster\sthan\spassing\sthe\swrapper\sobjects\sto\sC\sand\sextracting\sthe\spointers\sthere.\sThere\sare\sstill\smany,\smany\sfunctions\sleft\sto\srework\sfor\sthis.
+D 2023-09-26T21:37:52.408
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -238,8 +238,8 @@ 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 2932d4cae2b70a469a73f4a2cefa2701291e420155044d2c9e79137b65e237a1
-F ext/jni/src/c/sqlite3-jni.h 5e093f65c01050e6fe0988f559145f3b61a15c734aa3100a2b98d2a4b9d4c57a
+F ext/jni/src/c/sqlite3-jni.c 14c1390d93ce1a0e48d402039fb37131cdc16ddd69d0762bdd0d05b229ea5570
+F ext/jni/src/c/sqlite3-jni.h 558b44b9dc5d88708ee6b43cac0cd61f836460f5de0458266ff25f7508ef92c7
 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
@@ -251,7 +251,7 @@ 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/NativePointerHolder.java 564087036449a16df148dcf0a067408bd251170bf23286c655f46b5f973e8b2d
+F ext/jni/src/org/sqlite/jni/NativePointerHolder.java 3eb36b5e81993a847f5ec03d23ab219a92671f817547b6a85d312667faeedd8b
 F ext/jni/src/org/sqlite/jni/OutputPointer.java 2f57c05672ddc9b38e3f8eed11759896cf0bf01107ffd24d5182b99f6e7254b6
 F ext/jni/src/org/sqlite/jni/PrepareMultiCallback.java 878ed9cc8000def1a4e6d7113d52bba6fce0aa6733b4eb216d68dfbe096776ac
 F ext/jni/src/org/sqlite/jni/PreupdateHookCallback.java eccaed8dc9c6289f07ef3fc109891c6be1e7cc6c88723d90174b68706fc21cda
@@ -259,7 +259,7 @@ 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 73571d69420a72fa656097925acfbc3f670bb72685882094565303dcdfed71b5
+F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 732c9f55de35f3e3bc08a0187794473171ba07b8f886907d022ef2ffc9a813b5
 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 25be176398cf08cb9c0879ba33fd866cb8f579729dd4d44a4065421e1b899af4
@@ -2122,8 +2122,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b633d8bbdbd43464ee03058c273e5188117b9538ed5d5148a1a3851e4adf6410
-R eced8690afdbfb647f02413884f65126
-U drh
-Z 45b315c34cd6350047553b4dd70ecf3a
+P 5a39a02d2dfd9ed6171cd0bd434b2bc268d0ed8ead6e1a396d1603266d9493ef
+R 47a30e26f3996fa866a87a8a39a6842f
+T *branch * jni-ptr-passing
+T *sym-jni-ptr-passing *
+T -sym-trunk * Cancelled\sby\sbranch.
+U stephan
+Z 219c3daa73370ae53cc699c76c54d2c3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8dc7343078..483c7eca96 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5a39a02d2dfd9ed6171cd0bd434b2bc268d0ed8ead6e1a396d1603266d9493ef
\ No newline at end of file
+66c814dd473731703ee00e1ff610acfdccf09d1b87dd2355795ed697d4ed5d3e
\ No newline at end of file