add filterExpire param for count() & allKeys() for flutter

lingol · lingol · commit cffee7369c3d · 2023-08-10T15:42:44.000+08:00
diff --git a/Android/MMKV/gradle.properties b/Android/MMKV/gradle.properties
@@ -14,7 +14,7 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME_PREFIX=1.3.0
+VERSION_NAME_PREFIX=1.3.1
 #VERSION_NAME_SUFFIX=-SNAPSHOT
 VERSION_NAME_SUFFIX=
 
diff --git a/Android/MMKV/mmkv/src/main/cpp/flutter-bridge.cpp b/Android/MMKV/mmkv/src/main/cpp/flutter-bridge.cpp
@@ -347,10 +347,10 @@ MMKV_EXPORT int32_t writeValueToNB(void *handle, char *oKey, void *pointer, uint
     return -1;
 }
 
-MMKV_EXPORT uint64_t allKeys(void *handle, char ***keyArrayPtr, uint32_t **sizeArrayPtr) {
+MMKV_EXPORT uint64_t allKeys(void *handle, char ***keyArrayPtr, uint32_t **sizeArrayPtr, bool filterExpire) {
     MMKV *kv = static_cast<MMKV *>(handle);
     if (kv) {
-        auto keys = kv->allKeys();
+        auto keys = kv->allKeys(filterExpire);
         if (!keys.empty()) {
             auto keyArray = (char **) malloc(keys.size() * sizeof(void *));
             auto sizeArray = (uint32_t *) malloc(keys.size() * sizeof(uint32_t *));
@@ -385,10 +385,10 @@ MMKV_EXPORT bool containsKey(void *handle, char *oKey) {
     return false;
 }
 
-MMKV_EXPORT uint64_t count(void *handle) {
+MMKV_EXPORT uint64_t count(void *handle, bool filterExpire) {
     MMKV *kv = static_cast<MMKV *>(handle);
     if (kv) {
-        return kv->count();
+        return kv->count(filterExpire);
     }
     return 0;
 }
diff --git a/Android/MMKV/mmkvdemo/build.gradle b/Android/MMKV/mmkvdemo/build.gradle
@@ -76,14 +76,14 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':mmkv')
-//    implementation 'com.tencent:mmkv:1.3.0'
-//    implementation 'com.tencent:mmkv-static:1.3.0' // this is identical to 'com.tencent:mmkv'
-//    implementation 'com.tencent:mmkv-shared:1.3.0'
+//    implementation 'com.tencent:mmkv:1.3.1'
+//    implementation 'com.tencent:mmkv-static:1.3.1' // this is identical to 'com.tencent:mmkv'
+//    implementation 'com.tencent:mmkv-shared:1.3.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'com.getkeepsafe.relinker:relinker:1.4.3'
 }
diff --git a/Core/MMKVPredef.h b/Core/MMKVPredef.h
@@ -34,7 +34,7 @@
 #include <vector>
 #include <unordered_map>
 
-constexpr auto MMKV_VERSION = "v1.3.0";
+constexpr auto MMKV_VERSION = "v1.3.1";
 
 #ifdef DEBUG
 #    define MMKV_DEBUG
diff --git a/Core/MMKV_IO.cpp b/Core/MMKV_IO.cpp
@@ -1536,7 +1536,9 @@ size_t MMKV::filterExpiredKeys() {
             }
         }
     }
-    MMKVInfo("deleted %zu expired keys inside [%s]", count, m_mmapID.c_str());
+    if (count != 0) {
+        MMKVInfo("deleted %zu expired keys inside [%s]", count, m_mmapID.c_str());
+    }
     return count;
 }
 
diff --git a/Core/core.vcxproj b/Core/core.vcxproj
@@ -65,7 +65,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>Win32</Platform>
     <ProjectName>core</ProjectName>
@@ -75,12 +75,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Win32/Win32Demo/Win32Demo.vcxproj b/Win32/Win32Demo/Win32Demo.vcxproj
@@ -23,19 +23,19 @@
     <ProjectGuid>{532303C4-38D9-45D3-B925-18056C66CD01}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Win32Demo</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/Win32/Win32DemoProcess/Win32DemoProcess.vcxproj b/Win32/Win32DemoProcess/Win32DemoProcess.vcxproj
