Support framework-based RocksDB binary

0xpablo · 0xpablo · commit 5ddfce82d706 · 2026-04-14T15:30:36.000+02:00
diff --git a/Code/RocksDB.mm b/Code/RocksDB.mm
@@ -30,9 +30,9 @@
 
 #include <memory>
 
-#include <rocksdb/db.h>
-#include <rocksdb/slice.h>
-#include <rocksdb/options.h>
+#include <RocksDB/rocksdb/db.h>
+#include <RocksDB/rocksdb/slice.h>
+#include <RocksDB/rocksdb/options.h>
 
 #if !(defined(ROCKSDB_LITE) && defined(TARGET_OS_IPHONE))
 #import "RocksDBColumnFamilyMetaData+Private.h"
diff --git a/Code/RocksDBBackupEngine.mm b/Code/RocksDBBackupEngine.mm
@@ -10,8 +10,8 @@
 #import "RocksDBError.h"
 #import "RocksDBBackupInfo.h"
 
-#include <rocksdb/db.h>
-#include <rocksdb/utilities/backup_engine.h>
+#include <RocksDB/rocksdb/db.h>
+#include <RocksDB/rocksdb/utilities/backup_engine.h>
 
 #pragma mark - Informal Protocols
 
diff --git a/Code/RocksDBBlockBasedTableOptions.mm b/Code/RocksDBBlockBasedTableOptions.mm
@@ -8,8 +8,8 @@
 
 #import "RocksDBBlockBasedTableOptions.h"
 
-#import <rocksdb/table.h>
-#import <rocksdb/filter_policy.h>
+#import <RocksDB/rocksdb/table.h>
+#import <RocksDB/rocksdb/filter_policy.h>
 
 @interface RocksDBCache ()
 @property (nonatomic, assign) std::shared_ptr<rocksdb::Cache> cache;
diff --git a/Code/RocksDBCache.mm b/Code/RocksDBCache.mm
@@ -8,8 +8,8 @@
 
 #import "RocksDBCache.h"
 
