rocksdb-ruby 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1657e705f6b3410500f057e41a4dfaf6d7f3ae96
-  data.tar.gz: 3f9242836586a4c07914a9fc1db78e5ddff7bb75
+  metadata.gz: 9d4a29a50778a83f758f3ce02bf456fad90700d6
+  data.tar.gz: c38fef9d063b4efc8a3bc198c99bcfc94b5ec165
 SHA512:
-  metadata.gz: f20b30b358b03df0f9894d9df49a1e9d32ab716716d66121be803323531b7600a92908fef68ade67832b60cb4f956f2ee8d54faa9dac488420330548bc23e6c3
-  data.tar.gz: bbb78be94b274135da4626275a1c9053bbc25b989859363bb9ceba329749c395aa0a358fefa3eae83fde6ebf808ae6eca624b111a385bb0498b79d2cf2ae8aaf
+  metadata.gz: e34957be12c20bde777b651a3fbc78745a115ffc7e6b11cdf6a8589dd4646aefb9518e618b8e143428cdaf7092b0a2c8cc3e1cabed2ab2dd5193d11c1dd74380
+  data.tar.gz: 31881bfefa0ee01bf24f640f7c280cce52b2a4246e65fff61d179fc1438b62588a9619395ece4d4cbc1ef5df2521ef64aebaaac47a7d609285dc7c579c054993

data/README.md

@@ -26,6 +26,7 @@ Or install it yourself as:
 
     require "RocksDB"
 
+    # Reads And Writes
     key = "test"
     value = "1"
     rocksdb = RocksDB::DB.new "/tmp/file"
@@ -33,11 +34,24 @@ Or install it yourself as:
     new_value = rocksdb.get(key)
     rocksdb.delete(key)
 
+    #Atomic Updates
     batch = RocksDB::Batch.new
     batch.delete("test:batch1")
     batch.put("test:batch2", "b")
     rocksdb.write(batch)
 
+    #Iteration
+    iterator = rocksdb.new_iterator
+
+    iterator.seek_to_first
+    while(iterator.valid)
+      iterator.value
+      iterator.key
+      iterator.next
+    end
+    iterator.close
+
+    
     rocksdb.close
 
 

data/ext/rocksdb/rocksdb_db_rb.cc

@@ -1,4 +1,7 @@
+#include "rocksdb_rb.h"
 #include "rocksdb_db_rb.h"
+#include "ruby/encoding.h"
+#include <iostream>
 
 extern "C" {
 #include <ruby.h>
@@ -32,7 +35,6 @@ extern "C" {
     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));
@@ -45,7 +47,6 @@ extern "C" {
 
   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;
@@ -59,14 +60,13 @@ extern "C" {
     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());
+    
+    return rb_enc_str_new(value.data(), value.size(), rb_utf8_encoding());
   }
 
 
@@ -74,7 +74,6 @@ extern "C" {
     Check_Type(v_array, T_ARRAY);
 
     rocksdb_pointer* db_pointer;
-    rocksdb::DB* db;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
 
     long i;
@@ -100,7 +99,6 @@ extern "C" {
     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));
@@ -111,10 +109,38 @@ extern "C" {
   
   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;
   }
+
+  VALUE rocksdb_db_new_iterator(VALUE self){
+    rocksdb_pointer* db_pointer;
+    rocksdb_iterator_pointer* rocksdb_it;
+
+    VALUE klass;
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+
+    rocksdb::Iterator* it = db_pointer->db->NewIterator(rocksdb::ReadOptions());
+
+    klass = rb_class_new_instance(0, NULL, cRocksdb_iterator);
+
+    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
+    rocksdb_it->it = it;
+    return klass;
+  }
+
+  VALUE rocksdb_db_debug(VALUE self){
+
+    rocksdb_pointer* db_pointer;
+    Data_Get_Struct(self, rocksdb_pointer, db_pointer);
+    rocksdb::Iterator* it = db_pointer->db->NewIterator(rocksdb::ReadOptions());
+
+    for (it->SeekToFirst(); it->Valid(); it->Next()) {
+      std::cout << it->key().ToString() << ": "  << it->value().ToString() << std::endl;
+    }
+    delete it;
+    return Qnil;
+  }
 }

data/ext/rocksdb/rocksdb_db_rb.h

@@ -3,10 +3,6 @@
 
 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);
@@ -15,5 +11,7 @@ extern "C" {
   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);
