Merge branch 'release/0.8.0'

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.2
+osx_image: xcode8.3
 
 branches:
   except:
@@ -15,15 +15,15 @@ env:
     - WORKSPACE=ObjectiveRocks.xcworkspace
     - IOS_FRAMEWORK_SCHEME=ObjectiveRocks-iOS
     - MACOS_FRAMEWORK_SCHEME=ObjectiveRocks
-    - IOS_SDK=iphonesimulator10.2
+    - IOS_SDK=iphonesimulator10.3
     - MACOS_SDK=macosx10.12
   matrix:
     - DESTINATION="arch=x86_64"                              SIMULATOR=""                                   SCHEME="$MACOS_FRAMEWORK_SCHEME"    SDK="$MACOS_SDK"
     - DESTINATION="OS=9.0,name=iPhone 6"                     SIMULATOR="iPhone 6 (9.0)"                     SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
     - DESTINATION="OS=9.1,name=iPhone 6 Plus"                SIMULATOR="iPhone 6 Plus (9.1)"                SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
     - DESTINATION="OS=9.2,name=iPhone 6S"                    SIMULATOR="iPhone 6S (9.2)"                    SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
     - DESTINATION="OS=9.3,name=iPhone 6S Plus"               SIMULATOR="iPhone 6S Plus (9.3)"               SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="OS=10.1,name=iPhone 7 Plus"               SIMULATOR="iPhone 7 Plus (10.1)"               SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=10.3.1,name=iPhone 7 Plus"             SIMULATOR="iPhone 7 Plus (10.3.1)"             SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
 
 script:
   - set -o pipefail

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Change Log
 
