Merge branch 'release/0.2.0'

iabudiab · Jan 2, 2015 · 3407b59 · 3407b59
2 parents eadd85c + 6d5f596
commit 3407b59
Show file tree

Hide file tree

Showing 50 changed files with 3,020 additions and 782 deletions.
diff --git a/ObjectiveRocks.xcodeproj/project.pbxproj b/ObjectiveRocks.xcodeproj/project.pbxproj
diff --git a/ObjectiveRocks/ObjectiveRocks.h b/ObjectiveRocks/ObjectiveRocks.h
@@ -7,6 +7,7 @@
 //
 
 #import "RocksDB.h"
+#import "RocksDBColumnFamily.h"
 #import "RocksDBOptions.h"
 #import "RocksDBReadOptions.h"
 #import "RocksDBWriteOptions.h"
@@ -15,3 +16,6 @@
 #import "RocksDBSnapshot.h"
 #import "RocksDBComparator.h"
 #import "RocksDBMergeOperator.h"
+
+#import "RocksDBTypes.h"
+#import "RocksDBError.h"
diff --git a/ObjectiveRocks/RocksDB.h b/ObjectiveRocks/RocksDB.h
@@ -7,31 +7,43 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "RocksDBColumnFamilyDescriptor.h"
 #import "RocksDBOptions.h"
 #import "RocksDBReadOptions.h"
 #import "RocksDBWriteOptions.h"
 #import "RocksDBWriteBatch.h"
 #import "RocksDBIterator.h"
 
+@class RocksDBColumnFamily;
 @class RocksDBSnapshot;
 
 @interface RocksDB : NSObject
 
++ (NSArray *)listColumnFamiliesInDatabaseAtPath:(NSString *)path;
+
 - (instancetype)initWithPath:(NSString *)path;
-- (instancetype)initWithPath:(NSString *)path andDBOptions:(void (^)(RocksDBOptions *options))options;
+- (instancetype)initWithPath:(NSString *)path
+				andDBOptions:(void (^)(RocksDBOptions *options))options;
+- (instancetype)initWithPath:(NSString *)path
+			  columnFamilies:(RocksDBColumnFamilyDescriptor *)descriptor
+		  andDatabaseOptions:(void (^)(RocksDBDatabaseOptions *options))options;
+
+- (void)close;
 
 - (void)setDefaultReadOptions:(void (^)(RocksDBReadOptions *readOptions))readOptions
 			  andWriteOptions:(void (^)(RocksDBWriteOptions *writeOptions))writeOptions;
 
-- (void)close;
+- (RocksDBColumnFamily *)createColumnFamilyWithName:(NSString *)name
+										 andOptions:(void (^)(RocksDBColumnFamilyOptions *options))optionsBlock;
+- (NSArray *)columnFamilies;
 
 @end
 
 @interface RocksDB (WriteOps)
 
 - (BOOL)setObject:(id)anObject forKey:(id)aKey;
 - (BOOL)setObject:(id)anObject forKey:(id)aKey error:(NSError **)error;
-- (BOOL)setObject:(id)anObject forKey:(id)aKey  writeOptions:(void (^)(RocksDBWriteOptions *writeOptions))writeOptionsBlock;
+- (BOOL)setObject:(id)anObject forKey:(id)aKey writeOptions:(void (^)(RocksDBWriteOptions *writeOptions))writeOptionsBlock;
 - (BOOL)setObject:(id)anObject forKey:(id)aKey error:(NSError **)error writeOptions:(void (^)(RocksDBWriteOptions *writeOptions))writeOptions;
 
 - (BOOL)setData:(NSData *)data forKey:(NSData *)aKey;
@@ -43,6 +55,11 @@
 
 @interface RocksDB (MergeOps)
 
+- (BOOL)mergeOperation:(NSString *)aMerge forKey:(id)aKey;
+- (BOOL)mergeOperation:(NSString *)aMerge forKey:(id)aKey error:(NSError **)error;
+- (BOOL)mergeOperation:(NSString *)aMerge forKey:(id)aKey writeOptions:(void (^)(RocksDBWriteOptions *writeOptions))writeOptions;
+- (BOOL)mergeOperation:(NSString *)aMerge forKey:(id)aKey error:(NSError **)error writeOptions:(void (^)(RocksDBWriteOptions *writeOptions))writeOptions;
+
 - (BOOL)mergeObject:(id)anObject forKey:(id)aKey;
 - (BOOL)mergeObject:(id)anObject forKey:(id)aKey error:(NSError **)error;
 - (BOOL)mergeObject:(id)anObject forKey:(id)aKey writeOptions:(void (^)(RocksDBWriteOptions *writeOptions))writeOptions;