@@ -23,19 +23,19 @@
     <ProjectGuid>{86D6C605-81F3-407B-A766-690EDF4CD346}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Win32DemoProcess</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/flutter/android/build.gradle b/flutter/android/build.gradle
@@ -8,15 +8,15 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.1'
     }
 }
 
 rootProject.allprojects {
     repositories {
         google()
         mavenCentral()
-//        mavenLocal()
+        mavenLocal()
     }
 }
 
@@ -33,6 +33,6 @@ android {
     }
 
     dependencies {
-        implementation 'com.tencent:mmkv:1.3.0'
+        implementation 'com.tencent:mmkv:1.3.1'
     }
 }
diff --git a/flutter/android/gradle/wrapper/gradle-wrapper.properties b/flutter/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
diff --git a/flutter/example/android/app/build.gradle b/flutter/example/android/app/build.gradle
@@ -48,7 +48,16 @@ android {
     }
 
     dependencies {
-        implementation('com.tencent:mmkv:1.2.8')
+        implementation('com.tencent:mmkv:1.3.1')
+
+        constraints {
+            implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
+                because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+            }
+            implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
+                because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+            }
+        }
 
         modules {
             module("com.tencent:mmkv") {
diff --git a/flutter/example/android/build.gradle b/flutter/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.1'
     }
 }
 
@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/flutter/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
diff --git a/flutter/example/lib/main.dart b/flutter/example/lib/main.dart
@@ -332,5 +332,8 @@ class _MyAppState extends State<MyApp> {
     print("auto_expire_key_5: ${mmkv.containsKey("auto_expire_key_5")}");
     print("auto_expire_key_6: ${mmkv.containsKey("auto_expire_key_6")}");
     print("never_expire_key_1: ${mmkv.containsKey("never_expire_key_1")}");
+
+    print("count non-expired keys: ${mmkv.countNonExpiredKeys}");
+    print("all non-expired keys: ${mmkv.allNonExpiredKeys}");
   }
 }
diff --git a/flutter/lib/mmkv.dart b/flutter/lib/mmkv.dart
@@ -22,7 +22,6 @@ import "dart:async";
 import "dart:convert";
 import "dart:ffi"; // For FFI
 import "dart:io"; // For Platform.isX
-import "dart:typed_data";
 
 import "package:ffi/ffi.dart";
 import "package:flutter/cupertino.dart";
