Add xcframework support

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "rocksdb"]
-	path = rocksdb
-	url = https://github.com/facebook/rocksdb.git
-[submodule "lz4"]
-	path = lz4
-	url = [email protected]:lz4/lz4.git

Code/RocksDBBackupEngine.mm

@@ -11,7 +11,7 @@
 #import "RocksDBBackupInfo.h"
 
 #include <rocksdb/db.h>
-#include <rocksdb/utilities/backupable_db.h>
+#include <rocksdb/utilities/backup_engine.h>
 
 #pragma mark - Informal Protocols
 
@@ -45,7 +45,7 @@ - (instancetype)initWithPath:(NSString *)path
 	if (self) {
 		_path = [path copy];
 		rocksdb::Status status = rocksdb::BackupEngine::Open(rocksdb::Env::Default(),
-															 rocksdb::BackupableDBOptions(_path.UTF8String),
+															 rocksdb::BackupEngineOptions(_path.UTF8String),
 															 &_backupEngine);
 		if (!status.ok()) {
 			NSLog(@"Error opening database backup: %@", [RocksDBError errorWithRocksStatus:status]);

Code/RocksDBComparator.mm

@@ -42,14 +42,14 @@ + (instancetype)comaparatorWithType:(RocksDBComparatorType)type
 			return [[self alloc] initWithName:@"objectiverocks.string.compare.asc" andBlock:^int(NSData *key1, NSData *key2) {
 				NSString *str1 = [[NSString alloc] initWithData:key1 encoding:NSUTF8StringEncoding];
 				NSString *str2 = [[NSString alloc] initWithData:key2 encoding:NSUTF8StringEncoding];
-				return [str1 compare:str2];
+				return (int)[str1 compare:str2];
 			}];
 
 		case RocksDBComparatorStringCompareDescending:
 			return [[self alloc] initWithName:@"objectiverocks.string.compare.desc" andBlock:^int(NSData *key1, NSData *key2) {
 				NSString *str1 = [[NSString alloc] initWithData:key1 encoding:NSUTF8StringEncoding];
 				NSString *str2 = [[NSString alloc] initWithData:key2 encoding:NSUTF8StringEncoding];
-				return -1 * [str1 compare:str2];
+				return -1 * (int)[str1 compare:str2];
 			}];
 	}
 }

Tests/RocksDBBasicTests.swift

@@ -8,7 +8,6 @@
 
 import XCTest
 import ObjectiveRocks
