rocksdb-ruby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a4b643c77713d1a10a584eb7521aa6a6471cf49
-  data.tar.gz: 60ef9caa8b6f4975ddacde6de2bb51feb6c33c12
+  metadata.gz: bc1e5a783225ab8620f3f704c1bc1a26bf2553e1
+  data.tar.gz: 160e91cf18f55e4b9e381793433ad8d7ad105133
 SHA512:
-  metadata.gz: 23282a7b75a4274f1f6b3dee2611cd2dc6296e16a790df4ca52f67db59f509f847d03ec021598629701e22220cf049bbb90ef316f76aa8a8c90c2156ce0b17f5
-  data.tar.gz: 181cd8ad272e4215494176c8592d6680793372a9199ee895afa89c0ca41364ab4ffe5647b49de649208e1d384860cd944dfdd6055d8292562198540288dc5523
+  metadata.gz: 13df5b7e0bed1234d6a0a7f603ff02b9f2a971137ffb2d21f4b440571668de43f6615301722a32a0153d1c8241147f204e561423676e965e3e5c165edb25b966
+  data.tar.gz: c5b5fb9d7376f5e05c3f45a0c2e401b0f953a5169fb555528d21ade062329cfaca1ac702e0a4c9bd49adf9254d9dc3de5c8cd68fc28d8d24a2dd3b3f4d5d8a28

data/README.md

@@ -28,11 +28,17 @@ Or install it yourself as:
 
     key = "test"
     value = "1"
-    rockdb = RocksDB.new "/tmp/file"
-    rockdb.put(key, value)
-    new_value = rockdb.get(key)
-    rockdb.delete(key)
-    rockdb.close
+    rocksdb = RocksDB::DB.new "/tmp/file"
+    rocksdb.put(key, value)
+    new_value = rocksdb.get(key)
+    rocksdb.delete(key)
+
+    batch = RocksDB::Batch.new
+    batch.delete("test:batch1")
+    batch.put("test:batch2", "b")
+    rocksdb.write(batch)
+
+    rocksdb.close
 
 
 ## Contributing

data/ext/rocksdb/rocksdb_rb.cc

@@ -1,4 +1,5 @@
 #include "rocksdb/db.h"