+## [0.8.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.8.0)
+
+Released on 2017.07.13
+
+- RocksDB Version: `5.4.6`: [facebook/rocksdb@6e05979](https://github.com/facebook/rocksdb/commit/6e0597951e51e8dd3b28104d31e52962e00c101f)
+
+### Updated
+
+- Updated Column Family options:
+	- `uint32_t memtablePrefixBloomProbes` ~> `double memtablePrefixBloomSizeRatio`
+	- `size_t memtablePrefixBloomHugePageTlbSize` ~> `size_t memtableHugePageTlbSize`
+- Updated Statistics tickers and histograms
+
+### Removed
+
+- Removed obsolete DB options:
+	- `BOOL disableDataSync`
+- Removed obsolete Column Family options:
+	- `int expandedCompactionFactor`
+	- `int sourceCompactionFactor`
+	- `int maxGrandparentOverlapFactor`
+	- `BOOL verifyChecksumsInCompaction`
+	- `BOOL filterDeletes`
+	- `uint32_t memtablePrefixBloomBits`
+	- `uint32_t minPartialMergeOperands`
+
 ## [0.7.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.7.0)
 
 Released on 2017.02.19

Code/RocksDB.h

@@ -19,7 +19,7 @@
 #import "RocksDBIterator.h"
 
 #if !(defined(ROCKSDB_LITE) && defined(TARGET_OS_IPHONE))
-#import "RocksDBColumnFamilyMetaData.h"
+#import "RocksDBColumnFamilyMetadata.h"
 #import "RocksDBIndexedWriteBatch.h"
 #import "RocksDBProperties.h"
 #endif

Code/RocksDBColumnFamilyMetaData+Private.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 BrainCookie. All rights reserved.
 //
 
-#import "RocksDBColumnFamilyMetaData.h"
+#import "RocksDBColumnFamilyMetadata.h"
 
 namespace rocksdb {
 	class ColumnFamilyMetaData;

Code/RocksDBColumnFamilyMetadata.mm

@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 BrainCookie. All rights reserved.
 //
 
-#import "RocksDBColumnFamilyMetaData.h"
+#import "RocksDBColumnFamilyMetadata.h"
 #import "RocksDBColumnFamilyMetaData+Private.h"
 
 #import <rocksdb/metadata.h>

Code/RocksDBColumnFamilyOptions.h

@@ -108,16 +108,6 @@ typedef NS_ENUM(char, RocksDBCompressionType)
 /** @brief Default: 10 */
 @property (nonatomic, assign) int maxBytesForLevelMultiplier;
 
-/** @brief  Maximum number of bytes in all compacted files. */
-@property (nonatomic, assign) int expandedCompactionFactor;
-
-/** @brief Maximum number of bytes in all source files to be compacted in a
- single compaction run. */
-@property (nonatomic, assign) int sourceCompactionFactor;
-
-/** @brief Control maximum bytes of overlaps in grandparent (i.e., level+2) */
-@property (nonatomic, assign) int maxGrandparentOverlapFactor;
-
 /** @brief Puts are delayed 0-1 ms when any level has a compaction score that
  exceeds this limit.
  Default: 0 (disabled)
@@ -142,17 +132,6 @@ typedef NS_ENUM(char, RocksDBCompressionType)
 /** @brief Purge duplicate/deleted keys when a memtable is flushed to storage. */
 @property (nonatomic, assign) BOOL purgeRedundantKvsWhileFlush;
 
-/** @brief If true, compaction will verify checksum on every read that happens
- as part of compaction.
- Default: true
- */
-@property (nonatomic, assign) BOOL verifyChecksumsInCompaction;
-
-/** @brief Use KeyMayExist API to filter deletes when this is true.
- Default: false
- */
-@property (nonatomic, assign) BOOL filterDeletes;
-
 /** @brief An iteration->Next() sequentially skips over keys with the same
  user-key unless this option is set.
  Default: 0
@@ -176,17 +155,14 @@ typedef NS_ENUM(char, RocksDBCompressionType)
 @property (nonatomic, strong, nullable) RocksDBTableFactory *tableFacotry;
 
 /** @brief If prefixExtractor is set and bloom_bits is not 0, create prefix bloom
- for memtable.
+ for memtable. If it is larger than 0.25, it is santinized to 0.25.
 
  @see RocksDBPrefixExtractor
  */
-@property (nonatomic, assign) uint32_t memtablePrefixBloomBits;
-
-/** @brief Number of hash probes per key. */
-@property (nonatomic, assign) uint32_t memtablePrefixBloomProbes;
+@property (nonatomic, assign) double memtablePrefixBloomSizeRatio;
 
 /** @brief Page size for huge page TLB for bloom in memtable. */
-@property (nonatomic, assign) size_t memtablePrefixBloomHugePageTlbSize;
+@property (nonatomic, assign) size_t memtableHugePageTlbSize;
 
 /** @brief Control locality of bloom filter probes to improve cache miss rate.
  Default: 0
@@ -198,12 +174,6 @@ typedef NS_ENUM(char, RocksDBCompressionType)
  */
 @property (nonatomic, assign) size_t maxSuccessiveMerges;
 
-/** @brief The number of partial merge operands to accumulate before partial
- merge will be performed.
- Default: 2
- */
-@property (nonatomic, assign) uint32_t minPartialMergeOperands;
-
 @end
 
 NS_ASSUME_NONNULL_END

Code/RocksDBColumnFamilyOptions.mm

@@ -221,36 +221,6 @@ - (int)maxBytesForLevelMultiplier
 	return _options.max_bytes_for_level_multiplier;
 }
 
-- (void)setExpandedCompactionFactor:(int)expandedCompactionFactor
-{
-	_options.expanded_compaction_factor = expandedCompactionFactor;
-}
-
-- (int)expandedCompactionFactor
-{
-	return _options.expanded_compaction_factor;
-}
-
-- (void)setSourceCompactionFactor:(int)sourceCompactionFactor
-{
-	_options.source_compaction_factor = sourceCompactionFactor;
-}
-
-- (int)sourceCompactionFactor
-{
-	return _options.source_compaction_factor;
-}
-
-- (void)setMaxGrandparentOverlapFactor:(int)maxGrandparentOverlapFactor
-{
-	_options.max_grandparent_overlap_factor = maxGrandparentOverlapFactor;
-}
-
-- (int)maxGrandparentOverlapFactor
-{
-	return _options.max_grandparent_overlap_factor;
-}
-
 - (void)setSoftRateLimit:(double)softRateLimit
 {
 	_options.soft_rate_limit = softRateLimit;
@@ -301,26 +271,6 @@ - (BOOL)purgeRedundantKvsWhileFlush
 	return _options.purge_redundant_kvs_while_flush;
 }
 
-- (void)setVerifyChecksumsInCompaction:(BOOL)verifyChecksumsInCompaction
-{
-	_options.verify_checksums_in_compaction = verifyChecksumsInCompaction;
-}
-
-- (BOOL)verifyChecksumsInCompaction
-{
-	return _options.verify_checksums_in_compaction;
-}
-
-- (void)setFilterDeletes:(BOOL)filterDeletes
-{
-	_options.filter_deletes = filterDeletes;
-}
-
-- (BOOL)filterDeletes
-{
-	return _options.filter_deletes;
-}
-
 - (void)setMaxSequentialSkipInIterations:(uint64_t)maxSequentialSkipInIterations
 {
 	_options.max_sequential_skip_in_iterations = maxSequentialSkipInIterations;
@@ -353,34 +303,24 @@ - (RocksDBTableFactory *)tableFacotry
 	return _tableFactoryWrapper;
 }
 
-- (void)setMemtablePrefixBloomBits:(uint32_t)memtablePrefixBloomBits
+- (void)setMemtablePrefixBloomSizeRatio:(double)memtablePrefixBloomSizeRatio
 {
-	_options.memtable_prefix_bloom_bits = memtablePrefixBloomBits;
+	_options.memtable_prefix_bloom_size_ratio = memtablePrefixBloomSizeRatio;
 }
 
-- (uint32_t)memtablePrefixBloomBits
+- (double)memtablePrefixBloomSizeRatio
 {
-	return _options.memtable_prefix_bloom_bits;
+	return _options.memtable_prefix_bloom_size_ratio;
 }
 
-- (void)setMemtablePrefixBloomProbes:(uint32_t)memtablePrefixBloomProbes
+- (void)setMemtableHugePageTlbSize:(size_t)memtableHugePageTlbSize
 {
-	_options.memtable_prefix_bloom_probes = memtablePrefixBloomProbes;
+	_options.memtable_huge_page_size = memtableHugePageTlbSize;
 }
 
-- (uint32_t)memtablePrefixBloomProbes
+- (size_t)memtableHugePageTlbSize
 {
-	return _options.memtable_prefix_bloom_probes;
-}
-
-- (void)setMemtablePrefixBloomHugePageTlbSize:(size_t)memtablePrefixBloomHugePageTlbSize
-{
-	_options.memtable_prefix_bloom_huge_page_tlb_size = memtablePrefixBloomHugePageTlbSize;
-}
-
-- (size_t)memtablePrefixBloomHugePageTlbSize
-{
-	return _options.memtable_prefix_bloom_huge_page_tlb_size;
+	return _options.memtable_huge_page_size;
 }
 
 - (void)setBloomLocality:(uint32_t)bloomLocality
@@ -403,14 +343,4 @@ - (size_t)maxSuccessiveMerges
 	return _options.max_successive_merges;
 }
 