+  VALUE rocksdb_db_debug(VALUE self);
+  VALUE rocksdb_db_new_iterator(VALUE self);
 
 }

data/ext/rocksdb/rocksdb_iterator_rb.cc

@@ -0,0 +1,63 @@
+#include "rocksdb_rb.h"
+#include "rocksdb_batch_rb.h"
+#include "ruby/encoding.h"
+#include <iostream>
+
+extern "C" {
+#include <ruby.h>
+
+  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();
+
+    return Qnil;
+  }
+  VALUE rocksdb_iterator_alloc(VALUE klass){
+    rocksdb_iterator_pointer* it = ALLOC(rocksdb_iterator_pointer);
+    return Data_Wrap_Struct(klass, 0, -1, it);
+  }
+
+  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;
+  }
+
+  VALUE rocksdb_iterator_key(VALUE klass){
+    rocksdb_iterator_pointer* rocksdb_it;
+    std::string value;
+
+    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
+    value = rocksdb_it->it->key().ToString();
+
+    return rb_enc_str_new(value.data(), value.size(), rb_utf8_encoding());
+  }
+  
+  VALUE rocksdb_iterator_value(VALUE klass){
+    rocksdb_iterator_pointer* rocksdb_it;
+    std::string value;
+
+    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
+    value = rocksdb_it->it->value().ToString();
+
+    return rb_enc_str_new(value.data(), value.size(), rb_utf8_encoding());
+
+  }
+  
+  VALUE rocksdb_iterator_next(VALUE klass){
+    rocksdb_iterator_pointer* rocksdb_it;
+    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
+    rocksdb_it->it->Next();
+
+    return Qnil;
+  }
+
+  VALUE rocksdb_iterator_close(VALUE klass){
+    rocksdb_iterator_pointer* rocksdb_it;
+    Data_Get_Struct(klass, rocksdb_iterator_pointer , rocksdb_it);
+    delete rocksdb_it->it;
+
+    return Qnil;
+  }
+}

data/ext/rocksdb/rocksdb_iterator_rb.h

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

data/ext/rocksdb/rocksdb_rb.cc

@@ -1,13 +1,20 @@
 #include "rocksdb_rb.h"
 #include "rocksdb_db_rb.h"
 #include "rocksdb_batch_rb.h"
+#include "rocksdb_status_rb.h"
+#include "rocksdb_iterator_rb.h"
 
 extern "C" {
+  VALUE cRocksdb_iterator;
+
   void Init_RocksDB(){
-    
+   
     VALUE cRocksdb;
     VALUE cRocksdb_db;
     VALUE cRocksdb_write_batch;
+    VALUE cRocksdb_read_options;
+    VALUE cRocksdb_write_options;
+    VALUE cRocksdb_status;
     
     cRocksdb = rb_define_class("RocksDB", rb_cObject);
     cRocksdb_db = rb_define_class_under(cRocksdb, "DB", rb_cObject);
@@ -20,11 +27,27 @@ extern "C" {
     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);
+    rb_define_method(cRocksdb_db, "debug", (METHOD)rocksdb_db_debug, 0);
+    rb_define_method(cRocksdb_db, "new_iterator", (METHOD)rocksdb_db_new_iterator, 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);
+
+    cRocksdb_iterator = rb_define_class_under(cRocksdb, "Iterator", rb_cObject);
+    rb_define_alloc_func(cRocksdb_iterator, rocksdb_iterator_alloc);
+    rb_define_method(cRocksdb_iterator, "seek_to_first", (METHOD)rocksdb_iterator_seek_to_first, 0);
+    rb_define_method(cRocksdb_iterator, "valid", (METHOD)rocksdb_iterator_valid, 0);
+    rb_define_method(cRocksdb_iterator, "key", (METHOD)rocksdb_iterator_key, 0);
+    rb_define_method(cRocksdb_iterator, "value", (METHOD)rocksdb_iterator_value, 0);
+    rb_define_method(cRocksdb_iterator, "next", (METHOD)rocksdb_iterator_next, 0);
+    rb_define_method(cRocksdb_iterator, "close", (METHOD)rocksdb_iterator_close, 0);
+
+    cRocksdb_status = rb_define_class_under(cRocksdb, "Status", rb_cObject);
+    cRocksdb_read_options = rb_define_class_under(cRocksdb, "ReadOptions", rb_cObject);
+    cRocksdb_write_options = rb_define_class_under(cRocksdb, "WriteOptions", rb_cObject);
+
   }
 }

