rocksdb-ruby 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc1e5a783225ab8620f3f704c1bc1a26bf2553e1
-  data.tar.gz: 160e91cf18f55e4b9e381793433ad8d7ad105133
+  metadata.gz: 1657e705f6b3410500f057e41a4dfaf6d7f3ae96
+  data.tar.gz: 3f9242836586a4c07914a9fc1db78e5ddff7bb75
 SHA512:
-  metadata.gz: 13df5b7e0bed1234d6a0a7f603ff02b9f2a971137ffb2d21f4b440571668de43f6615301722a32a0153d1c8241147f204e561423676e965e3e5c165edb25b966
-  data.tar.gz: c5b5fb9d7376f5e05c3f45a0c2e401b0f953a5169fb555528d21ade062329cfaca1ac702e0a4c9bd49adf9254d9dc3de5c8cd68fc28d8d24a2dd3b3f4d5d8a28
+  metadata.gz: f20b30b358b03df0f9894d9df49a1e9d32ab716716d66121be803323531b7600a92908fef68ade67832b60cb4f956f2ee8d54faa9dac488420330548bc23e6c3
+  data.tar.gz: bbb78be94b274135da4626275a1c9053bbc25b989859363bb9ceba329749c395aa0a358fefa3eae83fde6ebf808ae6eca624b111a385bb0498b79d2cf2ae8aaf

data/ext/rocksdb/rocksdb_batch_rb.cc

@@ -0,0 +1,38 @@
+#include "rocksdb_batch_rb.h"
+
+extern "C" {
+#include <ruby.h>
+
+  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/ext/rocksdb/rocksdb_batch_rb.h

@@ -0,0 +1,14 @@
+#include "rocksdb/db.h"
+#include "rocksdb/write_batch.h"
+
+extern "C" {
+
+#include <ruby.h>
+  
+  typedef VALUE (*METHOD)(...);
+
+  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);
+}

data/ext/rocksdb/rocksdb_db_rb.cc

@@ -0,0 +1,120 @@
+#include "rocksdb_db_rb.h"
+
+extern "C" {
+#include <ruby.h>
+
+  VALUE rocksdb_db_init(int argc, VALUE* argv, VALUE self) {
+    VALUE v_db_file_name;
+    rocksdb_pointer* db_pointer;
+    rocksdb::DB* db;
+
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+    rb_scan_args(argc, argv, "01", &v_db_file_name);
+    Check_Type(v_db_file_name, T_STRING);
+    std::string db_file_name = std::string((char*)RSTRING_PTR(v_db_file_name));
+
+    rocksdb::Options options;
+    options.create_if_missing = true;
+    rocksdb::Status status = rocksdb::DB::Open(options, db_file_name, &db);
+
+    db_pointer->db = db;
+
+    return status.ok() ? Qtrue : Qfalse;
+  }
+
+  VALUE db_alloc(VALUE klass){
+    rocksdb_pointer* db_pointer = ALLOC(rocksdb_pointer);
+    return Data_Wrap_Struct(klass, 0, -1, db_pointer);
+  }
+
+  VALUE rocksdb_db_put(VALUE self, VALUE v_key, VALUE v_value) {
+    Check_Type(v_key, T_STRING);
+    Check_Type(v_value, T_STRING);
+
+    rocksdb_pointer* db_pointer;
+    rocksdb::DB* db;
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+    
+    std::string key = std::string((char*)RSTRING_PTR(v_key));
+    std::string value = std::string((char*)RSTRING_PTR(v_value));
+
+    rocksdb::Status status = db_pointer->db->Put(rocksdb::WriteOptions(), key, value);
+    
+    return status.ok() ? Qtrue : Qfalse;
+  }
+
+  VALUE rocksdb_db_write(VALUE self, VALUE v_write){
+    rocksdb_pointer* db_pointer;
+    rocksdb::DB* db;
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+
+    rocksdb::WriteBatch *batch;
+    Data_Get_Struct(v_write, rocksdb::WriteBatch, batch);
+
+    rocksdb::Status status = db_pointer->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);
+
+    rocksdb_pointer* db_pointer;
+    rocksdb::DB* db;
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+    
+    std::string key = std::string((char*)RSTRING_PTR(v_key));
+    std::string value;
+    db_pointer->db->Get(rocksdb::ReadOptions(), key, &value);    
+
+    return rb_str_new(value.data(), value.size());
+  }
+
+
+  VALUE rocksdb_db_multi_get(VALUE self, VALUE v_array){
+    Check_Type(v_array, T_ARRAY);
+
+    rocksdb_pointer* db_pointer;
+    rocksdb::DB* db;
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+
+    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_pointer->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);
+    
+    rocksdb_pointer* db_pointer;
+    rocksdb::DB* db;
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+
+    std::string key = std::string((char*)RSTRING_PTR(v_key));
+    rocksdb::Status status = db_pointer->db->Delete(rocksdb::WriteOptions(), key);
+    
+    return status.ok() ? Qtrue : Qfalse;
+  }
+  
+  VALUE rocksdb_db_close(VALUE self){
+    rocksdb_pointer* db_pointer;
+    rocksdb::DB* db;
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+
+    delete db_pointer->db;
+    return Qnil;
+  }
+}

