rocksdb-ruby 0.2.3 → 1.0.0

data/ext/rocksdb/rocksdb_db_rb.h

@@ -1,30 +1,39 @@
 #include "rocksdb/db.h"
 #include "rocksdb/write_batch.h"
+#include "rocksdb/utilities/convenience.h"
 
 extern "C" {
 #include <ruby.h>
-  VALUE rocksdb_db_init(int argc, VALUE* argv, VALUE self);
-  VALUE rocksdb_db_init2(int argc, VALUE* argv, VALUE self);
+  VALUE rocksdb_db_init(VALUE self, VALUE v_db_path, VALUE v_readonly, VALUE v_db_options);
   VALUE db_alloc(VALUE klass);
+
+  VALUE rocksdb_db_close(VALUE self);
   VALUE rocksdb_db_put(VALUE self, VALUE v_key, VALUE v_value);
   VALUE rocksdb_db_write(VALUE self, VALUE v_write);
   VALUE rocksdb_db_property(VALUE self, VALUE v_key);
+  VALUE rocksdb_db_options(VALUE self);
   VALUE rocksdb_db_get(VALUE self, VALUE v_key);
   VALUE rocksdb_db_multi_get(VALUE self, VALUE v_array);
   VALUE rocksdb_db_delete(VALUE self, VALUE v_key);
   VALUE rocksdb_db_exists(VALUE self, VALUE v_key);
-  VALUE rocksdb_db_close(VALUE self);
+
   VALUE rocksdb_db_debug(VALUE self);
-  VALUE rocksdb_db_is_readonly(VALUE self);
+  VALUE rocksdb_db_is_writable(VALUE self);
   VALUE rocksdb_db_is_open(VALUE self);
-  VALUE rocksdb_db_new_iterator(VALUE self);
+  VALUE rocksdb_db_to_iterator(VALUE self);
   VALUE rocksdb_db_each(VALUE self);
-  VALUE rocksdb_db_each_index(VALUE self);
-  VALUE rocksdb_db_each_with_index(VALUE self);
   VALUE rocksdb_db_reverse_each(VALUE self);
+  VALUE rocksdb_db_each_key(VALUE self);
+  VALUE rocksdb_db_each_pair(VALUE self);
+  VALUE rocksdb_db_each_prefix(VALUE self, VALUE v_prefix);
+  VALUE rocksdb_db_each_range(VALUE self, VALUE v_start, VALUE v_limit);
   VALUE rocksdb_db_compact(int argc, VALUE* argv, VALUE self);
+
+  VALUE raise_status_error(rocksdb::Status *status);
   void db_free(rocksdb_pointer* db_pointer);
-  void set_opt(rocksdb::Options* opt, VALUE *v_options);
-  void set_opt_unit_val(uint64_t* opt, char* name, VALUE *v_options);
-  void set_opt_int_val(int* opt, char* name, VALUE *v_options);
+
+  rocksdb_pointer* get_db(VALUE *self);
+  rocksdb_pointer* get_db_for_read(VALUE *self);
+  rocksdb_pointer* get_db_for_write(VALUE *self);
+  void check_is_db_ready(rocksdb_pointer *db_pointer);
 }

data/ext/rocksdb/rocksdb_iterator_rb.cc

@@ -1,83 +1,328 @@
 #include "rocksdb_rb.h"
 #include "rocksdb_batch_rb.h"