-- (void)setMinPartialMergeOperands:(uint32_t)minPartialMergeOperands
-{
-	_options.min_partial_merge_operands = minPartialMergeOperands;
-}
-
-- (uint32_t)minPartialMergeOperands
-{
-	return _options.min_partial_merge_operands;
-}
-
 @end

Code/RocksDBDatabaseOptions.h

@@ -68,11 +68,6 @@ typedef NS_ENUM(unsigned char, RocksDBLogLevel)
  */
 @property (nonatomic, strong, nullable) RocksDBStatistics *statistics;
 
-/** @brief If true, then the contents of manifest and data files are not
- synced to stable storage.
- The default is false. */
-@property (nonatomic, assign) BOOL disableDataSync;
-
 /** @brief If true, then every store to stable storage will issue a fsync.
  The default is false. */
 @property (nonatomic, assign) BOOL useFSync;

Code/RocksDBDatabaseOptions.mm

@@ -123,16 +123,6 @@ - (void)setStatistics:(RocksDBStatistics *)statistics
 	_options.statistics = _statisticsWrapper.statistics;
 }
 
-- (BOOL)disableDataSync
-{
-	return _options.disableDataSync;
-}
-
-- (void)setDisableDataSync:(BOOL)disableDataSync
-{
-	_options.disableDataSync = disableDataSync;
-}
-
 - (BOOL)useFSync
 {
 	return _options.use_fsync;

Code/RocksDBMergeOperator.mm

@@ -12,7 +12,7 @@
 #import "RocksDBCallbackMergeOperator.h"
 
 #import <rocksdb/slice.h>
-#import <Rocksdb/env.h>
+#import <rocksdb/env.h>
 
 #pragma mark - Extension