rocksdb-ruby 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46f12f1cc2ae83812abc436dc6fdb65bdf6da63e
-  data.tar.gz: f992fc491b591ed135b0c058532d887516c30f87
+  metadata.gz: 02a4d4a14d208c82b4350ad74137d5dc61787981
+  data.tar.gz: 11cb366cd0278dc76275ff163f450e8e18564a6d
 SHA512:
-  metadata.gz: c86f72482d414946e8811c3132f3619b6746bd6a91e3233a7e81aab6939fd6b21707db83fcdf845494035ace83b917539c261594120ef9e399f5b367981bdad5
-  data.tar.gz: 800ed46a8fb0fda34ccb8517abf8d200eb8d8b74d3658550d371fbf2f82638da03c564cdc9278cb9c909a013e16b97026152e939e48c44e073544aeb4c143a42
+  metadata.gz: 67921bce1b5f49bee1861089067ee59a9380913356e20455b8135dfe498c2799c5c9b88802221709aa09522442504c1a4e2c2a13d25e806af18c98184f552a0c
+  data.tar.gz: 0cdcbd2d5aa177d1c85db02ac03fe2f83562a9510357228ee36ce699fe527d1e6e4243aaa5d311a09b63c3775bcab19e6c71094c4cd1aacbfe5a36fca70c0ffc

data/ext/rocksdb/rocksdb_db_rb.cc

@@ -26,7 +26,7 @@ extern "C" {
     if (TYPE(v_options) == T_HASH) {
       VALUE v = rb_hash_aref(v_options, ID2SYM(rb_intern("readonly")));
       if(v == Qtrue){
-	readonly = true;
+        readonly = true;
       }
       set_opt(&options, &v_options);
     }
@@ -42,9 +42,19 @@ extern "C" {
     }
 
     db_pointer->db = db;
-
+    db_pointer->readonly = readonly;
+    
     return status.ok() ? Qtrue : Qfalse;
   }