+#include "rocksdb_iterator_rb.h"
 #include "ruby/encoding.h"
 #include <iostream>
 
 extern "C" {
 #include <ruby.h>
+#define RB_CLOSE_ITERATOR(klass) (rb_funcall(klass, rb_intern("close"), 0))
+#define RB_TO_ENUM(klass, method_name) (rb_funcall(klass, rb_intern("to_enum"), 1, ID2SYM(rb_intern(method_name))))
+#define RB_TO_ENUM_ARGS(klass, method_name, argc, args...) (rb_funcall(klass, rb_intern("to_enum"), argc + 1, ID2SYM(rb_intern(method_name)), args))
+
+  VALUE rocksdb_iterator_alloc(VALUE klass){
+    rocksdb_iterator_pointer* pointer = ALLOC(rocksdb_iterator_pointer);
+    pointer->it = nullptr;
+    pointer->db_pointer = nullptr;
+    return Data_Wrap_Struct(klass, 0, iterator_free, pointer);
+  }
+
+  void iterator_free(rocksdb_iterator_pointer* pointer){
+    if(pointer == nullptr) {
+      return;
+    }
+
+    pointer->db_pointer = nullptr;
+
+    delete pointer;
+    pointer = nullptr;
+  }
 
   VALUE rocksdb_iterator_seek_to_first(VALUE klass){
-    rocksdb_iterator_pointer* rocksdb_it;
-    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
-    rocksdb_it->it->SeekToFirst();
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
 
-    return Qnil;
+    pointer->it->SeekToFirst();
+
+    return Qtrue;
   }
 
   VALUE rocksdb_iterator_seek_to_last(VALUE klass){
-    rocksdb_iterator_pointer* rocksdb_it;
-    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
-    rocksdb_it->it->SeekToLast();
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
+    pointer->it->SeekToLast();
 
-    return Qnil;
+    return Qtrue;
   }
 
   VALUE rocksdb_iterator_seek(VALUE klass, VALUE v_target){
-    Check_Type(v_target, T_STRING);
-    rocksdb::Slice target = rocksdb::Slice((char*)RSTRING_PTR(v_target), RSTRING_LEN(v_target));
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
 
-    rocksdb_iterator_pointer* rocksdb_it;
-    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
-    rocksdb_it->it->Seek(target);
+    rocksdb::Slice target = SLICE_FROM_RB_VALUE(v_target);
+    pointer->it->Seek(target);
 
-    return Qnil;
+    return Qtrue;
   }
 
-  VALUE rocksdb_iterator_alloc(VALUE klass){
-    rocksdb_iterator_pointer* it = ALLOC(rocksdb_iterator_pointer);
-    return Data_Wrap_Struct(klass, 0, -1, it);
+#if ROCKSDB_VERSION >= 41100
+  VALUE rocksdb_iterator_seek_for_prev(VALUE klass, VALUE v_target){
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
+
+    rocksdb::Slice target = SLICE_FROM_RB_VALUE(v_target);
+
+    pointer->it->SeekForPrev(target);
+
+    return Qtrue;
   }
+#endif
 
   VALUE rocksdb_iterator_valid(VALUE klass){
-    rocksdb_iterator_pointer* rocksdb_it;
-    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
-    return rocksdb_it->it->Valid() ? Qtrue : Qfalse;
+    rocksdb_iterator_pointer* pointer = get_iterator(&klass);
+
+    if(pointer != NULL && pointer->it != NULL) {
+      return pointer->it->Valid() ? Qtrue : Qfalse;
+    }
+
+    // Return falsey Qnil to indicate that iterator is closed
+    return Qnil;
   }
 
   VALUE rocksdb_iterator_key(VALUE klass){
-    rocksdb_iterator_pointer* rocksdb_it;
-    std::string value;
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
 
-    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
-    value = rocksdb_it->it->key().ToString();
+    // It seems to be safe to call `key()` even if iterator is not Valid()
+    rocksdb::Slice key = pointer->it->key();
 
-    return rb_enc_str_new(value.data(), value.size(), rb_utf8_encoding());
+    return SLICE_TO_RB_STRING(key);
   }
-  
+
   VALUE rocksdb_iterator_value(VALUE klass){
-    rocksdb_iterator_pointer* rocksdb_it;
-    std::string value;
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
 
-    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
-    value = rocksdb_it->it->value().ToString();
+    // It it not safe to call `value()` if iterator is not Valid()
+    if(!pointer->it->Valid()) {
+      return Qnil;
+    }
 
-    return rb_enc_str_new(value.data(), value.size(), rb_utf8_encoding());
+    rocksdb::Slice value = pointer->it->value();
 
+    return SLICE_TO_RB_STRING(value);
   }
-  
+
   VALUE rocksdb_iterator_next(VALUE klass){
-    rocksdb_iterator_pointer* rocksdb_it;
-    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
-    rocksdb_it->it->Next();
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
 
-    return Qnil;
+    pointer->it->Next();
+
+    return Qtrue;
+  }
+
+  VALUE rocksdb_iterator_prev(VALUE klass){
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
+
+    pointer->it->Prev();
+
+    return Qtrue;
+  }
+
+  VALUE rocksdb_iterator_each(VALUE klass){
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
+
+    if(!rb_block_given_p()){
+      return RB_TO_ENUM(klass, "each");
+    }
+
+    rocksdb::Iterator* it = pointer->it;
+
+    for (it->SeekToFirst(); it->Valid(); it->Next()) {
+      VALUE v_value = SLICE_TO_RB_STRING(it->value());
+
+      rb_yield(v_value);
+    }
+
+    RB_CLOSE_ITERATOR(klass);
+    return Qtrue;
+  }
+
+  VALUE rocksdb_iterator_reverse_each(VALUE klass){
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
+
+    if(!rb_block_given_p()){
+      return RB_TO_ENUM(klass, "reverse_each");
+    }
+
+    rocksdb::Iterator* it = pointer->it;
+
+    for (it->SeekToLast(); it->Valid(); it->Prev()) {
+      VALUE v_value = SLICE_TO_RB_STRING(it->value());
+      rb_yield(v_value);
+    }
+
+    RB_CLOSE_ITERATOR(klass);
+    return Qtrue;
+  }
+
+  VALUE rocksdb_iterator_each_key(VALUE klass){
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
+
+    if(!rb_block_given_p()){
+      return RB_TO_ENUM(klass, "each_key");
+    }
+
+    rocksdb::Iterator* it = pointer->it;
+
+    for (it->SeekToFirst(); it->Valid(); it->Next()) {
+      VALUE v_key = SLICE_TO_RB_STRING(it->key());
+
+      rb_yield(v_key);
+    }
+
+    RB_CLOSE_ITERATOR(klass);
+    return Qtrue;
+  }
+
+  VALUE rocksdb_iterator_reverse_each_key(VALUE klass){
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
+
+    if(!rb_block_given_p()){
+      return RB_TO_ENUM(klass, "reverse_each_key");
+    }
+
+    rocksdb::Iterator* it = pointer->it;
+
+    for (it->SeekToLast(); it->Valid(); it->Prev()) {
+      VALUE v_key = SLICE_TO_RB_STRING(it->key());
+      rb_yield(v_key);
+    }
+
+    RB_CLOSE_ITERATOR(klass);
+    return Qtrue;
+  }
+
+  VALUE rocksdb_iterator_each_pair(VALUE klass){
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
+
+    if(!rb_block_given_p()){
+      return RB_TO_ENUM(klass, "each_pair");
+    }
+
+    rocksdb::Iterator* it = pointer->it;
+
+    for (it->SeekToFirst(); it->Valid(); it->Next()) {
+      VALUE v_key = SLICE_TO_RB_STRING(it->key());
+      VALUE v_value = SLICE_TO_RB_STRING(it->value());
+
+      rb_yield_values(2, v_key, v_value);
+    }
+
+    RB_CLOSE_ITERATOR(klass);
+    return Qtrue;
+  }
+
+  VALUE rocksdb_iterator_reverse_each_pair(VALUE klass){
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
+
+    if(!rb_block_given_p()){
+      return RB_TO_ENUM(klass, "reverse_each_pair");
+    }
+
+    rocksdb::Iterator* it = pointer->it;
+
+    for (it->SeekToLast(); it->Valid(); it->Prev()) {
+      VALUE v_key = SLICE_TO_RB_STRING(it->key());
+      VALUE v_value = SLICE_TO_RB_STRING(it->value());
+
+      rb_yield_values(2, v_key, v_value);
+    }
+
+    RB_CLOSE_ITERATOR(klass);
+    return Qtrue;
+  }
+
+  VALUE rocksdb_iterator_each_prefix(VALUE klass, VALUE v_prefix){
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
+
+    if(!rb_block_given_p()){
+      return RB_TO_ENUM_ARGS(klass, "each_prefix", 1, v_prefix);
+    }
+
+    rocksdb::Iterator* it = pointer->it;
+    rocksdb::Slice prefix = SLICE_FROM_RB_VALUE(v_prefix);
+
+    for (it->Seek(prefix); it->Valid() && it->key().starts_with(prefix); it->Next()) {
+      VALUE v_key = SLICE_TO_RB_STRING(it->key());
+      VALUE v_value = SLICE_TO_RB_STRING(it->value());
+
+      rb_yield_values(2, v_key, v_value);
+    }
+
+    RB_CLOSE_ITERATOR(klass);
+    return Qtrue;
+  }
+
+  VALUE rocksdb_iterator_each_range(VALUE klass, VALUE v_start, VALUE v_limit){
+    rocksdb_iterator_pointer* pointer = get_iterator_for_read(&klass);
+
+    if(!rb_block_given_p()){
+      return RB_TO_ENUM_ARGS(klass, "each_range", 2, v_start, v_limit);
+    }
+
+    rocksdb::Iterator* it = pointer->it;
+    rocksdb::Slice start = SLICE_FROM_RB_VALUE(v_start);
+    std::string limit = STRING_FROM_RB_VALUE(v_limit);
+
+    for (it->Seek(start); it->Valid() && it->key().ToString() <= limit; it->Next()) {
+      VALUE v_key = SLICE_TO_RB_STRING(it->key());
+      VALUE v_value = SLICE_TO_RB_STRING(it->value());
+
+      rb_yield_values(2, v_key, v_value);
+    }
+
+    RB_CLOSE_ITERATOR(klass);
+    return Qtrue;
   }
 
   VALUE rocksdb_iterator_close(VALUE klass){
-    rocksdb_iterator_pointer* rocksdb_it;
-    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
-    delete rocksdb_it->it;
+    rocksdb_iterator_pointer* pointer = get_iterator(&klass);
 
-    return Qnil;
+    if(pointer == nullptr) {
+      return Qfalse;
+    }
+
+    if(pointer->db_pointer == nullptr) {
+      return Qfalse;
+    }
+
+    if (pointer->db_pointer->db == nullptr) {
+      return Qfalse;
+    }
+
+    if(pointer->it == nullptr) {
+      return Qfalse;
+    }
+
+    pointer->db_pointer = nullptr;
+
+    delete pointer->it;
+    pointer->it = nullptr;
+
+    return Qtrue;
+  }
+
+  rocksdb_iterator_pointer* get_iterator_for_read(VALUE *klass) {
+    rocksdb_iterator_pointer* pointer = get_iterator(klass);
+
+    if (pointer == nullptr) {
+      rb_raise(cRocksdb_iterator_closed, "iterator is not initialized");
+    }
+
+    if (pointer->it == nullptr) {
+      rb_raise(cRocksdb_iterator_closed, "iterator is closed");
+    }
+
+    if (pointer->db_pointer == nullptr) {
+      rb_raise(cRocksdb_database_closed, "database is not initialized");
+    }
+
+    if (pointer->db_pointer->db == nullptr) {
+      rb_raise(cRocksdb_database_closed, "database is closed");
+    }
+
+    return pointer;
+  }
+
+  rocksdb_iterator_pointer* get_iterator(VALUE *klass) {
+    rocksdb_iterator_pointer* pointer;
+    Data_Get_Struct(*klass, rocksdb_iterator_pointer, pointer);
+
+    return pointer;
   }
 }

data/ext/rocksdb/rocksdb_iterator_rb.h

@@ -4,18 +4,35 @@
 extern "C" {
 
 #include <ruby.h>
-  
+
   typedef VALUE (*METHOD)(...);
+  rocksdb_iterator_pointer* get_iterator(VALUE *klass);
+  rocksdb_iterator_pointer* get_iterator_for_read(VALUE *klass);
+  void iterator_free(rocksdb_iterator_pointer* pointer);
+  VALUE rocksdb_iterator_alloc(VALUE klass);
 
+  VALUE rocksdb_iterator_seek(VALUE klass, VALUE v_target);
+  VALUE rocksdb_iterator_seek_for_prev(VALUE klass, VALUE v_target);
   VALUE rocksdb_iterator_seek_to_first(VALUE klass);
   VALUE rocksdb_iterator_seek_to_last(VALUE klass);
-  VALUE rocksdb_iterator_seek(VALUE klass, VALUE v_target);
-  VALUE rocksdb_iterator_alloc(VALUE klass);
+
   VALUE rocksdb_iterator_valid(VALUE klass);
   VALUE rocksdb_iterator_key(VALUE klass);
   VALUE rocksdb_iterator_value(VALUE klass);
   VALUE rocksdb_iterator_next(VALUE klass);
+  VALUE rocksdb_iterator_prev(VALUE klass);
   VALUE rocksdb_iterator_close(VALUE klass);
 
-} 
- 
+  VALUE rocksdb_iterator_each(VALUE klass);
+  VALUE rocksdb_iterator_reverse_each(VALUE klass);
+
+  VALUE rocksdb_iterator_each_key(VALUE klass);
+  VALUE rocksdb_iterator_reverse_each_key(VALUE klass);
+
+  VALUE rocksdb_iterator_each_pair(VALUE klass);
+  VALUE rocksdb_iterator_reverse_each_pair(VALUE klass);
+
+  VALUE rocksdb_iterator_each_prefix(VALUE klass, VALUE v_prefix);
+  VALUE rocksdb_iterator_each_range(VALUE klass, VALUE v_start, VALUE v_limit);
+}
+