@@ -491,11 +490,20 @@ class MMKV {
 
   /// Get all the keys (_unsorted_).
   List<String> get allKeys {
+    return _allKeysImp(false);
+  }
+
+  /// Get all non-expired keys (_unsorted_). Note that this call has costs.
+  List<String> get allNonExpiredKeys {
+    return _allKeysImp(true);
+  }
+
+  List<String> _allKeysImp(bool filterExpire) {
     final keyArrayPtr = calloc<Pointer<Pointer<Utf8>>>();
     final sizeArrayPtr = calloc<Pointer<Uint32>>();
     final List<String> keys = [];
 
-    final count = _allKeys(_handle, keyArrayPtr, sizeArrayPtr);
+    final count = _allKeys(_handle, keyArrayPtr, sizeArrayPtr, _bool2Int(filterExpire));
     if (count > 0) {
       final keyArray = keyArrayPtr[0];
       final sizeArray = sizeArrayPtr[0];
@@ -528,7 +536,12 @@ class MMKV {
   }
 
   int get count {
-    return _count(_handle);
+    return _count(_handle, _bool2Int(false));
+  }
+
+  /// Get non-expired keys. Note that this call has costs.
+  int get countNonExpiredKeys {
+    return _count(_handle, _bool2Int(true));
   }
 
   /// Get the file size. See also [actualSize].
@@ -960,21 +973,21 @@ final int Function(Pointer<Void>, Pointer<Utf8>, Pointer<Void>, int)
         .asFunction();
 
 final int Function(Pointer<Void>, Pointer<Pointer<Pointer<Utf8>>>,
-        Pointer<Pointer<Uint32>>) _allKeys =
+        Pointer<Pointer<Uint32>>, int) _allKeys =
     _nativeLib
         .lookup<
             NativeFunction<
                 Uint64 Function(Pointer<Void>, Pointer<Pointer<Pointer<Utf8>>>,
-                    Pointer<Pointer<Uint32>>)>>(_nativeFuncName("allKeys"))
+                    Pointer<Pointer<Uint32>>, Int8)>>(_nativeFuncName("allKeys"))
         .asFunction();
 
 final int Function(Pointer<Void>, Pointer<Utf8>) _containsKey = _nativeLib
     .lookup<NativeFunction<Int8 Function(Pointer<Void>, Pointer<Utf8>)>>(
         _nativeFuncName("containsKey"))
     .asFunction();
 
-final int Function(Pointer<Void>) _count = _nativeLib
-    .lookup<NativeFunction<Uint64 Function(Pointer<Void>)>>(
+final int Function(Pointer<Void>, int) _count = _nativeLib
+    .lookup<NativeFunction<Uint64 Function(Pointer<Void>, Int8)>>(
         _nativeFuncName("count"))
     .asFunction();
 
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.3.0
 homepage: https://github.com/Tencent/mmkv
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.15.0 <3.0.0'
   flutter: ">=3.0.0 <4.0.0"
 
 dependencies:

Original file line number	Diff line number	Diff line change
`@@ -347,10 +347,10 @@ MMKV_EXPORT int32_t writeValueToNB(void handle, char oKey, void *pointer, uint`
`347`	`347`	`return -1;`
`348`	`348`	`}`
`349`	`349`
`350`		`-MMKV_EXPORT uint64_t allKeys(void handle, char keyArrayPtr, uint32_t sizeArrayPtr) {`
	`350`	`+MMKV_EXPORT uint64_t allKeys(void handle, char keyArrayPtr, uint32_t sizeArrayPtr, bool filterExpire) {`
`351`	`351`	`MMKV kv = static_cast<MMKV >(handle);`
`352`	`352`	`if (kv) {`
`353`		`- auto keys = kv->allKeys();`
	`353`	`+ auto keys = kv->allKeys(filterExpire);`
`354`	`354`	`if (!keys.empty()) {`
`355`	`355`	`auto keyArray = (char *) malloc(keys.size() sizeof(void *));`
`356`	`356`	`auto sizeArray = (uint32_t ) malloc(keys.size() sizeof(uint32_t *));`
`@@ -385,10 +385,10 @@ MMKV_EXPORT bool containsKey(void handle, char oKey) {`
`385`	`385`	`return false;`
`386`	`386`	`}`
`387`	`387`
`388`		`-MMKV_EXPORT uint64_t count(void *handle) {`
	`388`	`+MMKV_EXPORT uint64_t count(void *handle, bool filterExpire) {`
`389`	`389`	`MMKV kv = static_cast<MMKV >(handle);`
`390`	`390`	`if (kv) {`
`391`		`- return kv->count();`
	`391`	`+ return kv->count(filterExpire);`
`392`	`392`	`}`
`393`	`393`	`return 0;`
`394`	`394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1536,7 +1536,9 @@ size_t MMKV::filterExpiredKeys() {`
`1536`	`1536`	`}`
`1537`	`1537`	`}`
`1538`	`1538`	`}`
`1539`		`- MMKVInfo("deleted %zu expired keys inside [%s]", count, m_mmapID.c_str());`
	`1539`	`+ if (count != 0) {`
	`1540`	`+ MMKVInfo("deleted %zu expired keys inside [%s]", count, m_mmapID.c_str());`
	`1541`	`+ }`
`1540`	`1542`	`return count;`
`1541`	`1543`	`}`
`1542`	`1544`
Original file line number	Diff line number	Diff line change
`@@ -8,15 +8,15 @@ buildscript {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- classpath 'com.android.tools.build:gradle:4.2.1'`
	`11`	`+ classpath 'com.android.tools.build:gradle:7.4.1'`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`rootProject.allprojects {`
`16`	`16`	`repositories {`
`17`	`17`	`google()`
`18`	`18`	`mavenCentral()`
`19`		`-// mavenLocal()`
	`19`	`+ mavenLocal()`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`@@ -33,6 +33,6 @@ android {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`dependencies {`
`36`		`- implementation 'com.tencent:mmkv:1.3.0'`
	`36`	`+ implementation 'com.tencent:mmkv:1.3.1'`
`37`	`37`	`}`
`38`	`38`	`}`