data/ext/rocksdb/rocksdb_rb.h

@@ -1,10 +1,24 @@
 #include "rocksdb/db.h"
 #include "rocksdb/write_batch.h"
 
+#ifndef RUBY_ROCKSDB_H
+#define RUBY_ROCKSDB_H 1
+
+
 extern "C" {
 
 #include <ruby.h>
+  extern VALUE cRocksdb_iterator;
   
   typedef VALUE (*METHOD)(...);
   
+  struct rocksdb_pointer{ 
+    rocksdb::DB* db;
+  };
+
+  struct rocksdb_iterator_pointer{ 
+    rocksdb::Iterator* it;
+  };
+  
 }
+#endif

data/ext/rocksdb/rocksdb_status_rb.cc

@@ -0,0 +1,3 @@
+extern "C" {
+#include <ruby.h>
+}

data/ext/rocksdb/rocksdb_status_rb.h

@@ -0,0 +1,3 @@
+extern "C" {
+#include <ruby.h>
+}

data/lib/rocksdb/ruby/version.rb

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

data/spec/db_spec.rb

@@ -1,27 +1,28 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 require "RocksDB"
 
 describe RocksDB do
   before do
-    @rocksdb = RocksDB::DB.new "/tmp/file"
+    @rocksdb = RocksDB::DB.new "/tmp/file3"
   end
 
   it 'should get data' do
     @rocksdb.put("test:read", "1")
-    @rocksdb.get("test:read").should eq "1"
+    expect(@rocksdb.get("test:read")).to eq "1"
   end
 
   it 'should put data' do 
-    @rocksdb.put("test:put", "2").should be_true
-    @rocksdb.get("test:put").should eq "2"
+    expect(@rocksdb.put("test:put", "2")).to be_true
+    expect(@rocksdb.get("test:put")).to eq "2"
   end
 
   it 'should delete data' do 
     @rocksdb.put("test:delete", "3")
-    @rocksdb.get("test:delete").should eq "3"
+    expect(@rocksdb.get("test:delete")).to eq "3"
 
-    @rocksdb.delete("test:delete").should be_true
-    @rocksdb.get("test:delete").should be_empty
+    expect(@rocksdb.delete("test:delete")).to be_true
+    expect(@rocksdb.get("test:delete")).to be_empty
   end
 
   it 'should get multi data' do
@@ -29,23 +30,23 @@ describe RocksDB do
     @rocksdb.put("test:multi2", "b")
     @rocksdb.put("test:multi3", "c")
 
-    @rocksdb.multi_get(["test:multi1", "test:multi2", "test:multi3"]).should eq ["a", "b", "c"]
+    expect(@rocksdb.multi_get(["test:multi1", "test:multi2", "test:multi3"])).to 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 ""
+    expect(@rocksdb.get("test:batch1")).to eq "a"
+    expect(@rocksdb.get("test:batch")).to 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"
+    expect(@rocksdb.get("test:batch1")).to eq ""
+    expect(@rocksdb.get("test:batch2")).to eq "b"
   end
 
   it 'should use multiple db' do
@@ -54,17 +55,31 @@ describe RocksDB do
     @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"
+    expect(@rocksdb.get("test:multi_db")).to eq "1"
+    expect(@rocksdb2.get("test:multi_db")).to eq "2"
   end
 
+  it 'should use japanese charactor' do
+    @rocksdb.put("test:japanese", "あいうえお")
 
-  after do
-    @rocksdb.close
+    expect(@rocksdb.get("test:japanese")).to eq "あいうえお"
   end
 
-  #rocksdb::WriteOptions write_options;
-  #write_options.sync = true;
+  it 'should use iterator' do
+    iterator = @rocksdb.new_iterator
+
+    iterator.seek_to_first
+    
+    while(iterator.valid)
+      expect(iterator.value).not_to be_empty
+      expect(iterator.key).not_to be_empty
+      iterator.next
+    end
+    iterator.close
+  end
 
+  after do
+    @rocksdb.close
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocksdb-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Isamu Arimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,18 +65,22 @@ 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_iterator_rb.cc
+- ext/rocksdb/rocksdb_iterator_rb.h
 - ext/rocksdb/rocksdb_rb.cc
 - ext/rocksdb/rocksdb_rb.h
+- ext/rocksdb/rocksdb_status_rb.cc
+- ext/rocksdb/rocksdb_status_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