Merge branch '8.5.4-repair' into xcframework

Code/RocksDB.h

@@ -590,6 +590,10 @@ typedef void (^RestoreBlock)(NSError * __autoreleasing *);
 - (nullable id)withBulkLoad:(id (NS_NOESCAPE ^)(void))actionBlock
                       error:(NSError * __autoreleasing *)error;
 
+#pragma mark - Repair
+
++ (BOOL)repairDB:(NSString *)dbPath options:(RocksDBOptions *)options error:(NSError **)error;
+
 @end
 
 NS_ASSUME_NONNULL_END

Code/RocksDB.mm

@@ -804,4 +804,19 @@ - (nullable id)withBulkLoad:(id (NS_NOESCAPE ^)(void))actionBlock
     return result;
 }
 
+#pragma mark - Repair
+
++ (BOOL)repairDB:(NSString *)dbPath options:(RocksDBOptions *)options error:(NSError **)error {
+    rocksdb::Status s = rocksdb::RepairDB(dbPath.UTF8String, options.options);
+
+    if (!s.ok()) {
+        if (error != NULL) {
+            *error =  [RocksDBError errorWithRocksStatus:s];
+        }
+        return NO;
+    }
+
+    return YES;
+}
+
 @end

Code/RocksDBDatabaseOptions.mm

@@ -28,6 +28,7 @@ @interface RocksDBDatabaseOptions ()
 #endif
 }
 @property (nonatomic, assign) const rocksdb::DBOptions options;
+@property (nonatomic, strong) RocksDBEnv *env;
 @end
 
 @implementation RocksDBDatabaseOptions
@@ -188,6 +189,7 @@ - (void)setWalRecoveryMode:(RocksDBWALRecoveryMode)walRecoveryMode {
 }
 
 - (void)setEnv:(RocksDBEnv*)env {
+    _env = env;
     _options.env = env.env;
 }
 

Code/RocksDBEnv.h

@@ -46,6 +46,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSArray<RocksDBThreadStatus *> *)threadList;
 #endif
 
++ (RocksDBEnv*)mock;
+
 @end
 
 NS_ASSUME_NONNULL_END

Code/RocksDBEnv.mm

@@ -11,6 +11,8 @@
 #import "RocksDBThreadStatus.h"
 #import <rocksdb/env.h>
 #import <rocksdb/thread_status.h>
+#import <rocksdb/utilities/object_registry.h>
+#import <rocksdb/utilities/options_type.h>
 
 #pragma mark - Informal Protocols
 
@@ -98,4 +100,26 @@ - (NSArray *)threadList
 	return threadList;
 }
 
+#pragma mark - Mock
+
++ (RocksDBEnv*)mock
+{
+    // 1. Register the built in environments
+    rocksdb::ConfigOptions options;
+    rocksdb::Env *dummyEnv = nullptr;
+    rocksdb::Env::CreateFromString(options, "MockEnv", &dummyEnv);
+
+    // 2. Create a new MockEnv
+    auto envFactory = rocksdb::ObjectLibrary::Default()->FindFactory<rocksdb::Env>("MockEnv");
+    std::unique_ptr<rocksdb::Env> mockEnvPtr;
+    std::string errMsg;
+
+    envFactory("", &mockEnvPtr, &errMsg);
+
+    RocksDBEnv *mock = [RocksDBEnv new];
+    mock.env = mockEnvPtr.release();
+
+    return mock;
+}
+
 @end

Package.resolved

@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "lz4-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/goodnotes/lz4-swift",
+      "state" : {
+        "revision" : "1711e6db47e500523560fad63b690634c0c790e0",
+        "version" : "1.9.4"
+      }
+    }
+  ],
+  "version" : 2
+}

Package.swift

@@ -13,15 +13,17 @@ let package = Package(
             targets: ["ObjectiveRocks"]),
     ],
     dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
+        .package(url: "https://github.com/goodnotes/lz4-swift", from: "1.9.4")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "ObjectiveRocks",
-            dependencies: ["RocksDB", "RocksLZ4"],
+            dependencies: [
+                "RocksDB",
+                .product(name: "lz4", package: "lz4-swift")
+            ],
             path: "Code",
             publicHeadersPath: "./"
         ),
@@ -52,17 +54,6 @@ let package = Package(
             name: "RocksDB",
             url: "https://github.com/GoodNotes/rocksdb/releases/download/v8.10.0/RocksDB.xcframework.zip",
             checksum: "70b11dbb039a4e63fc7f4d100c49fb5dbd73db8a5cdefe24b6ee0eb32d1bda39"
-        ),
-        .target(
-            name: "RocksLZ4",
-            path: "lz4",
-            sources: [
-                "lz4.c",
-                "lz4.h",
-                "lz4hc.c",
-                "lz4hc.h",
-            ],
-            publicHeadersPath: "."
         )
     ],
     cxxLanguageStandard: .cxx20