-#import <rocksdb/cache.h>
-#import <rocksdb/advanced_cache.h>
+#import <RocksDB/rocksdb/cache.h>
+#import <RocksDB/rocksdb/advanced_cache.h>
 
 @interface RocksDBCache ()
 {
diff --git a/Code/RocksDBCallbackAssociativeMergeOperator.h b/Code/RocksDBCallbackAssociativeMergeOperator.h
@@ -10,9 +10,9 @@
 #define __ObjectiveRocks__RocksDBCallbackAssociativeMergeOperator__
 
 #import <string>
-#import <rocksdb/slice.h>
-#import <rocksdb/env.h>
-#import <rocksdb/merge_operator.h>
+#import <RocksDB/rocksdb/slice.h>
+#import <RocksDB/rocksdb/env.h>
+#import <RocksDB/rocksdb/merge_operator.h>
 
 typedef bool (* MergeCallback)(void* instacne,
 							   const rocksdb::Slice& key,
diff --git a/Code/RocksDBCallbackComparator.h b/Code/RocksDBCallbackComparator.h
@@ -9,8 +9,8 @@
 #ifndef __ObjectiveRocks__RocksDBCallbackComparator__
 #define __ObjectiveRocks__RocksDBCallbackComparator__
 
-#import <rocksdb/comparator.h>
-#import <rocksdb/slice.h>
+#import <RocksDB/rocksdb/comparator.h>
+#import <RocksDB/rocksdb/slice.h>
 
 typedef int (* CompareCallback)(void* instance, const rocksdb::Slice& a, const rocksdb::Slice& b);
 
diff --git a/Code/RocksDBCallbackMergeOperator.h b/Code/RocksDBCallbackMergeOperator.h
@@ -10,9 +10,9 @@
 #define __ObjectiveRocks__RocksDBCallbackMergeOperator__
 
 #import <string>
-#import <rocksdb/slice.h>
-#import <rocksdb/env.h>
-#import <rocksdb/merge_operator.h>
+#import <RocksDB/rocksdb/slice.h>
+#import <RocksDB/rocksdb/env.h>
+#import <RocksDB/rocksdb/merge_operator.h>
 
 typedef bool (* PartialMergeCallback)(void* instance,
 									  const rocksdb::Slice& key,
diff --git a/Code/RocksDBCallbackSliceTransform.h b/Code/RocksDBCallbackSliceTransform.h
@@ -9,8 +9,8 @@
 #ifndef __ObjectiveRocks__RocksDBCallbackSliceTransform__
 #define __ObjectiveRocks__RocksDBCallbackSliceTransform__
 
-#include <rocksdb/slice_transform.h>
-#import <rocksdb/slice.h>
+#include <RocksDB/rocksdb/slice_transform.h>
+#import <RocksDB/rocksdb/slice.h>
 
 typedef rocksdb::Slice (* TransformCallback)(void* instance, const rocksdb::Slice& src);
 typedef bool (* InDomainCallback)(void* instance, const rocksdb::Slice& src);
diff --git a/Code/RocksDBCheckpoint.mm b/Code/RocksDBCheckpoint.mm
@@ -10,7 +10,7 @@
 #import "RocksDB+Private.h"
 #import "RocksDBError.h"
 
-#import <rocksdb/utilities/checkpoint.h>
+#import <RocksDB/rocksdb/utilities/checkpoint.h>
 
 @interface RocksDBCheckpoint ()
 {
diff --git a/Code/RocksDBColumnFamily.mm b/Code/RocksDBColumnFamily.mm
@@ -9,7 +9,7 @@
 #import "RocksDBColumnFamily.h"
 #import "RocksDB+Private.h"
 
-#import <rocksdb/db.h>
+#import <RocksDB/rocksdb/db.h>
 
 @implementation RocksDBColumnFamily
 
diff --git a/Code/RocksDBColumnFamilyDescriptor.mm b/Code/RocksDBColumnFamilyDescriptor.mm
@@ -8,7 +8,7 @@
 
 #import "RocksDBColumnFamilyDescriptor.h"
 
-#import <rocksdb/db.h>
+#import <RocksDB/rocksdb/db.h>
 
 NSString * const RocksDBDefaultColumnFamilyName = @"default";
 
diff --git a/Code/RocksDBColumnFamilyMetadata.mm b/Code/RocksDBColumnFamilyMetadata.mm
@@ -9,7 +9,7 @@
 #import "RocksDBColumnFamilyMetadata.h"
 #import "RocksDBColumnFamilyMetaData+Private.h"
 
-#import <rocksdb/metadata.h>
+#import <RocksDB/rocksdb/metadata.h>
 
 @implementation RocksDBColumnFamilyMetaData
 
diff --git a/Code/RocksDBColumnFamilyOptions.mm b/Code/RocksDBColumnFamilyOptions.mm
@@ -14,12 +14,12 @@
 #import "RocksDBMergeOperator.h"
 #import "RocksDBPrefixExtractor.h"
 
-#import <rocksdb/options.h>
-#import <rocksdb/comparator.h>
-#import <rocksdb/merge_operator.h>
-#import <rocksdb/slice_transform.h>
-#import <rocksdb/memtablerep.h>
-#import <rocksdb/table.h>
+#import <RocksDB/rocksdb/options.h>
+#import <RocksDB/rocksdb/comparator.h>
+#import <RocksDB/rocksdb/merge_operator.h>
+#import <RocksDB/rocksdb/slice_transform.h>
+#import <RocksDB/rocksdb/memtablerep.h>
+#import <RocksDB/rocksdb/table.h>
 
 @class RocksDBOptions;
 
diff --git a/Code/RocksDBCompactRangeOptions.mm b/Code/RocksDBCompactRangeOptions.mm
@@ -9,7 +9,7 @@
 #import "RocksDBCompactRangeOptions.h"
 #import "RocksDBCompactRangeOptions+Private.h"
 
-#import <rocksdb/options.h>
+#import <RocksDB/rocksdb/options.h>
 
 @interface RocksDBCompactRangeOptions ()
 {
diff --git a/Code/RocksDBComparator.mm b/Code/RocksDBComparator.mm
@@ -10,8 +10,8 @@
 #import "RocksDBSlice.h"
 #import "RocksDBCallbackComparator.h"
 
-#import <rocksdb/comparator.h>
-#include <rocksdb/slice.h>
+#import <RocksDB/rocksdb/comparator.h>
+#include <RocksDB/rocksdb/slice.h>
 
 @interface RocksDBComparator ()
 {
diff --git a/Code/RocksDBCuckooTableOptions.mm b/Code/RocksDBCuckooTableOptions.mm
@@ -8,7 +8,7 @@
 
 #import "RocksDBCuckooTableOptions.h"
 
-#import <rocksdb/table.h>
+#import <RocksDB/rocksdb/table.h>
 
 @interface RocksDBCuckooTableOptions ()
 {
diff --git a/Code/RocksDBDatabaseOptions.mm b/Code/RocksDBDatabaseOptions.mm
@@ -10,7 +10,7 @@
 
 #import "RocksDBEnv.h"
 #import "RocksDBEnv+Private.h"
-#import <rocksdb/options.h>
+#import <RocksDB/rocksdb/options.h>
 
 #if !(defined(ROCKSDB_LITE) && defined(TARGET_OS_IPHONE))
 #import "RocksDBStatistics.h"
diff --git a/Code/RocksDBEnv.mm b/Code/RocksDBEnv.mm
@@ -9,10 +9,10 @@
 #import "RocksDBEnv.h"
 
 #import "RocksDBThreadStatus.h"
-#import <rocksdb/env.h>
-#import <rocksdb/thread_status.h>
-#import <rocksdb/utilities/object_registry.h>
-#import <rocksdb/utilities/options_type.h>
+#import <RocksDB/rocksdb/env.h>
+#import <RocksDB/rocksdb/thread_status.h>
+#import <RocksDB/rocksdb/utilities/object_registry.h>
+#import <RocksDB/rocksdb/utilities/options_type.h>
 
 #pragma mark - Informal Protocols
 
diff --git a/Code/RocksDBError.mm b/Code/RocksDBError.mm
@@ -8,7 +8,7 @@
 
 #import "RocksDBError.h"
 
-#import <rocksdb/status.h>
+#import <RocksDB/rocksdb/status.h>
 
 NSString * const RocksDBErrorDomain = @"co.braincookie.objectiverocks.error";
 NSString * const RocksDBSubcodeKey = @"rocksdb.subcode";
diff --git a/Code/RocksDBFilterPolicy.mm b/Code/RocksDBFilterPolicy.mm
@@ -8,7 +8,7 @@
 
 #import "RocksDBFilterPolicy.h"
 
-#import <rocksdb/filter_policy.h>
+#import <RocksDB/rocksdb/filter_policy.h>
 
 @interface RocksDBFilterPolicy ()
 {
diff --git a/Code/RocksDBIndexedWriteBatch.mm b/Code/RocksDBIndexedWriteBatch.mm
@@ -17,9 +17,9 @@
 #import "RocksDBError.h"
 #import "RocksDBSlice.h"
 
-#import <rocksdb/db.h>
-#import <rocksdb/options.h>
-#import <rocksdb/utilities/write_batch_with_index.h>
+#import <RocksDB/rocksdb/db.h>
+#import <RocksDB/rocksdb/options.h>
+#import <RocksDB/rocksdb/utilities/write_batch_with_index.h>
 
 @interface RocksDBIndexedWriteBatch ()
 {
diff --git a/Code/RocksDBIterator.mm b/Code/RocksDBIterator.mm
@@ -10,7 +10,7 @@
 #import "RocksDBSlice.h"
 #import "RocksDBError.h"
 
-#import <rocksdb/iterator.h>
+#import <RocksDB/rocksdb/iterator.h>
 
 #pragma mark - Iterator
 
diff --git a/Code/RocksDBMemTableRepFactory.mm b/Code/RocksDBMemTableRepFactory.mm
@@ -8,7 +8,7 @@
 
 #import "RocksDBMemTableRepFactory.h"
 
-#import <rocksdb/memtablerep.h>
+#import <RocksDB/rocksdb/memtablerep.h>
 
 @interface RocksDBMemTableRepFactory ()
 {
diff --git a/Code/RocksDBMergeOperator.mm b/Code/RocksDBMergeOperator.mm
@@ -11,8 +11,8 @@
 #import "RocksDBCallbackAssociativeMergeOperator.h"
 #import "RocksDBCallbackMergeOperator.h"
 
-#import <rocksdb/slice.h>
-#import <rocksdb/env.h>
+#import <RocksDB/rocksdb/slice.h>
+#import <RocksDB/rocksdb/env.h>
 
 #pragma mark - Extension
 
diff --git a/Code/RocksDBOptions.mm b/Code/RocksDBOptions.mm
@@ -12,10 +12,10 @@
 #import "RocksDBMergeOperator.h"
 #import "RocksDBPrefixExtractor.h"
 
-#import <rocksdb/options.h>
-#import <rocksdb/comparator.h>
-#import <rocksdb/merge_operator.h>
-#import <rocksdb/slice_transform.h>
+#import <RocksDB/rocksdb/options.h>
+#import <RocksDB/rocksdb/comparator.h>
+#import <RocksDB/rocksdb/merge_operator.h>
+#import <RocksDB/rocksdb/slice_transform.h>
 
 @interface RocksDBDatabaseOptions ()
 @property (nonatomic, assign) const rocksdb::DBOptions options;
diff --git a/Code/RocksDBPlainTableOptions.mm b/Code/RocksDBPlainTableOptions.mm
@@ -8,7 +8,7 @@
 
 #import "RocksDBPlainTableOptions.h"
 
-#import <rocksdb/table.h>
+#import <RocksDB/rocksdb/table.h>
 
 @interface RocksDBPlainTableOptions ()
 {
diff --git a/Code/RocksDBPrefixExtractor.mm b/Code/RocksDBPrefixExtractor.mm
@@ -10,8 +10,8 @@
 #import "RocksDBSlice.h"
 #import "RocksDBCallbackSliceTransform.h"
 
-#import <rocksdb/slice_transform.h>
-#import <rocksdb/slice.h>
+#import <RocksDB/rocksdb/slice_transform.h>
+#import <RocksDB/rocksdb/slice.h>
 
 @interface RocksDBPrefixExtractor ()
 {
diff --git a/Code/RocksDBProperties.mm b/Code/RocksDBProperties.mm
@@ -8,7 +8,7 @@
 
 #import "RocksDBProperties.h"
 
-#import <rocksdb/db.h>
+#import <RocksDB/rocksdb/db.h>
 
 NSString * ResolveProperty(RocksDBProperty property) {
 	switch (property) {
diff --git a/Code/RocksDBReadOptions.mm b/Code/RocksDBReadOptions.mm
@@ -8,7 +8,7 @@
 
 #import "RocksDBReadOptions.h"
 
-#import <rocksdb/options.h>
+#import <RocksDB/rocksdb/options.h>
 
 @interface RocksDBReadOptions ()
 {
diff --git a/Code/RocksDBSlice.h b/Code/RocksDBSlice.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <rocksdb/slice.h>
+#import <RocksDB/rocksdb/slice.h>
 
 NS_INLINE rocksdb::Slice SliceFromData(NSData *data)
 {
diff --git a/Code/RocksDBSnapshot.mm b/Code/RocksDBSnapshot.mm
@@ -9,7 +9,7 @@
 #import "RocksDBSnapshot.h"
 #import "RocksDB+Private.h"
 
-#import <rocksdb/db.h>
+#import <RocksDB/rocksdb/db.h>
 
 @interface RocksDBReadOptions (Private)
 @property (nonatomic, assign) rocksdb::ReadOptions options;
diff --git a/Code/RocksDBStatistics.mm b/Code/RocksDBStatistics.mm
@@ -8,7 +8,7 @@
 
 #import "RocksDBStatistics.h"
 
-#import <rocksdb/statistics.h>
+#import <RocksDB/rocksdb/statistics.h>
 
 #pragma mark - Informal Protocols
 
diff --git a/Code/RocksDBTableFactory.mm b/Code/RocksDBTableFactory.mm
@@ -8,7 +8,7 @@
 
 #import "RocksDBTableFactory.h"
 
-#import <rocksdb/table.h>
+#import <RocksDB/rocksdb/table.h>
 
 @interface RocksDBBlockBasedTableOptions ()
 @property (nonatomic, assign) rocksdb::BlockBasedTableOptions options;
diff --git a/Code/RocksDBWriteBatch.mm b/Code/RocksDBWriteBatch.mm
@@ -12,8 +12,8 @@
 #import "RocksDBColumnFamily+Private.h"
 #import "RocksDBSlice.h"
 
-#import <rocksdb/write_batch_base.h>
-#import <rocksdb/write_batch.h>
+#import <RocksDB/rocksdb/write_batch_base.h>
+#import <RocksDB/rocksdb/write_batch.h>
 
 @interface RocksDBWriteBatch ()
 {
diff --git a/Code/RocksDBWriteBatchIterator.mm b/Code/RocksDBWriteBatchIterator.mm
@@ -9,7 +9,7 @@
 #import "RocksDBWriteBatchIterator.h"
 #import "RocksDBSlice.h"
 
-#import <rocksdb/utilities/write_batch_with_index.h>
+#import <RocksDB/rocksdb/utilities/write_batch_with_index.h>
 
 @interface RocksDBWriteBatchEntry (Private)
 @property (nonatomic, assign) RocksDBWriteBatchEntryType type;
diff --git a/Code/RocksDBWriteOptions.mm b/Code/RocksDBWriteOptions.mm
@@ -7,7 +7,7 @@
 //
 
 #import "RocksDBWriteOptions.h"
-#import <rocksdb/options.h>
+#import <RocksDB/rocksdb/options.h>
 
 @interface RocksDBWriteOptions ()
 {
diff --git a/Code/module.modulemap b/Code/module.modulemap
@@ -0,0 +1,4 @@
+module ObjectiveRocks {
+  header "ObjectiveRocks.h"
+  export *
+}
diff --git a/Package.swift b/Package.swift
@@ -53,8 +53,8 @@ let package = Package(
         ),
         .binaryTarget(
             name: "RocksDB",
-            url: "https://github.com/GoodNotes/rocksdb/releases/download/v11.0.4/RocksDB.xcframework.zip?ts=20260414-1329",
-            checksum: "1c4ffb565b8d998c79ea068147d5e6697633daa247c19d561bfca4f9d05d643f"
+            url: "https://github.com/GoodNotes/rocksdb/releases/download/v11.0.4/RocksDB.xcframework.zip?ts=20260414-1527",
+            checksum: "aae2a08c5c47fc81027719e90ceb2f19b83e6cf9e9488f7932ffeb5cbcda9924"
         )
     ],
     cxxLanguageStandard: .cxx20

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`
`9`	`9`	`#import "RocksDBCache.h"`
`10`	`10`
`11`		`-#import <rocksdb/cache.h>`
`12`		`-#import <rocksdb/advanced_cache.h>`
	`11`	`+#import <RocksDB/rocksdb/cache.h>`
	`12`	`+#import <RocksDB/rocksdb/advanced_cache.h>`
`13`	`13`
`14`	`14`	`@interface RocksDBCache ()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#import "RocksDB+Private.h"`
`11`	`11`	`#import "RocksDBError.h"`
`12`	`12`
`13`		`-#import <rocksdb/utilities/checkpoint.h>`
	`13`	`+#import <RocksDB/rocksdb/utilities/checkpoint.h>`
`14`	`14`
`15`	`15`	`@interface RocksDBCheckpoint ()`
`16`	`16`	`{`