Merge branch 'release/0.10.0'

iabudiab · Sep 29, 2019 · 3764b97 · 3764b97
2 parents 2baf339 + ee819f2
commit 3764b97
Show file tree

Hide file tree

Showing 15 changed files with 230 additions and 339 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,6 +27,6 @@ script:
   - set -o pipefail
   - xcodebuild -version
   - xcodebuild -showsdks
-  - travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c
-  - travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
-  - travis_wait 30 pod lib lint --skip-import-validation --allow-warnings --verbose
+  - travis_retry xcodebuild -quiet -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c
+  - travis_retry xcodebuild -quiet -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+  - travis_wait 30 pod lib lint --skip-import-validation --allow-warnings
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+
+## [0.10.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.10.0)
+
+Released on 2019.09.29
+
+- Updated to RocksDB `6.2.4`
+  - Thanks to @jurmous in PR #18
+
+
 ## [0.9.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.9.0)
 
 Released on 2017.05.25

diff --git a/Code/RocksDBCompactRangeOptions.h b/Code/RocksDBCompactRangeOptions.h
@@ -18,6 +18,7 @@ typedef NS_ENUM(NSUInteger, RocksDBBottommostLevelCompaction)
 	RocksDBBottommostLevelCompactionSkip,
 	RocksDBBottommostLevelCompactionIfHaveCompactionFilter,
 	RocksDBBottommostLevelCompactionForce,
+	RocksDBBottommostLevelCompactionForceOptimized
 };
 
 /**

diff --git a/Code/RocksDBCompactRangeOptions.mm b/Code/RocksDBCompactRangeOptions.mm
@@ -60,7 +60,9 @@ - (RocksDBBottommostLevelCompaction)bottommostLevelCompaction
 			return RocksDBBottommostLevelCompactionIfHaveCompactionFilter;
 		case rocksdb::BottommostLevelCompaction::kForce:
 			return RocksDBBottommostLevelCompactionForce;
-	}
+		case rocksdb::BottommostLevelCompaction::kForceOptimized:
+			return RocksDBBottommostLevelCompactionForceOptimized;
+    }
 }
 
 - (void)setBottommostLevelCompaction:(RocksDBBottommostLevelCompaction)bottommostLevelCompaction
@@ -72,7 +74,9 @@ - (void)setBottommostLevelCompaction:(RocksDBBottommostLevelCompaction)bottommos
 			_options.bottommost_level_compaction = rocksdb::BottommostLevelCompaction::kIfHaveCompactionFilter;
 		case RocksDBBottommostLevelCompactionForce:
 			_options.bottommost_level_compaction = rocksdb::BottommostLevelCompaction::kForce;
-	}
+		case RocksDBBottommostLevelCompactionForceOptimized:
+			_options.bottommost_level_compaction = rocksdb::BottommostLevelCompaction::kForceOptimized;
+    }
 }
 
 @end
diff --git a/Code/RocksDBError.mm b/Code/RocksDBError.mm
@@ -11,6 +11,7 @@
 #import <rocksdb/status.h>
 
 NSString * const RocksDBErrorDomain = @"co.braincookie.objectiverocks.error";
+NSString * const RocksDBSubcodeKey = @"rocksdb.subcode";
 
 @implementation RocksDBError
 
@@ -20,7 +21,8 @@ + (NSError *)errorWithRocksStatus:(rocksdb::Status)status
 
 	NSDictionary *userInfo = @{
 							   NSLocalizedDescriptionKey : @"Operation couldn't be completed",
-							   NSLocalizedFailureReasonErrorKey : reason
+							   NSLocalizedFailureReasonErrorKey : reason,
+                               RocksDBSubcodeKey: @(status.subcode())
 							   };
 
 	return [NSError errorWithDomain:RocksDBErrorDomain code:status.code() userInfo:userInfo];

diff --git a/Code/RocksDBMemTableRepFactory.h b/Code/RocksDBMemTableRepFactory.h
@@ -45,15 +45,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (instancetype)hashLinkListRepFactory;
 
-/**
- Creates cuckoo-hashing based MemTableRep. Cuckoo-hash is a closed-hash 
- strategy, in which all key/value pairs are stored in the bucket array 
- itself intead of in some data structures external to the bucket array.
- 
- @param writeBufferSize The write buffer size in bytes.
- */
-+ (instancetype)hashCuckooRepFactoryWithWriteBufferSize:(size_t)writeBufferSize;
-
 #endif
 
 @end

diff --git a/Code/RocksDBMemTableRepFactory.mm b/Code/RocksDBMemTableRepFactory.mm
@@ -42,11 +42,6 @@ + (instancetype)hashLinkListRepFactory
 	return [[self alloc] initWithNativeMemTableRepFactory:rocksdb::NewHashLinkListRepFactory()];
 }
 
-+ (instancetype)hashCuckooRepFactoryWithWriteBufferSize:(size_t)writeBufferSize
-{
-	return [[self alloc] initWithNativeMemTableRepFactory:rocksdb::NewHashCuckooRepFactory(writeBufferSize)];
-}
-
 #endif
 
 - (instancetype)initWithNativeMemTableRepFactory:(rocksdb::MemTableRepFactory *)factory

diff --git a/Framework/Info.plist b/Framework/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.0</string>
+	<string>0.10.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ObjectiveRocks.playground/Support.remap b/ObjectiveRocks.playground/Support.remap
@@ -1,2 +1,2 @@
 [
-]
+]
diff --git a/ObjectiveRocks.podspec b/ObjectiveRocks.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'ObjectiveRocks'
-  s.version           = '0.9.0'
+  s.version           = '0.10.0'
   s.summary           = 'Objective-C wrapper of RocksDB - A Persistent Key-Value Store for Flash and RAM Storage.'
   s.license           = 'MIT'
   s.homepage          = 'https://github.com/iabudiab/ObjectiveRocks'
-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
     [
-    ]
+    ]