Merge branch 'Tencent:master' into rust

jrjrmiih · web-flow · commit de966b5392e9 · 2025-09-11T15:55:17.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## v2.1.14
+
+* Support 16kb pagesize for Android
+* Supports using ksp in Kotlin version 2.1.0+
+* Fix stack overflow crash
+* Fix some known bugs
+
 ## v2.1.13
 
 * Fix compile error of Swift Package Manager
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # WCDB
 
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/wcdb/pulls)
-[![Release Version](https://img.shields.io/badge/Release-2.1.13-brightgreen.svg)](https://github.com/Tencent/wcdb/releases)
+[![Release Version](https://img.shields.io/badge/Release-2.1.14-brightgreen.svg)](https://github.com/Tencent/wcdb/releases)
 [![Language](https://img.shields.io/badge/Language-%20C++%20%7C%20Java%20%7C%20Kotlin%20%7C%20Swift%20%7C%20Objc-brightgreen.svg)](https://github.com/Tencent/wcdb/wiki)[![Platform](https://img.shields.io/badge/Platform-%20iOS%20%7C%20macOS%20%7C%20Android%20%7C%20Windows%20%7C%20Linux%20%7C%20OpenHarmony-brightgreen.svg)](https://github.com/Tencent/wcdb/wiki)
 
 中文版本请参看[这里][wcdb-wiki]
@@ -115,6 +115,8 @@ Tutorials of different languages can be found below:
 
 If you are interested in contributing, check out the [CONTRIBUTING.md], also join our [Tencent OpenSource Plan](https://opensource.tencent.com/contribution).
 
+WCDB 正式加入[TDS 腾讯端服务产品联盟](https://tds-union.qq.com/)，携手联盟其他成员，共同致力于构建开放共赢的大前端技术产品生态。
+
 # 信息公示
 
 * 开发者: 深圳市腾讯计算机系统有限公司
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.13
+2.1.14
diff --git a/WCDB.cpp.podspec b/WCDB.cpp.podspec
@@ -4,7 +4,7 @@
 # pod trunk push WCDB.cpp.podspec --verbose --skip-import-validation --allow-warnings
 Pod::Spec.new do |wcdb|
   wcdb.name         = "WCDB.cpp"
-  wcdb.version      = "2.1.13"
+  wcdb.version      = "2.1.14"
   wcdb.summary      = "WCDB is a cross-platform database framework developed by WeChat."
   wcdb.description  = <<-DESC
                       The WeChat Database, for C++. (If you want to use WCDB for Swift or Objective-C, see the "WCDB.swift" pod or "WCDB.objc" pod. If you want to use WCDB for C++/Objc/Swift in one project, see the "WCDB" pod)
diff --git a/WCDB.objc.podspec b/WCDB.objc.podspec
@@ -4,7 +4,7 @@
 # pod trunk push WCDB.objc.podspec --verbose --skip-import-validation --allow-warnings
 Pod::Spec.new do |wcdb|
   wcdb.name         = "WCDB.objc"
-  wcdb.version      = "2.1.13"
+  wcdb.version      = "2.1.14"
   wcdb.summary      = "WCDB is a cross-platform database framework developed by WeChat."
   wcdb.description  = <<-DESC
                       The WeChat Database, for Objective-C. (If you want to use WCDB for Swift or C++, see the "WCDB.swift" pod or "WCDB.cpp" pod. If you want to use WCDB for C++/Objc/Swift in one project, see the "WCDB" pod)
diff --git a/WCDB.podspec b/WCDB.podspec
@@ -4,7 +4,7 @@
 # pod trunk push --verbose --allow-warnings WCDB.podspec --skip-import-validation
 Pod::Spec.new do |wcdb|
   wcdb.name         = "WCDB"
-  wcdb.version      = "2.1.13"
+  wcdb.version      = "2.1.14"
   wcdb.summary      = "WCDB is a cross-platform database framework developed by WeChat."
   wcdb.description  = <<-DESC
                       The WeChat Database, for Objc/Swift/C++. (If you want to use WCDB for Objc/Swift/C++ separately, see the "WCDB.objc", "WCDB.swift" or "WCDB.cpp" pod.)
diff --git a/WCDB.swift.podspec b/WCDB.swift.podspec
@@ -4,7 +4,7 @@
 # pod trunk push --verbose --allow-warnings WCDB.swift.podspec
 Pod::Spec.new do |wcdb|
   wcdb.name         = "WCDB.swift"
-  wcdb.version      = "2.1.13"
+  wcdb.version      = "2.1.14"
   wcdb.summary      = "WCDB is a cross-platform database framework developed by WeChat."
   wcdb.description  = <<-DESC
                       The WeChat Database, for Swift. (If you want to use WCDB for Objective-C or C++, see the "WCDB.objc" pod or "WCDB.cpp" pod. If you want to use WCDB for C++/Objc/Swift in one project, see the "WCDB" pod)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -505,6 +505,7 @@ endif ()
 if (ANDROID)
     message(STATUS "---- BUILD FOR ANDROID ----")
     find_library(z-lib z)
+    target_link_options(${TARGET_NAME} PRIVATE "-Wl,-z,max-page-size=16384")
     target_link_libraries(${TARGET_NAME} PUBLIC
             ${LINK_LIBRARIES}
             ${z-lib})
diff --git a/src/common/base/FileManager.cpp b/src/common/base/FileManager.cpp
@@ -167,6 +167,9 @@ bool FileManager::createFileHardLink(const UnsafeStringView &from, const UnsafeS
     if (CreateHardLinkW(GetPathString(to), GetPathString(from), NULL)) {
         return true;
     }
+    if (CopyFile(GetPathString(from), GetPathString(to), true)) {
+        return true;
+    }
     setThreadedWinError(to);
     return false;
 #endif
@@ -319,23 +322,27 @@ Optional<uint32_t> FileManager::getFileIdentifier(const UnsafeStringView &path)
         setThreadedWinError(path);
         return NullOpt;
     }
-    FILE_ID_INFO fileIdInfo;
-    if (!GetFileInformationByHandleEx(hFile, FileIdInfo, &fileIdInfo, sizeof(fileIdInfo))) {
-        setThreadedWinError(path);
+    BY_HANDLE_FILE_INFORMATION fileInfo;
+    if (GetFileInformationByHandle(hFile, &fileInfo)) {
         CloseHandle(hFile);
-        return NullOpt;
+
+        constexpr size_t size = sizeof(fileInfo.nFileIndexHigh)
+                                + sizeof(fileInfo.nFileIndexLow)
+                                + sizeof(fileInfo.dwVolumeSerialNumber);
+        unsigned char buffer[size];
+        memcpy(buffer, &fileInfo.nFileIndexHigh, sizeof(fileInfo.nFileIndexHigh));
+        memcpy(buffer + sizeof(fileInfo.nFileIndexHigh),
+               &fileInfo.nFileIndexLow,
+               sizeof(fileInfo.nFileIndexLow));
+        memcpy(buffer + sizeof(fileInfo.nFileIndexHigh) + sizeof(fileInfo.nFileIndexLow),
+               &fileInfo.dwVolumeSerialNumber,
+               sizeof(fileInfo.dwVolumeSerialNumber));
+        return UnsafeData(buffer, size).hash();
     }
-    CloseHandle(hFile);
 
-    // Copy FileID and VolumeSerialNumber to a buffer
-    constexpr size_t size
-    = sizeof(fileIdInfo.FileId) + sizeof(fileIdInfo.VolumeSerialNumber);
-    unsigned char buffer[size];
-    memcpy(buffer, &fileIdInfo.FileId, sizeof(fileIdInfo.FileId));
-    memcpy(buffer + sizeof(fileIdInfo.FileId),
-           &fileIdInfo.VolumeSerialNumber,
-           sizeof(fileIdInfo.VolumeSerialNumber));
-    return UnsafeData(buffer, size).hash();
+    setThreadedWinError(path);
+    CloseHandle(hFile);
+    return NullOpt;
 #endif
 }
 
diff --git a/src/common/base/Lock.cpp b/src/common/base/Lock.cpp
@@ -114,12 +114,12 @@ void SharedLock::lock()
     Thread current = Thread::current();
     std::unique_lock<std::mutex> lockGuard(m_lock);
     if (!m_locking.equal(current)) {
-        m_pendingWriters.emplace(current);
+        m_pendingWriters.push_back(current);
         while (m_readers > 0 || m_writers > 0 || !m_pendingWriters.front().equal(current)) {
             m_conditionalWriters.wait(lockGuard);
         }
         WCTAssert(m_pendingWriters.front().isCurrentThread());
-        m_pendingWriters.pop();
+        m_pendingWriters.pop_front();
     }
     // it's already locked by current thread
     // or it's not locked and it's not shared locked
diff --git a/src/common/base/Lock.hpp b/src/common/base/Lock.hpp
@@ -30,7 +30,7 @@
 #include <condition_variable>
 #include <functional>
 #include <mutex>
-#include <queue>
+#include <list>
 
 namespace WCDB {
 
@@ -77,7 +77,7 @@ class SharedLock final {
     int m_readers;
     int m_writers;
     int m_pendingReaders;
-    std::queue<Thread> m_pendingWriters;
+    std::list<Thread> m_pendingWriters;
     Thread m_locking;
     // mutable since it can be only modified threaded
     mutable ThreadLocal<int> m_threadedReaders;
diff --git a/src/common/core/DatabasePool.cpp b/src/common/core/DatabasePool.cpp
@@ -61,7 +61,7 @@ Tag DatabasePool::getTag(const UnsafeStringView &path)
     SharedLockGuard lockGuard(m_lock);
     auto iter = m_databases.find(path);
     if (iter != m_databases.end()) {
-        return get(iter).get()->getTag();
+        return iter->second.database->getTag();
     } else {
         return Tag::invalid();
     }
diff --git a/src/common/core/HandleCounter.cpp b/src/common/core/HandleCounter.cpp
@@ -43,17 +43,17 @@ bool HandleCounter::tryIncreaseHandleCount(HandleType type, bool writeHint)
             if (!handleShouldWaitWhenFull(type)) {
                 return false;
             }
-            m_pendingNormals.emplace(Thread::current());
+            m_pendingNormals.push_back(Thread::current());
             m_conditionalNormals.wait(lockGuard);
-            m_pendingNormals.pop();
+            m_pendingNormals.pop_front();
         }
         while (writeHint && m_writerCount >= HandlePoolMaxAllowedNumberOfWriters) {
             if (!handleShouldWaitWhenFull(type)) {
                 return false;
             }
-            m_pendingWriters.emplace(Thread::current());
+            m_pendingWriters.push_back(Thread::current());
             m_conditionalWriters.wait(lockGuard);
-            m_pendingWriters.pop();
+            m_pendingWriters.pop_front();
         }
     }
     if (writeHint) {
diff --git a/src/common/core/HandleCounter.hpp b/src/common/core/HandleCounter.hpp
@@ -58,8 +58,8 @@ class HandleCounter {
     mutable std::mutex m_lock;
     Conditional m_conditionalNormals;
     Conditional m_conditionalWriters;
-    std::queue<Thread> m_pendingNormals;
-    std::queue<Thread> m_pendingWriters;
+    std::list<Thread> m_pendingNormals;
+    std::list<Thread> m_pendingWriters;
     int m_writerCount = 0;
     int m_totalCount = 0;
 };
diff --git a/src/common/core/compression/CompressionCenter.cpp b/src/common/core/compression/CompressionCenter.cpp
@@ -229,7 +229,7 @@ CompressionCenter::compressContent(const UnsafeData& data, DictId dictId, InnerH
         errorReportHandle->notifyError(
         Error::Code::ZstdError,
         nullptr,
-        StringView::formatted("Compress fail: %s", ZSTD_getErrorName(boundSize)));
+        StringView::formatted("Compress fail: %s", ZSTD_getErrorName(compressSize)));
         return NullOpt;
     }
     if (compressSize >= data.size()) {
diff --git a/src/common/repair/mechanic/Backup.cpp b/src/common/repair/mechanic/Backup.cpp
@@ -314,7 +314,8 @@ bool Backup::incrementalBackup()
         for (auto pageIter = iter->verifiedPagenos.begin();
              pageIter != iter->verifiedPagenos.end();
              pageIter++) {
-            if (pageIter->number > 0 && m_unchangedLeaves[pageIter->number - 1]) {
+            if (pageIter->number > 0 && pageIter->number <= m_unchangedLeaves.size()
+                && m_unchangedLeaves[pageIter->number - 1]) {
                 // Deleted page
                 pageIter->number = 0;
             }
diff --git a/src/java/builder/compiler/src/main/java/com/tencent/wcdb/compiler/resolvedInfo/FTSModuleInfo.kt b/src/java/builder/compiler/src/main/java/com/tencent/wcdb/compiler/resolvedInfo/FTSModuleInfo.kt
@@ -25,6 +25,7 @@ package com.tencent.wcdb.compiler.resolvedInfo
 
 import com.google.devtools.ksp.processing.KSPLogger
 import com.google.devtools.ksp.symbol.KSAnnotation
+import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.KSType
 import com.google.devtools.ksp.symbol.KSTypeParameter
 import com.tencent.wcdb.*
@@ -46,13 +47,21 @@ data class FTSModuleInfo(
                 val value = argument.value ?: continue
                 when (argument.name?.asString()) {
                     "version" -> {
-                        when ((value as KSType).declaration.toString()) {
+                        val valueName = when (value) {
+                            is KSType -> value.declaration.toString()
+                            is KSClassDeclaration -> value.simpleName.asString()
+                            else -> {
+                                logger.error("Invalid type of 'version' argument value")
+                                return null
+                            }
+                        }
+                        when (valueName) {
                             FTSVersion.NONE.name -> resolvedInfo.ftsVersion = ""
                             FTSVersion.FTS3.name -> resolvedInfo.ftsVersion = "fts3"
                             FTSVersion.FTS4.name -> resolvedInfo.ftsVersion = "fts4"
                             FTSVersion.FTS5.name -> resolvedInfo.ftsVersion = "fts5"
                             else -> {
-                                logger.error("Unrecognized FTSVersion ${value.declaration} in FTSModule")
+                                logger.error("Unrecognized FTSVersion ${valueName} in FTSModule")
                                 return null
                             }
                         }
diff --git a/src/java/main/src/main/cpp/core/DatabaseJNI.c b/src/java/main/src/main/cpp/core/DatabaseJNI.c
@@ -180,6 +180,7 @@ bool WCDBJNIDatabaseConfig(jobject config, CPPHandle handle)
     jboolean ret = (*env)->CallStaticBooleanMethod(
     env, WCDBJNIGetDatabaseClass(), g_methodId, (jlong) handle.innerValue, config);
     if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionClear(env);
         ret = false;
     }
     WCDBJNITryDetach;
@@ -522,6 +523,7 @@ bool WCDBJNIDatabaseTableShouldBeBackup(jobject filter, const char* table)
     bool ret = (*env)->CallStaticBooleanMethod(
     env, WCDBJNIGetDatabaseClass(), g_methodId, filter, jtable);
     if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionClear(env);
         ret = false;
     }
     WCDBJNITryDetach;
@@ -640,6 +642,7 @@ void WCDBJNIDatabaseClassMethod(
 addMigrationSource, jlong self, jstring sourcePath, jbyteArray cipherKey, jobject filter)
 {
     WCDBJNIBridgeStruct(CPPDatabase, self);
+    WCDBJNITryGetVM;
     WCDBJNICreateGlobalRel(filter);
     WCDBJNIGetString(sourcePath);
     WCDBJNIGetByteArrayCritical(cipherKey);
diff --git a/src/java/test/src/androidTest/java/com/tencent/wcdbtest/database/ConfigTest.java b/src/java/test/src/androidTest/java/com/tencent/wcdbtest/database/ConfigTest.java
@@ -163,6 +163,21 @@ public void testCipher() {
         assertFalse(database.canOpen());
     }
 
+    @Test
+    public void testDatabasePageSize() {
+        byte[] cipher = "123".getBytes();
+        byte[] wrongCipher = "456".getBytes();
+        database.setCipherKey(cipher);
+        database.setConfig("page_size", new Database.Config() {
+            @Override
+            public void onInvocation(@NotNull Handle handle) throws WCDBException {
+                handle.execute(new StatementPragma().pragma(Pragma.pageSize).toValue(16 * 1024));
+            };
+        }, Database.ConfigPriority.highest);
+        assertTrue(database.canOpen());
+        assertTrue(database.getValueFromStatement(new StatementPragma().pragma(Pragma.pageSize)).getInt() == 16 * 1024);
+    }
+
     @Test
     public void testCipherWithPageSize() {
         byte[] cipher = "123".getBytes();