data/ext/rocksdb/rocksdb_db_rb.h

@@ -0,0 +1,19 @@
+#include "rocksdb/db.h"
+#include "rocksdb/write_batch.h"
+
+extern "C" {
+#include <ruby.h>
+  struct rocksdb_pointer{ 
+    rocksdb::DB* db;
+  };
+
+  VALUE rocksdb_db_init(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);
+  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 self);
+
+}

data/ext/rocksdb/rocksdb_rb.cc

@@ -1,29 +1,8 @@
-#include "rocksdb/db.h"
-#include "rocksdb/write_batch.h"
-#include <iostream>
+#include "rocksdb_rb.h"
+#include "rocksdb_db_rb.h"
+#include "rocksdb_batch_rb.h"
 
 extern "C" {
-
-#include <stdio.h>
-#include <ruby.h>
-  
-  typedef VALUE (*METHOD)(...);
-  
-  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;
@@ -32,6 +11,7 @@ extern "C" {
     
     cRocksdb = rb_define_class("RocksDB", rb_cObject);
     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_method(cRocksdb_db, "put", (METHOD)rocksdb_db_put, 2);
@@ -47,119 +27,4 @@ extern "C" {
     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_db_init(int argc, VALUE* argv, VALUE self) {
-    VALUE v_db_file_name;
-
-    rb_scan_args(argc, argv, "01", &v_db_file_name);
-    Check_Type(v_db_file_name, T_STRING);
-    std::string db_file_name = std::string((char*)RSTRING_PTR(v_db_file_name));
-    
-    rocksdb::Options options;
-    options.create_if_missing = true;
-    rocksdb::Status status = rocksdb::DB::Open(options, db_file_name, &db);
-
-    return status.ok() ? Qtrue : Qfalse;
-  }
-
-  VALUE rocksdb_db_put(VALUE self, VALUE v_key, VALUE v_value) {
-    Check_Type(v_key, T_STRING);
-    Check_Type(v_value, T_STRING);
-
-    std::string key = std::string((char*)RSTRING_PTR(v_key));
-    std::string value = std::string((char*)RSTRING_PTR(v_value));
-
-    rocksdb::Status status = db->Put(rocksdb::WriteOptions(), key, value);
-    
-    return status.ok() ? Qtrue : Qfalse;
-  }
-
-  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));
-    std::string value;
-    db->Get(rocksdb::ReadOptions(), key, &value);    
-
-    return rb_str_new(value.data(), value.size());
-  }
-
-
-  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_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/ext/rocksdb/rocksdb_rb.h

@@ -0,0 +1,10 @@
+#include "rocksdb/db.h"
+#include "rocksdb/write_batch.h"
+
+extern "C" {
+
+#include <ruby.h>
+  
+  typedef VALUE (*METHOD)(...);
+  
+}

data/lib/rocksdb/ruby/version.rb

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

data/spec/db_spec.rb

@@ -48,9 +48,23 @@ describe RocksDB do
     @rocksdb.get("test:batch2").should eq "b"
   end
 
+  it 'should use multiple db' do
+    @rocksdb2 = RocksDB::DB.new "/tmp/file2"
+    
+    @rocksdb.put("test:multi_db", "1")
+    @rocksdb2.put("test:multi_db", "2")
+    
+    @rocksdb.get("test:multi_db").should eq "1"
+    @rocksdb2.get("test:multi_db").should eq "2"
+  end
+
+
   after do
     @rocksdb.close
   end
 
+  #rocksdb::WriteOptions write_options;
+  #write_options.sync = true;
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocksdb-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Isamu Arimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,13 +65,18 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- ext/rocksdb/extconf.rb
+- ext/rocksdb/rocksdb_batch_rb.cc
+- ext/rocksdb/rocksdb_batch_rb.h
+- ext/rocksdb/rocksdb_db_rb.cc
+- ext/rocksdb/rocksdb_db_rb.h
 - ext/rocksdb/rocksdb_rb.cc
+- ext/rocksdb/rocksdb_rb.h
 - lib/rocksdb/ruby.rb
 - lib/rocksdb/ruby/version.rb
 - rocksdb-ruby.gemspec
 - spec/db_spec.rb
 - spec/spec_helper.rb
+- ext/rocksdb/extconf.rb
 homepage: https://github.com/isamu/rocksdb-ruby
 licenses:
 - mit