-
 class RocksDBBasicTests : RocksDBTests {
 
 	func testSwift_DB_Open_ErrorIfExists() throws {

Tests/RocksDBColumnFamilyTests.swift

@@ -258,7 +258,7 @@ class RocksDBColumnFamilyTests : RocksDBTests {
 		try! newColumnFamily.setData("cf_value1", forKey: "cf_key1")
 		try! newColumnFamily.setData("cf_value2", forKey: "cf_key2")
 
-		let dfIterator = defaultColumnFamily.iterator()
+		let dfIterator = defaultColumnFamily.iterator()!
 
 		var actual = [String]()
 
@@ -274,7 +274,7 @@ class RocksDBColumnFamilyTests : RocksDBTests {
 
 		dfIterator.close()
 
-		let cfIterator = newColumnFamily.iterator()
+		let cfIterator = newColumnFamily.iterator()!
 
 		actual.removeAll()
 

Tests/RocksDBComparatorTests.swift

@@ -21,7 +21,7 @@ class RocksDBComparatorTests : RocksDBTests {
 		try! rocks.setData("abc2", forKey: "abc2")
 		try! rocks.setData("abc3", forKey: "abc3")
 
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.seekToFirst()
 
@@ -70,7 +70,7 @@ class RocksDBComparatorTests : RocksDBTests {
 		try! rocks.setData("abc2", forKey: "abc2")
 		try! rocks.setData("abc3", forKey: "abc3")
 
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.seekToFirst()
 
@@ -130,7 +130,7 @@ class RocksDBComparatorTests : RocksDBTests {
 		/* Expected Array: [A0, A1, A10, A100, A1000, A1001, A1019, A102, A1020, ...] */
 		expected.sort()
 
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 		var idx = 0
 
 		iterator.enumerateKeys { (key, stop) -> Void in
@@ -156,7 +156,7 @@ class RocksDBComparatorTests : RocksDBTests {
 		/* Expected Array: [A9999, A9998 .. A9990, A999, A9989, ...] */
 		expected.sort()
 
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 		var idx = 9999
 
 		iterator.enumerateKeys { (key, stop) -> Void in

Tests/RocksDBIteratorTests.swift

@@ -21,7 +21,7 @@ class RocksDBIteratorTests : RocksDBTests {
 		try! rocks.setData("value 3", forKey: "key 3")
 
 		var actual = [String]()
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.seekToFirst()
 		while iterator.isValid() {
@@ -43,7 +43,7 @@ class RocksDBIteratorTests : RocksDBTests {
 		try! rocks.setData("value 1", forKey: "key 1")
 		try! rocks.setData("value 2", forKey: "key 2")
 
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.seekToFirst()
 
@@ -88,7 +88,7 @@ class RocksDBIteratorTests : RocksDBTests {
 		try! rocks.setData("value 3", forKey: "key 3")
 
 		var actual = [String]()
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.enumerateKeys { (key, stop) -> Void in
 			actual.append(String(data: key, encoding: .utf8)!)
@@ -110,7 +110,7 @@ class RocksDBIteratorTests : RocksDBTests {
 		try! rocks.setData("value 3", forKey: "key 3")
 
 		var actual = [String]()
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.enumerateKeys(inReverse: true, using: { (key, stop) -> Void in
 			actual.append(String(data: key, encoding: .utf8)!)
@@ -133,7 +133,7 @@ class RocksDBIteratorTests : RocksDBTests {
 		try! rocks.setData("value 4", forKey: "key 4")
 
 		var actual = [String]()
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.enumerateKeys(in: RocksDBMakeKeyRange("key 2", nil), reverse: false) { (key, stop) -> Void in
 			actual.append(String(data: key, encoding: .utf8)!)
@@ -156,7 +156,7 @@ class RocksDBIteratorTests : RocksDBTests {
 		try! rocks.setData("value 4", forKey: "key 4")
 
 		var actual = [String]()
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.enumerateKeys(in: RocksDBMakeKeyRange(nil, "key 4"), reverse: false) { (key, stop) -> Void in
 			actual.append(String(data: key, encoding: .utf8)!)
@@ -179,7 +179,7 @@ class RocksDBIteratorTests : RocksDBTests {
 		try! rocks.setData("value 4", forKey: "key 4")
 
 		var actual = [String]()
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.enumerateKeys(in: RocksDBMakeKeyRange("key 2", "key 4"), reverse: false) { (key, stop) -> Void in
 			actual.append(String(data: key, encoding: .utf8)!)
@@ -201,7 +201,7 @@ class RocksDBIteratorTests : RocksDBTests {
 		try! rocks.setData("value 3", forKey: "key 3")
 
 		var actual = [String]()
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.enumerateKeysAndValues { (key, value, stop) -> Void in
 			actual.append(String(data: key, encoding: .utf8)!)
@@ -224,7 +224,7 @@ class RocksDBIteratorTests : RocksDBTests {
 		try! rocks.setData("value 3", forKey: "key 3")
 
 		var actual = [String]()
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.enumerateKeysAndValues(inReverse: true, using: { (key, value, stop) -> Void in
 			actual.append(String(data: key, encoding: .utf8)!)
@@ -248,7 +248,7 @@ class RocksDBIteratorTests : RocksDBTests {
 		try! rocks.setData("value 4", forKey: "key 4")
 
 		var actual = [String]()
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.enumerateKeysAndValues(in: RocksDBMakeKeyRange("key 2", nil), reverse: false) { (key, value, stop) -> Void in
 			actual.append(String(data: key, encoding: .utf8)!)
@@ -272,7 +272,7 @@ class RocksDBIteratorTests : RocksDBTests {
 		try! rocks.setData("value 4", forKey: "key 4")
 
 		var actual = [String]()
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.enumerateKeysAndValues(in: RocksDBMakeKeyRange(nil, "key 4"), reverse: false) { (key, value, stop) -> Void in
 			actual.append(String(data: key, encoding: .utf8)!)
@@ -296,7 +296,7 @@ class RocksDBIteratorTests : RocksDBTests {
 		try! rocks.setData("value 4", forKey: "key 4")
 
 		var actual = [String]()
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 
 		iterator.enumerateKeysAndValues(in: RocksDBMakeKeyRange("key 2", "key 4"), reverse: false) { (key, value, stop) -> Void in
 			actual.append(String(data: key, encoding: .utf8)!)

Tests/RocksDBMergeOperatorTests.swift

@@ -16,14 +16,18 @@ protocol DataConvertible {
 
 extension DataConvertible {
 	init?(data: Data) {
-		guard data.count == MemoryLayout<Self>.size else {
-			return nil
-		}
-		self = data.withUnsafeBytes { $0.pointee }
+        guard data.count == MemoryLayout<Self>.size else {
+            return nil
+        }
+        self = data.withUnsafeBytes { rawBufferPointer in
+            guard let pointer = rawBufferPointer.baseAddress?.assumingMemoryBound(to: Self.self) else {
+                fatalError()
+            }
+            return pointer.pointee
+        }
 	}
 	var data: Data {
-		var value = self
-		return Data(buffer: UnsafeBufferPointer(start: &value, count: 1))
+        withUnsafeBytes(of: self) { Data($0) }
 	}
 }
 

Tests/RocksDBPrefixExtractorTests.swift

@@ -23,7 +23,7 @@ class RocksDBPrefixExtractorTests : RocksDBTests {
 		try! rocks.setData("x", forKey: "101A")
 		try! rocks.setData("x", forKey: "101B")
 
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 		var keys = [String]()
 
 		iterator.enumerateKeys(withPrefix: "100", using: { (key, stop) -> Void in
@@ -97,7 +97,7 @@ class RocksDBPrefixExtractorTests : RocksDBTests {
 		try! rocks.setData("x", forKey: "1022")
 		try! rocks.setData("x", forKey: "5323")
 
-		let iterator = rocks.iterator()
+		let iterator = rocks.iterator()!
 		var keys = [String]()
 
 		iterator.enumerateKeys(withPrefix: "10", using: { (key, stop) -> Void in

Tests/RocksDBSnapshotTests.swift

@@ -20,7 +20,7 @@ class RocksDBSnapshotTests : RocksDBTests {
 		try! rocks.setData("value 2", forKey: "key 2")
 		try! rocks.setData("value 3", forKey: "key 3")
 
-		let snapshot = rocks.snapshot()
+		let snapshot = rocks.snapshot()!
 
 		try! rocks.deleteData(forKey: "key 1")
 		try! rocks.setData("value 4", forKey: "key 4")
@@ -45,13 +45,13 @@ class RocksDBSnapshotTests : RocksDBTests {
 		try! rocks.setData("value 2", forKey: "key 2")
 		try! rocks.setData("value 3", forKey: "key 3")
 
-		let snapshot = rocks.snapshot()
+		let snapshot = rocks.snapshot()!
 
 		try! rocks.deleteData(forKey: "key 1")
 		try! rocks.setData("value 4", forKey: "key 4")
 
 		var actual = [String]()
-		var iterator = snapshot.iterator()
+		var iterator = snapshot.iterator()!
 		iterator.enumerateKeys { (key, stop) -> Void in
 			actual.append(String(data: key, encoding: .utf8)!)
 		}
@@ -63,7 +63,7 @@ class RocksDBSnapshotTests : RocksDBTests {
 
 		actual.removeAll()
 
-		iterator = snapshot.iterator()
+		iterator = snapshot.iterator()!
 		iterator.enumerateKeys { (key, stop) -> Void in
 			actual.append(String(data: key, encoding: .utf8)!)
 		}
@@ -78,13 +78,13 @@ class RocksDBSnapshotTests : RocksDBTests {
 		})
 
 		try! rocks.setData("value 1", forKey: "key 1")
-		let snapshot1 = rocks.snapshot()
+		let snapshot1 = rocks.snapshot()!
 
 		try! rocks.setData("value 2", forKey: "key 2")
-		let snapshot2 = rocks.snapshot()
+		let snapshot2 = rocks.snapshot()!
 
 		try! rocks.setData("value 3", forKey: "key 3")
-		let snapshot3 = rocks.snapshot()
+		let snapshot3 = rocks.snapshot()!
 
 		XCTAssertEqual(snapshot1.sequenceNumber(), 1 as UInt64)
 		XCTAssertEqual(snapshot2.sequenceNumber(), 2 as UInt64)