rocksdb-ruby 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a4d4a14d208c82b4350ad74137d5dc61787981
-  data.tar.gz: 11cb366cd0278dc76275ff163f450e8e18564a6d
+  metadata.gz: 8aa1f09a9b495d585a390e2d9f9b507c7625fcd6
+  data.tar.gz: de210851e6bbe523cdf9b6e4daff413ea001a3b7
 SHA512:
-  metadata.gz: 67921bce1b5f49bee1861089067ee59a9380913356e20455b8135dfe498c2799c5c9b88802221709aa09522442504c1a4e2c2a13d25e806af18c98184f552a0c
-  data.tar.gz: 0cdcbd2d5aa177d1c85db02ac03fe2f83562a9510357228ee36ce699fe527d1e6e4243aaa5d311a09b63c3775bcab19e6c71094c4cd1aacbfe5a36fca70c0ffc
+  metadata.gz: 422b1d95ea2f7e5b30eacf6f6a062732b42056dd7fe2c02772cdb26f5c431f841c0f4dd6900e3c129ad03561570f3e8ccd0501cccd791e216e2a65b98a08d961
+  data.tar.gz: 48e951f925ec08807209c40465fac01916eb80faa47a1707f81e4614f6880de0088ba192cc7cb679362de72e6bba5f5c6c39aa5b33c0a0e52617010eae10c0fa

data/ext/rocksdb/rocksdb_db_rb.cc

@@ -50,7 +50,7 @@ extern "C" {
     rocksdb_pointer* db_pointer;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
     db_pointer->db = NULL;
-
+    db_pointer->readonly = true;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
 
     return Qtrue;
@@ -317,7 +317,23 @@ extern "C" {
   VALUE rocksdb_db_debug(VALUE self){
     return Qnil;
   }
-
+  VALUE rocksdb_db_is_readonly(VALUE self){
+    rocksdb_pointer* db_pointer;
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+    if (db_pointer->readonly) {
+      return Qtrue;
+    }
+    if (!db_pointer->readonly) {
+      return Qfalse;
+    }
+    return Qnil;
+  }
+  VALUE rocksdb_db_is_open(VALUE self){
+    rocksdb_pointer* db_pointer;
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+    return (db_pointer->db == NULL) ? Qfalse : Qtrue;
+  }
+  
   VALUE rocksdb_db_compact(int argc, VALUE* argv, VALUE self) {
     VALUE v_from, v_to;
     rocksdb::Slice from, to;

data/ext/rocksdb/rocksdb_db_rb.h

@@ -14,6 +14,8 @@ extern "C" {
   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_open(VALUE self);
   VALUE rocksdb_db_new_iterator(VALUE self);
   VALUE rocksdb_db_each(VALUE self);
   VALUE rocksdb_db_each_index(VALUE self);

data/ext/rocksdb/rocksdb_rb.cc

@@ -32,6 +32,8 @@ extern "C" {
     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);
+    rb_define_method(cRocksdb_db, "is_readonly?", (METHOD)rocksdb_db_is_readonly, 0);
+    rb_define_method(cRocksdb_db, "is_open?", (METHOD)rocksdb_db_is_open, 0);
 
     rb_define_method(cRocksdb_db, "iterator", (METHOD)rocksdb_db_each, 0);
     rb_define_method(cRocksdb_db, "each_index", (METHOD)rocksdb_db_each_index, 0);

data/lib/rocksdb.rb

@@ -26,12 +26,10 @@ module RocksDB
     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

data/lib/rocksdb/ruby/version.rb

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

data/spec/db_readonly_spec.rb

@@ -7,15 +7,16 @@ describe RocksDB do
     @rocksdb = RocksDB::DB.new "/tmp/file2"
     @rocksdb.put("test:multi_db", "1")
     @rocksdb.close
-
-    @rocksdb2 = RocksDB::DB.new "/tmp/file2", {:readonly => true}
+    
+    @rocksdb2 = RocksDB::DB.new("/tmp/file2", {:readonly => true})
   end
 
   it 'should get data' do
     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"
-
+    expect(@rocksdb2.is_readonly?).to eq true
+    
     batch = RocksDB::Batch.new
     batch.delete("test:batch1")
     batch.put("test:batch2", "b")

data/spec/db_spec.rb

@@ -4,11 +4,12 @@ require "rocksdb"
 
 describe RocksDB do
   before do
-    @rocksdb = RocksDB::DB.new "/tmp/file"
+    @rocksdb = RocksDB::DB.new("/tmp/file")
   end
 
   it 'should get data' do
     @rocksdb.put("test:read", "1")
+    expect(@rocksdb.is_readonly?).to eq false
     expect(@rocksdb.get("test:read")).to eq "1"
   end
 
@@ -50,8 +51,7 @@ describe RocksDB do
   end
 
   it 'should use multiple db' do
-    @rocksdb2 = RocksDB::DB.new "/tmp/file2"
-    
+    @rocksdb2 = RocksDB::DB.new("/tmp/file2")
     @rocksdb.put("test:multi_db", "1")
     @rocksdb2.put("test:multi_db", "2")
     
@@ -120,34 +120,55 @@ describe RocksDB do
     key = "test"
     value = "1"
 
-    expect{RocksDB::DB.new "/tmp/file"}.to raise_error(RocksDB::DBError)
+    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}
+    @rocksdb2 = RocksDB::DB.new("/tmp/file", {:readonly => true})
+    expect(@rocksdb2.is_readonly?).to eq true
     expect(@rocksdb2.get("test:put")).to eq "1"
 
     @rocksdb.close
-    @rocksdb = RocksDB::DB.new "/tmp/file"
+
+    expect(@rocksdb.is_open?).to eq false
+
+    @rocksdb = RocksDB::DB.new("/tmp/file")
+    expect(@rocksdb.is_readonly?).to eq false
+    expect(@rocksdb.is_open?).to eq true
     expect(@rocksdb.put("test:put", "2")).to be true
     
-    @rocksdb3 = RocksDB::DB.new "/tmp/file", {:readonly => true}
+    @rocksdb3 = RocksDB::DB.new("/tmp/file", {:readonly => true})
+    expect(@rocksdb3.is_readonly?).to eq true
+    expect(@rocksdb3.is_open?).to eq true
     expect(@rocksdb3.get("test:put")).to eq "2"
+
+    @rocksdb2.close
+    @rocksdb3.close
     
   end
   
   it 'singleton' do
     @rocksdb2 = RocksDB::DB.get_instance("/tmp/file")
+    expect(@rocksdb2.is_readonly?).to eq false
+    expect(@rocksdb2.is_open?).to eq true
+
     @rocksdb3 = RocksDB::DB.get_instance("/tmp/file")
+    expect(@rocksdb3.is_readonly?).to eq false
     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)
-
+    expect(@rocksdb4.is_readonly?).to eq true
+    expect(@rocksdb4.is_open?).to eq true
+    
     @rocksdb2.close
     expect{@rocksdb2.get("test:put")}.to raise_error(RuntimeError)
+    expect(@rocksdb2.is_open?).to eq false
     expect{@rocksdb3.get("test:put")}.to raise_error(RuntimeError)
+    expect(@rocksdb3.is_open?).to eq false
+
+    @rocksdb4.close
   end
   
   context 'compact' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocksdb-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Isamu Arimoto