Separate SQLiteGlobal.loadLib() and SQLiteGlobal.initialize() to allo…

…w sqlite3_config(...) to be injected.
develop-git · Dec 4, 2020 · a4d1ab4 · a4d1ab4
1 parent 4cbbeca
commit a4d1ab4
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/android/jni/com_tencent_wcdb_database_SQLiteGlobal.cpp b/android/jni/com_tencent_wcdb_database_SQLiteGlobal.cpp
@@ -148,8 +148,9 @@ static jint nativeReleaseMemory(JNIEnv *env, jclass clazz)
     return sqlite3_release_memory(SOFT_HEAP_LIMIT);
 }
 
-static void nativeSetDefaultCipherSettings(JNIEnv *env, jclass clazz, jint pageSize)
+static void nativeInitialize(JNIEnv *env, jclass clazz, jint pageSize)
 {
+    sqliteInitialize();
     sqlcipher_set_default_pagesize(pageSize);
 
     // Keep compatibility to WCDB version 1.0, mainly the same as SQLCipher 3.
@@ -162,14 +163,13 @@ static void nativeSetDefaultCipherSettings(JNIEnv *env, jclass clazz, jint pageS
 
 static JNINativeMethod sMethods[] = {
     /* name, signature, funcPtr */
+    {"nativeInitialize", "(I)V", (void *) nativeInitialize},
     {"nativeReleaseMemory", "()I", (void *) nativeReleaseMemory},
-    {"nativeSetDefaultCipherSettings", "(I)V", (void *) nativeSetDefaultCipherSettings},
 };
 
 static int register_wcdb_SQLiteGlobal(JavaVM *vm, JNIEnv *env)
 {
     gVM = vm;
-    sqliteInitialize();
 
     jclass clazz;
     FIND_CLASS(clazz, "com/tencent/wcdb/database/WCDBInitializationProbe");

diff --git a/...chmark/src/androidTest/java/com/tencent/wcdb/benchmark/concurrent/WCDBConcurrentTest.java b/...chmark/src/androidTest/java/com/tencent/wcdb/benchmark/concurrent/WCDBConcurrentTest.java
@@ -36,7 +36,7 @@ public class WCDBConcurrentTest extends ConcurrentTest {
     @Override
     @Before
     public void doBefore() {
-        SQLiteGlobal.loadLib();
+        SQLiteGlobal.initialize();
         super.doBefore();
     }
 

diff --git a/...chmark/src/androidTest/java/com/tencent/wcdb/benchmark/single/WCDBSingleThreadedTest.java b/...chmark/src/androidTest/java/com/tencent/wcdb/benchmark/single/WCDBSingleThreadedTest.java
@@ -35,7 +35,7 @@ public class WCDBSingleThreadedTest extends SingleThreadedTest {
     @Override
     @Before
     public void doBefore() {
-        SQLiteGlobal.loadLib();
+        SQLiteGlobal.initialize();
         super.doBefore();
     }
 

diff --git a/android/wcdb/src/com/tencent/wcdb/database/SQLiteDatabase.java b/android/wcdb/src/com/tencent/wcdb/database/SQLiteDatabase.java
@@ -76,7 +76,7 @@ public final class SQLiteDatabase extends SQLiteClosable {
 
     static {
         // Ensure libwcdb.so is loaded.
-        SQLiteGlobal.loadLib();
+        SQLiteGlobal.initialize();
     }
 
     // Stores reference to all databases opened in the current process.

diff --git a/android/wcdb/src/com/tencent/wcdb/database/SQLiteDebug.java b/android/wcdb/src/com/tencent/wcdb/database/SQLiteDebug.java
@@ -39,7 +39,7 @@ public final class SQLiteDebug {
 
     static {
         // Ensure libwcdb.so is loaded.
-        SQLiteGlobal.loadLib();
+        SQLiteGlobal.initialize();
     }
 
     private SQLiteDebug() {}

diff --git a/android/wcdb/src/com/tencent/wcdb/database/SQLiteGlobal.java b/android/wcdb/src/com/tencent/wcdb/database/SQLiteGlobal.java
@@ -36,8 +36,8 @@
 public final class SQLiteGlobal {
     private static final String TAG = "WCDB.SQLiteGlobal";
 
+    private static native void nativeInitialize(int pageSize);
     private static native int nativeReleaseMemory();
-    private static native void nativeSetDefaultCipherSettings(int pageSize);
 
     /** Default page size to use when creating a database. */
     public static final int defaultPageSize;
@@ -74,11 +74,13 @@ public final class SQLiteGlobal {
             pageSize = 4096;
         }
         defaultPageSize = pageSize;
-        nativeSetDefaultCipherSettings(pageSize);
     }
     // Dummy static method to trigger class initialization.
     // See [JLS 12.4.1](http://docs.oracle.com/javase/specs/jls/se7/html/jls-12.html#jls-12.4.1)
     public static void loadLib() {}
+    public static void initialize() {
+        nativeInitialize(defaultPageSize);
+    }
 
     private SQLiteGlobal() {}
 
@@ -91,7 +93,6 @@ private SQLiteGlobal() {}
     public static int releaseMemory() {
         return nativeReleaseMemory();
     }
-
 }
 
 /**

diff --git a/android/wcdb/src/com/tencent/wcdb/database/SQLiteOpenHelper.java b/android/wcdb/src/com/tencent/wcdb/database/SQLiteOpenHelper.java
@@ -46,7 +46,7 @@ public abstract class SQLiteOpenHelper {
 
     static {
         // Ensure libwcdb.so is loaded.
-        SQLiteGlobal.loadLib();
+        SQLiteGlobal.initialize();
     }
 
     // When true, getReadableDatabase returns a read-only database if it is just being opened.

diff --git a/android/wcdb/src/com/tencent/wcdb/support/Context.java b/android/wcdb/src/com/tencent/wcdb/support/Context.java
@@ -37,7 +37,7 @@ public final class Context {
 
 	static {
 		// Ensure libwcdb.so is loaded.
-		SQLiteGlobal.loadLib();
+		SQLiteGlobal.initialize();
 	}
 
 	private static File getDataDirFile(android.content.Context context) {