+  VALUE rocksdb_db_init2(int argc, VALUE* argv, VALUE self) {
+    rocksdb_pointer* db_pointer;
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+    db_pointer->db = NULL;
+
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+
+    return Qtrue;
+  }
 
   void set_opt_unit_val(uint64_t* opt, char* name, VALUE *v_options){
 
@@ -80,7 +90,12 @@ extern "C" {
     std::string key = std::string((char*)RSTRING_PTR(v_key), RSTRING_LEN(v_key));
     std::string value = std::string((char*)RSTRING_PTR(v_value), RSTRING_LEN(v_value));
 
-    // std::cout << key << "\n";
+    if (db_pointer->db == NULL) {
+      rb_raise(rb_eRuntimeError, "db not open");
+    }
+    if (db_pointer->readonly) {
+      rb_raise(rb_eRuntimeError, "readonly");
+    }
     rocksdb::Status status = db_pointer->db->Put(rocksdb::WriteOptions(), key, value);
     
     return status.ok() ? Qtrue : Qfalse;
@@ -93,6 +108,12 @@ extern "C" {
     rocksdb::WriteBatch *batch;
     Data_Get_Struct(v_write, rocksdb::WriteBatch, batch);
 
+    if (db_pointer->db == NULL) {
+      rb_raise(rb_eRuntimeError, "db not open");
+    }
+    if (db_pointer->readonly) {
+      rb_raise(rb_eRuntimeError, "readonly");
+    }
     rocksdb::Status status = db_pointer->db->Write(rocksdb::WriteOptions(), batch);
     return status.ok() ? Qtrue : Qfalse;
   }
@@ -102,9 +123,11 @@ extern "C" {
 
     rocksdb_pointer* db_pointer;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
-    
     std::string key = std::string((char*)RSTRING_PTR(v_key), RSTRING_LEN(v_key));
     std::string value;
+    if (db_pointer->db == NULL) {
+      rb_raise(rb_eRuntimeError, "db not open");
+    }
     rocksdb::Status status = db_pointer->db->Get(rocksdb::ReadOptions(), key, &value);    
 
     return (status.IsNotFound()) ? Qnil : rb_enc_str_new(value.data(), value.size(), rb_utf8_encoding());
@@ -129,6 +152,9 @@ extern "C" {
       keys[i] = rocksdb::Slice((char*)RSTRING_PTR(op), RSTRING_LEN(op));
     }
 
+    if (db_pointer->db == NULL) {
+      rb_raise(rb_eRuntimeError, "db not open");
+    }
     status = db_pointer->db->MultiGet(rocksdb::ReadOptions(),keys,&values);
     for(i=0; i < length; i++){
       rb_ary_store(v_array, i, rb_enc_str_new(values[i].data(), values[i].size(), rb_utf8_encoding()));
@@ -143,6 +169,12 @@ extern "C" {
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
 
     std::string key = std::string((char*)RSTRING_PTR(v_key), RSTRING_LEN(v_key));
+    if (db_pointer->db == NULL) {
+      rb_raise(rb_eRuntimeError, "db not open");
+    }
+    if (db_pointer->readonly) {
+      rb_raise(rb_eRuntimeError, "readonly");
+    }
     rocksdb::Status status = db_pointer->db->Delete(rocksdb::WriteOptions(), key);
     
     return status.ok() ? Qtrue : Qfalse;
@@ -157,6 +189,9 @@ extern "C" {
     std::string key = std::string((char*)RSTRING_PTR(v_key), RSTRING_LEN(v_key));
     std::string value = std::string();
     
+    if (db_pointer->db == NULL) {
+      rb_raise(rb_eRuntimeError, "db not open");
+    }
     return db_pointer->db->KeyMayExist(rocksdb::ReadOptions(), key, &value) ? Qtrue : Qfalse;
   }  
 
@@ -186,6 +221,9 @@ extern "C" {
     VALUE klass;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
 
+    if (db_pointer->db == NULL) {
+      rb_raise(rb_eRuntimeError, "db not open");
+    }
     rocksdb::Iterator* it = db_pointer->db->NewIterator(rocksdb::ReadOptions());
 
     klass = rb_class_new_instance(0, NULL, cRocksdb_iterator);
@@ -203,6 +241,9 @@ extern "C" {
     
     rocksdb_pointer* db_pointer;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+    if (db_pointer->db == NULL) {
+      rb_raise(rb_eRuntimeError, "db not open");
+    }
     rocksdb::Iterator* it = db_pointer->db->NewIterator(rocksdb::ReadOptions());
 
     for (it->SeekToFirst(); it->Valid(); it->Next()) {
@@ -220,6 +261,9 @@ extern "C" {
     
     rocksdb_pointer* db_pointer;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+    if (db_pointer->db == NULL) {
+      rb_raise(rb_eRuntimeError, "db not open");
+    }
     rocksdb::Iterator* it = db_pointer->db->NewIterator(rocksdb::ReadOptions());
 
     for (it->SeekToFirst(); it->Valid(); it->Next()) {
@@ -237,6 +281,9 @@ extern "C" {
     
     rocksdb_pointer* db_pointer;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+    if (db_pointer->db == NULL) {
+      rb_raise(rb_eRuntimeError, "db not open");
+    }
     rocksdb::Iterator* it = db_pointer->db->NewIterator(rocksdb::ReadOptions());
 
     for (it->SeekToFirst(); it->Valid(); it->Next()) {
@@ -254,6 +301,9 @@ extern "C" {
   VALUE rocksdb_db_reverse_each(VALUE self){
     rocksdb_pointer* db_pointer;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+    if (db_pointer->db == NULL) {
+      rb_raise(rb_eRuntimeError, "db not open");
+    }
     rocksdb::Iterator* it = db_pointer->db->NewIterator(rocksdb::ReadOptions());
 
     for (it->SeekToLast(); it->Valid(); it->Prev()) {
@@ -286,6 +336,9 @@ extern "C" {
 
     rocksdb_pointer* db_pointer;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+    if (db_pointer->db == NULL) {
+      rb_raise(rb_eRuntimeError, "db not open");
+    }
     rocksdb::Status status = db_pointer->db->CompactRange(rocksdb::CompactRangeOptions(), &from, &to);
     return status.ok() ? Qtrue : Qfalse;
   }

data/ext/rocksdb/rocksdb_db_rb.h

@@ -4,6 +4,7 @@
 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 db_alloc(VALUE klass);
   VALUE rocksdb_db_put(VALUE self, VALUE v_key, VALUE v_value);
   VALUE rocksdb_db_write(VALUE self, VALUE v_write);

data/ext/rocksdb/rocksdb_rb.cc

@@ -20,14 +20,15 @@ extern "C" {
     cRocksdb_db = rb_define_class_under(cRocksdb, "DB", rb_cObject);
     rb_define_alloc_func(cRocksdb_db, db_alloc);
 
-    rb_define_private_method(cRocksdb_db, "initialize", (METHOD)rocksdb_db_init, -1);
+    rb_define_private_method(cRocksdb_db, "__initialize", (METHOD)rocksdb_db_init, -1);
+    rb_define_private_method(cRocksdb_db, "__initialize2", (METHOD)rocksdb_db_init2, -1);
     rb_define_method(cRocksdb_db, "put", (METHOD)rocksdb_db_put, 2);
     rb_define_method(cRocksdb_db, "write", (METHOD)rocksdb_db_write, 1);
     rb_define_method(cRocksdb_db, "get", (METHOD)rocksdb_db_get, 1);
     rb_define_method(cRocksdb_db, "multi_get", (METHOD)rocksdb_db_multi_get, 1);
     rb_define_method(cRocksdb_db, "delete", (METHOD)rocksdb_db_delete, 1);
     rb_define_method(cRocksdb_db, "exists?", (METHOD)rocksdb_db_exists, 1);
-    rb_define_method(cRocksdb_db, "close", (METHOD)rocksdb_db_close, 0);
+    rb_define_private_method(cRocksdb_db, "__close", (METHOD)rocksdb_db_close, 0);
     rb_define_method(cRocksdb_db, "debug", (METHOD)rocksdb_db_debug, 0);
     rb_define_method(cRocksdb_db, "new_iterator", (METHOD)rocksdb_db_new_iterator, 0);
     rb_define_method(cRocksdb_db, "compact", (METHOD)rocksdb_db_compact, -1);

data/ext/rocksdb/rocksdb_rb.h

@@ -14,6 +14,7 @@ extern "C" {
   
   struct rocksdb_pointer{ 
     rocksdb::DB* db;
+    bool readonly;
   };
 
   struct rocksdb_iterator_pointer{ 

data/lib/rocksdb.rb

@@ -2,10 +2,45 @@ require "rocksdb/RocksDB" # the c extension
 require "rocksdb/ruby/version"
 
 module RocksDB
+  class DBError < StandardError; end
   class DB
     include Enumerable
+
+    @@cache = {}
     
     class << self
+      def get_instance *args
+        readonly = !!(args[1] && args[1][:readonly])
+        key = args[0]
+        
+        if readonly
+          return new(*args)
+        end
+        unless @@cache[key]
+          @@cache[key] = new(*args)
+        end
+        @@cache[key]
+      end
+    end
+    
+    def initialize *args
+      readonly = !!(args[1] && args[1][:readonly])
+      @key = args[0]
+      
+      if !readonly and @@cache[@key]
+        __initialize2(*args)
+        raise DBError.new("error #{@key.to_s} alread open")
+      end
+
+      __initialize(*args)
+      unless readonly
+        @@cache[@key] = self
+      end
+    end
+
+    def close
+      @@cache.delete(@key)
+      __close
     end
     
     alias :includes? :exists?

data/lib/rocksdb/ruby/version.rb

@@ -1,5 +1,5 @@
 module Rocksdb
   module Ruby
-    VERSION = "0.1.5"
+    VERSION = "0.2.0"
   end
 end

data/spec/db_readonly_spec.rb

@@ -12,8 +12,14 @@ describe RocksDB do
   end
 
   it 'should get data' do
-    @rocksdb2.put("test:multi_db", "10")
+    expect{@rocksdb2.put("test:multi_db", "10")}.to raise_error(RuntimeError)
+    expect{@rocksdb2.delete("test:multi_db")}.to raise_error(RuntimeError)
     expect(@rocksdb2.get("test:multi_db")).to eq "1"
+
+    batch = RocksDB::Batch.new
+    batch.delete("test:batch1")
+    batch.put("test:batch2", "b")
+    expect{@rocksdb2.write(batch)}.to raise_error(RuntimeError)
   end
 
   after do

data/spec/db_spec.rb

@@ -116,6 +116,40 @@ describe RocksDB do
 
   end
 
+  it 'race condition test' do
+    key = "test"
+    value = "1"
+
+    expect{RocksDB::DB.new "/tmp/file"}.to raise_error(RocksDB::DBError)
+
+    expect(@rocksdb.put("test:put", "1")).to be true
+
+    @rocksdb2 = RocksDB::DB.new "/tmp/file", {:readonly => true}
+    expect(@rocksdb2.get("test:put")).to eq "1"
+
+    @rocksdb.close
+    @rocksdb = RocksDB::DB.new "/tmp/file"
+    expect(@rocksdb.put("test:put", "2")).to be true
+    
+    @rocksdb3 = RocksDB::DB.new "/tmp/file", {:readonly => true}
+    expect(@rocksdb3.get("test:put")).to eq "2"
+    
+  end
+  
+  it 'singleton' do
+    @rocksdb2 = RocksDB::DB.get_instance("/tmp/file")
+    @rocksdb3 = RocksDB::DB.get_instance("/tmp/file")
+    expect(@rocksdb).to eq (@rocksdb3)
+    expect(@rocksdb2).to eq (@rocksdb3)
+    
+    @rocksdb4 = RocksDB::DB.get_instance("/tmp/file", {:readonly => true})
+    expect(@rocksdb2).not_to eq (@rocksdb4)
+
+    @rocksdb2.close
+    expect{@rocksdb2.get("test:put")}.to raise_error(RuntimeError)
+    expect{@rocksdb3.get("test:put")}.to raise_error(RuntimeError)
+  end
+  
   context 'compact' do
     it 'works with no parameters' do
       expect(@rocksdb.compact).to eq(true)
@@ -133,7 +167,7 @@ describe RocksDB do
       expect(@rocksdb.compact(nil, 'x')).to eq(true)
     end
   end
-  
+
   after do
     @rocksdb.close
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocksdb-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Isamu Arimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler