Bump RocksDB to v11.0.4

0xpablo · 0xpablo · commit 97b20376ef1d · 2026-04-14T13:34:33.000+02:00
diff --git a/Code/RocksDB.mm b/Code/RocksDB.mm
@@ -28,6 +28,8 @@
 #import "RocksDBError.h"
 #import "RocksDBSlice.h"
 
+#include <memory>
+
 #include <rocksdb/db.h>
 #include <rocksdb/slice.h>
 #include <rocksdb/options.h>
@@ -195,10 +197,11 @@ - (BOOL)isClosed {
 - (BOOL)openDatabaseReadOnly:(BOOL)readOnly error:(NSError**)error
 {
 	rocksdb::Status status;
+	std::unique_ptr<rocksdb::DB> db;
 	if (readOnly) {
-		status = rocksdb::DB::OpenForReadOnly(_options.options, _path.UTF8String, &_db);
+		status = rocksdb::DB::OpenForReadOnly(_options.options, _path.UTF8String, &db);
 	} else {
-		status = rocksdb::DB::Open(_options.options, _path.UTF8String, &_db);
+		status = rocksdb::DB::Open(_options.options, _path.UTF8String, &db);
 	}
 
 	if (!status.ok()) {
@@ -208,6 +211,7 @@ - (BOOL)openDatabaseReadOnly:(BOOL)readOnly error:(NSError**)error
 		[self close];
 		return NO;
 	}
+	_db = db.release();
 	_columnFamily = _db->DefaultColumnFamily();
 	_closed = false;
 
@@ -217,6 +221,7 @@ - (BOOL)openDatabaseReadOnly:(BOOL)readOnly error:(NSError**)error
 - (BOOL)openColumnFamilies:(RocksDBColumnFamilyDescriptor *)descriptor readOnly:(BOOL)readOnly error:(NSError**)error
 {
 	rocksdb::Status status;
+	std::unique_ptr<rocksdb::DB> db;
 	std::vector<rocksdb::ColumnFamilyDescriptor> *columnFamilies = descriptor.columnFamilies;
 	_columnFamilyHandles = new std::vector<rocksdb::ColumnFamilyHandle *>;
 
@@ -225,13 +230,13 @@ - (BOOL)openColumnFamilies:(RocksDBColumnFamilyDescriptor *)descriptor readOnly:
 											  _path.UTF8String,
 											  *columnFamilies,
 											  _columnFamilyHandles,
-											  &_db);
+											  &db);
 	} else {
 		status = rocksdb::DB::Open(_options.options,
 								   _path.UTF8String,
 								   *columnFamilies,
 								   _columnFamilyHandles,
-								   &_db);
+								   &db);
 	}
 
 
@@ -242,6 +247,7 @@ - (BOOL)openColumnFamilies:(RocksDBColumnFamilyDescriptor *)descriptor readOnly:
 		[self close];
 		return NO;
 	}
+	_db = db.release();
 	_columnFamily = _db->DefaultColumnFamily();
 	_closed = false;
 
diff --git a/Code/RocksDBCallbackSliceTransform.cpp b/Code/RocksDBCallbackSliceTransform.cpp
@@ -15,14 +15,14 @@ class RocksDBCallbackSliceTransformImpl : public rocksdb::SliceTransform
 	const char* name;
 	TransformCallback transformCallback;
 	InDomainCallback inDomainCallback;
-	InRangeCallback inRangeCallback;
+	SameResultWhenAppendedCallback sameResultWhenAppendedCallback;
 	
 public:
 	RocksDBCallbackSliceTransformImpl(void* instance, const char* name,
 									  TransformCallback transform,
 									  InDomainCallback domain,
-									  InRangeCallback range):
-	instance(instance), name(name), transformCallback(transform), inDomainCallback(domain), inRangeCallback(range) {}
+									  SameResultWhenAppendedCallback sameResultWhenAppended):
+	instance(instance), name(name), transformCallback(transform), inDomainCallback(domain), sameResultWhenAppendedCallback(sameResultWhenAppended) {}
 
 	virtual const char* Name() const
 	{
@@ -39,9 +39,9 @@ class RocksDBCallbackSliceTransformImpl : public rocksdb::SliceTransform
 		return inDomainCallback(instance, src);
 	}
 
-	virtual bool InRange(const rocksdb::Slice& dst) const
+	virtual bool SameResultWhenAppended(const rocksdb::Slice& prefix) const
 	{
-		return inRangeCallback(instance, dst);
+		return sameResultWhenAppendedCallback(instance, prefix);
 	}
 
 };
@@ -50,7 +50,7 @@ rocksdb::SliceTransform* RocksDBCallbackSliceTransform(void* instance,
 													   const char* name,
 													   TransformCallback transform,
 													   InDomainCallback domain,
-													   InRangeCallback range)
+													   SameResultWhenAppendedCallback sameResultWhenAppended)
 {
-	return new RocksDBCallbackSliceTransformImpl(instance, name, transform, domain, range);
+	return new RocksDBCallbackSliceTransformImpl(instance, name, transform, domain, sameResultWhenAppended);
 }