+#include "rocksdb/write_batch.h"
 #include <iostream>
 
 extern "C" {
@@ -8,28 +9,46 @@ extern "C" {
   
   typedef VALUE (*METHOD)(...);
   
-  VALUE rocksdb_init(int argc, VALUE* argv, VALUE self);
-  VALUE rocksdb_put(VALUE self, VALUE v_key, VALUE v_value);
-  VALUE rocksdb_get(VALUE self, VALUE v_key);
-  VALUE rocksdb_delete(VALUE self, VALUE v_key);
-  VALUE rocksdb_close();
-  
+  VALUE rocksdb_db_init(int argc, VALUE* argv, 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_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_close();
+
+  VALUE rocksdb_write_batch_init();
+  VALUE batch_alloc(VALUE klass);
+  VALUE rocksdb_write_batch_put(VALUE self, VALUE v_key, VALUE v_value);
+  VALUE rocksdb_write_batch_delete(VALUE self, VALUE v_key);
   
   rocksdb::DB* db;
 
   void Init_RocksDB(){
     
     VALUE cRocksdb;
+    VALUE cRocksdb_db;
+    VALUE cRocksdb_write_batch;
     
     cRocksdb = rb_define_class("RocksDB", rb_cObject);
-    rb_define_private_method(cRocksdb, "initialize", (METHOD)rocksdb_init, -1);
-    rb_define_method(cRocksdb, "put", (METHOD)rocksdb_put, 2);
-    rb_define_method(cRocksdb, "get", (METHOD)rocksdb_get, 1);
-    rb_define_method(cRocksdb, "delete", (METHOD)rocksdb_delete, 1);
-    rb_define_method(cRocksdb, "close", (METHOD)rocksdb_close, 0);
+    cRocksdb_db = rb_define_class_under(cRocksdb, "DB", rb_cObject);
+
+    rb_define_private_method(cRocksdb_db, "initialize", (METHOD)rocksdb_db_init, -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, "close", (METHOD)rocksdb_db_close, 0);
+
+    cRocksdb_write_batch = rb_define_class_under(cRocksdb, "Batch", rb_cObject);
+    rb_define_alloc_func(cRocksdb_write_batch, batch_alloc);
+    rb_define_private_method(cRocksdb_write_batch, "initialize", (METHOD)rocksdb_write_batch_init, 0);
+    rb_define_method(cRocksdb_write_batch, "put", (METHOD)rocksdb_write_batch_put, 2);
+    rb_define_method(cRocksdb_write_batch, "delete", (METHOD)rocksdb_write_batch_delete, 1);
   }
-
-  VALUE rocksdb_init(int argc, VALUE* argv, VALUE self) {
+  
+  VALUE rocksdb_db_init(int argc, VALUE* argv, VALUE self) {
     VALUE v_db_file_name;
 
     rb_scan_args(argc, argv, "01", &v_db_file_name);
@@ -43,7 +62,7 @@ extern "C" {
     return status.ok() ? Qtrue : Qfalse;
   }
 
-  VALUE rocksdb_put(VALUE self, VALUE v_key, VALUE v_value) {
+  VALUE rocksdb_db_put(VALUE self, VALUE v_key, VALUE v_value) {
     Check_Type(v_key, T_STRING);
     Check_Type(v_value, T_STRING);
 
@@ -55,7 +74,15 @@ extern "C" {
     return status.ok() ? Qtrue : Qfalse;
   }
 
-  VALUE rocksdb_get(VALUE self, VALUE v_key){
+  VALUE rocksdb_db_write(VALUE self, VALUE v_write){
+    rocksdb::WriteBatch *batch;
+    Data_Get_Struct(v_write, rocksdb::WriteBatch, batch);
+
+    rocksdb::Status status = db->Write(rocksdb::WriteOptions(), batch);
+    return status.ok() ? Qtrue : Qfalse;
+  }
+
+  VALUE rocksdb_db_get(VALUE self, VALUE v_key){
     Check_Type(v_key, T_STRING);
 
     std::string key = std::string((char*)RSTRING_PTR(v_key));
@@ -65,17 +92,74 @@ extern "C" {
     return rb_str_new(value.data(), value.size());
   }
 
-  VALUE rocksdb_delete(VALUE self, VALUE v_key){
-    Check_Type(v_key, T_STRING);
 
+  VALUE rocksdb_db_multi_get(VALUE self, VALUE v_array){
+    Check_Type(v_array, T_ARRAY);
+
+    long i;
+    VALUE *tmp = RARRAY_PTR(v_array);
+    long length = RARRAY_LEN(v_array);
+    std::vector<std::string> values(length);
+    std::vector<rocksdb::Slice> keys(length);
+    std::vector<rocksdb::Status> status;
+
+    for(i=0; i < length; i++){
+      keys[i] = rocksdb::Slice((char*)RSTRING_PTR(*tmp));
+      tmp++;
+    }
+
+    status = db->MultiGet(rocksdb::ReadOptions(),keys,&values);
+    for(i=0; i < length; i++){
+      RARRAY_PTR(v_array)[i] = rb_str_new(values[i].data(), values[i].size());
+    }
+    return v_array;
+  }
+  
+  VALUE rocksdb_db_delete(VALUE self, VALUE v_key){
+    Check_Type(v_key, T_STRING);
+    
     std::string key = std::string((char*)RSTRING_PTR(v_key));
     rocksdb::Status status = db->Delete(rocksdb::WriteOptions(), key);
-
+    
     return status.ok() ? Qtrue : Qfalse;
   }
-
-  VALUE rocksdb_close(){
+  
+  VALUE rocksdb_db_close(){
     delete db;
     return Qnil;
   }
+
+  VALUE batch_alloc(VALUE klass){
+    rocksdb::WriteBatch *batch = ALLOC(rocksdb::WriteBatch);
+    batch = new rocksdb::WriteBatch;
+    return Data_Wrap_Struct(klass, 0, -1, batch);
+  }
+
+  VALUE rocksdb_write_batch_init(){
+    return Qtrue;
+  }
+  VALUE rocksdb_write_batch_put(VALUE self, VALUE v_key, VALUE v_value){
+    Check_Type(v_key, T_STRING);
+    Check_Type(v_value, T_STRING);
+
+    rocksdb::WriteBatch *batch;
+    std::string key = std::string((char*)RSTRING_PTR(v_key));
+    std::string value = std::string((char*)RSTRING_PTR(v_value));
+    
+    Data_Get_Struct(self, rocksdb::WriteBatch, batch);
+    batch->Put(key, value);
+    return Qnil;
+  }
+  VALUE rocksdb_write_batch_delete(VALUE self, VALUE v_key){
+    Check_Type(v_key, T_STRING);
+
+    rocksdb::WriteBatch *batch;
+    std::string key = std::string((char*)RSTRING_PTR(v_key));
+    
+    Data_Get_Struct(self, rocksdb::WriteBatch, batch);
+    batch->Delete(key);
+
+    return Qnil;
+  }
+
 }

data/lib/rocksdb/ruby/version.rb

@@ -1,5 +1,5 @@
 module Rocksdb
   module Ruby
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/db_spec.rb

@@ -3,29 +3,54 @@ require "RocksDB"
 
 describe RocksDB do
   before do
-    @rockdb = RocksDB.new "/tmp/file"
+    @rocksdb = RocksDB::DB.new "/tmp/file"
   end
 
   it 'should get data' do
-    @rockdb.put("test:read", "1")
-    @rockdb.get("test:read").should eq "1"
+    @rocksdb.put("test:read", "1")
+    @rocksdb.get("test:read").should eq "1"
   end
 
   it 'should put data' do 
-    @rockdb.put("test:put", "2").should be_true
-    @rockdb.get("test:put").should eq "2"
+    @rocksdb.put("test:put", "2").should be_true
+    @rocksdb.get("test:put").should eq "2"
   end
 
   it 'should delete data' do 
-    @rockdb.put("test:delete", "3")
-    @rockdb.get("test:delete").should eq "3"
+    @rocksdb.put("test:delete", "3")
+    @rocksdb.get("test:delete").should eq "3"
 
-    @rockdb.delete("test:delete").should be_true
-    @rockdb.get("test:delete").should be_empty
+    @rocksdb.delete("test:delete").should be_true
+    @rocksdb.get("test:delete").should be_empty
+  end
+
+  it 'should get multi data' do
+    @rocksdb.put("test:multi1", "a")
+    @rocksdb.put("test:multi2", "b")
+    @rocksdb.put("test:multi3", "c")
+
+    @rocksdb.multi_get(["test:multi1", "test:multi2", "test:multi3"]).should eq ["a", "b", "c"]
+  end
+
+  it 'should put data atomic update' do
+    @rocksdb.put("test:batch1", "a")
+    @rocksdb.delete("test:batch2")
+
+    @rocksdb.get("test:batch1").should eq "a"
+    @rocksdb.get("test:batch").should eq ""
+
+    batch = RocksDB::Batch.new
+    batch.delete("test:batch1")
+    batch.put("test:batch2", "b")
+    @rocksdb.write(batch)
+
+    @rocksdb.get("test:batch1").should eq ""
+    @rocksdb.get("test:batch2").should eq "b"
   end
 
   after do
-    @rockdb.close
+    @rocksdb.close
   end
 
 end
+

metadata

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