diff --git a/Code/RocksDBCallbackSliceTransform.h b/Code/RocksDBCallbackSliceTransform.h
@@ -14,12 +14,12 @@
 
 typedef rocksdb::Slice (* TransformCallback)(void* instance, const rocksdb::Slice& src);
 typedef bool (* InDomainCallback)(void* instance, const rocksdb::Slice& src);
-typedef bool (* InRangeCallback)(void* instance, const rocksdb::Slice& dst);
+typedef bool (* SameResultWhenAppendedCallback)(void* instance, const rocksdb::Slice& prefix);
 
 extern rocksdb::SliceTransform* RocksDBCallbackSliceTransform(void* instance,
 															  const char* name,
 															  TransformCallback transform,
 															  InDomainCallback domain,
-															  InRangeCallback range);
+															  SameResultWhenAppendedCallback sameResultWhenAppended);
 
 #endif /* defined(__ObjectiveRocks__RocksDBCallbackSliceTransform__) */
diff --git a/Code/RocksDBPrefixExtractor.mm b/Code/RocksDBPrefixExtractor.mm
@@ -62,7 +62,7 @@ - (instancetype)initWithName:(NSString *)name
 		_prefixCandidateBlock = [prefixCandidateBlock copy];
 		_validPrefixBlock = [validPrefixBlock copy];
 		_sliceTransform = RocksDBCallbackSliceTransform((__bridge void *)self, _name.UTF8String,
-														&trampolineTransform, &trampolineInDomain, &trampolineInRange);
+														&trampolineTransform, &trampolineInDomain, &trampolineSameResultWhenAppended);
 	}
 	return self;
 }
@@ -108,6 +108,11 @@ bool trampolineInRange(void* instance, const rocksdb::Slice& dst)
 	return [(__bridge id)instance isPrefixValid:dst];
 }
 
+bool trampolineSameResultWhenAppended(void* instance, const rocksdb::Slice& prefix)
+{
+	return [(__bridge id)instance isPrefixValid:prefix];
+}
+
 - (BOOL)isPrefixValid:(const rocksdb::Slice &)prefixSlice
 {
 	NSData *prefix = DataFromSlice(prefixSlice);
diff --git a/Code/RocksDBStatistics.mm b/Code/RocksDBStatistics.mm
@@ -33,6 +33,20 @@ @interface RocksDBStatisticsHistogram ()
 @implementation RocksDBStatistics
 @synthesize statistics = _statistics;
 
+static rocksdb::Tickers RocksDBTickerToNativeTicker(RocksDBTicker ticker)
+{
+	switch (ticker) {
+		// RocksDB 11 inserted new tickers before these legacy ObjectiveRocks cases,
+		// so raw enum forwarding no longer points at the intended counters.
+		case RocksDBTickerBytesWritten:
+			return rocksdb::BYTES_WRITTEN;
+		case RocksDBTickerBytesRead:
+			return rocksdb::BYTES_READ;
+		default:
+			return static_cast<rocksdb::Tickers>(ticker);
+	}
+}
+
 #pragma mark - Lifecycle
 
 - (instancetype)init
@@ -57,7 +71,7 @@ - (void)dealloc
 
 - (uint64_t)countForTicker:(RocksDBTicker)ticker
 {
-	return _statistics->getTickerCount(ticker);
+	return _statistics->getTickerCount(RocksDBTickerToNativeTicker(ticker));
 }
 
 - (RocksDBStatisticsHistogram *)histogramDataForType:(RocksDBHistogram)ticker
@@ -72,7 +86,7 @@ - (RocksDBStatisticsHistogram *)histogramDataForType:(RocksDBHistogram)ticker
 	histogram.ticker = [NSString stringWithCString:tickerName.c_str() encoding:NSUTF8StringEncoding];
 	histogram.median = data->median;
 	histogram.percentile95 = data->percentile95;
-	histogram.percentile95 = data->percentile99;
+	histogram.percentile99 = data->percentile99;
 	histogram.average = data->average;
 	histogram.standardDeviation = data->standard_deviation;
 
diff --git a/Package.swift b/Package.swift
@@ -5,7 +5,7 @@ import PackageDescription
 
 let package = Package(
     name: "ObjectiveRocks",
-    platforms: [.iOS(.v15), .macCatalyst(.v15), .macOS(.v12)],
+    platforms: [.iOS(.v15), .macCatalyst(.v15)],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
@@ -32,6 +32,7 @@ let package = Package(
             dependencies: ["ObjectiveRocks"],
             path: "Tests",
             exclude: [
+                "Info.plist",
                 "RocksDBIndexedWriteBatchTests.m",
                 "RocksDBReadOnlyTests.m",
                 "RocksDBBackupTests.mm",
@@ -52,8 +53,8 @@ let package = Package(
         ),
         .binaryTarget(
             name: "RocksDB",
-            url: "https://github.com/GoodNotes/rocksdb/releases/download/v9.10.0/RocksDB.xcframework.zip",
-            checksum: "48ad2e911d8b48e2e69abce9d506e99bdaf05f4072eacb42f2a48d33f8dc1f70"
+            url: "https://github.com/GoodNotes/rocksdb/releases/download/v11.0.4/RocksDB.xcframework.zip?ts=20260414-1329",
+            checksum: "1c4ffb565b8d998c79ea068147d5e6697633daa247c19d561bfca4f9d05d643f"
         )
     ],
     cxxLanguageStandard: .cxx20
diff --git a/Tests/RockDBTests.swift b/Tests/RockDBTests.swift
@@ -12,7 +12,7 @@ import ObjectiveRocks
 
 // MARK:- Extension
 
-extension Data: ExpressibleByStringLiteral {
+extension Data: @retroactive ExpressibleByStringLiteral {
 	public init(stringLiteral value: String) {
 		self = value.data(using: .utf8)!
 	}

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,14 @@ class RocksDBCallbackSliceTransformImpl : public rocksdb::SliceTransform`
`15`	`15`	`const char* name;`
`16`	`16`	`TransformCallback transformCallback;`
`17`	`17`	`InDomainCallback inDomainCallback;`
`18`		`- InRangeCallback inRangeCallback;`
	`18`	`+ SameResultWhenAppendedCallback sameResultWhenAppendedCallback;`
`19`	`19`
`20`	`20`	`public:`
`21`	`21`	`RocksDBCallbackSliceTransformImpl(void* instance, const char* name,`
`22`	`22`	`TransformCallback transform,`
`23`	`23`	`InDomainCallback domain,`
`24`		`- InRangeCallback range):`
`25`		`- instance(instance), name(name), transformCallback(transform), inDomainCallback(domain), inRangeCallback(range) {}`
	`24`	`+ SameResultWhenAppendedCallback sameResultWhenAppended):`
	`25`	`+ instance(instance), name(name), transformCallback(transform), inDomainCallback(domain), sameResultWhenAppendedCallback(sameResultWhenAppended) {}`
`26`	`26`
`27`	`27`	`virtual const char* Name() const`
`28`	`28`	`{`
`@@ -39,9 +39,9 @@ class RocksDBCallbackSliceTransformImpl : public rocksdb::SliceTransform`
`39`	`39`	`return inDomainCallback(instance, src);`
`40`	`40`	`}`
`41`	`41`
`42`		`- virtual bool InRange(const rocksdb::Slice& dst) const`
	`42`	`+ virtual bool SameResultWhenAppended(const rocksdb::Slice& prefix) const`
`43`	`43`	`{`
`44`		`- return inRangeCallback(instance, dst);`
	`44`	`+ return sameResultWhenAppendedCallback(instance, prefix);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`};`
`@@ -50,7 +50,7 @@ rocksdb::SliceTransform* RocksDBCallbackSliceTransform(void* instance,`
`50`	`50`	`const char* name,`
`51`	`51`	`TransformCallback transform,`
`52`	`52`	`InDomainCallback domain,`
`53`		`- InRangeCallback range)`
	`53`	`+ SameResultWhenAppendedCallback sameResultWhenAppended)`
`54`	`54`	`{`
`55`		`- return new RocksDBCallbackSliceTransformImpl(instance, name, transform, domain, range);`
	`55`	`+ return new RocksDBCallbackSliceTransformImpl(instance, name, transform, domain, sameResultWhenAppended);`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ - (instancetype)initWithName:(NSString *)name`
`62`	`62`	`_prefixCandidateBlock = [prefixCandidateBlock copy];`
`63`	`63`	`_validPrefixBlock = [validPrefixBlock copy];`
`64`	`64`	`_sliceTransform = RocksDBCallbackSliceTransform((__bridge void *)self, _name.UTF8String,`
`65`		`- &trampolineTransform, &trampolineInDomain, &trampolineInRange);`
	`65`	`+ &trampolineTransform, &trampolineInDomain, &trampolineSameResultWhenAppended);`
`66`	`66`	`}`
`67`	`67`	`return self;`
`68`	`68`	`}`
`@@ -108,6 +108,11 @@ bool trampolineInRange(void* instance, const rocksdb::Slice& dst)`
`108`	`108`	`return [(__bridge id)instance isPrefixValid:dst];`
`109`	`109`	`}`
`110`	`110`
	`111`	`+bool trampolineSameResultWhenAppended(void* instance, const rocksdb::Slice& prefix)`
	`112`	`+{`
	`113`	`+ return [(__bridge id)instance isPrefixValid:prefix];`
	`114`	`+}`
	`115`	`+`
`111`	`116`	`- (BOOL)isPrefixValid:(const rocksdb::Slice &)prefixSlice`
`112`	`117`	`{`
`113`	`118`	`NSData *prefix = DataFromSlice(prefixSlice);`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import ObjectiveRocks`
`12`	`12`
`13`	`13`	`// MARK:- Extension`
`14`	`14`
`15`		`-extension Data: ExpressibleByStringLiteral {`
	`15`	`+extension Data: @retroactive ExpressibleByStringLiteral {`
`16`	`16`	`public init(stringLiteral value: String) {`
`17`	`17`	`self = value.data(using: .utf8)!`
`18`	`18`	`}`