rocksdb-ruby 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 508079e41f7fdac06ebdb734ef57f74af0ea97cc
-  data.tar.gz: 0887f5b646875890f6fd08707c404e9ae9724ac4
+  metadata.gz: 96d67a886d0334375d5cb1e0b467231dc021d42b
+  data.tar.gz: 4d7dd5d7f9b5bb9abaa97e9b5ea253b88ea172d8
 SHA512:
-  metadata.gz: 019a972398e9c9a331eed14e1a24dc17521c66e036c4dbad999e4c6fe4500f0c36305164384140dbcc91455882352ff7106b5a274400d6780fc19d5789b7c54f
-  data.tar.gz: 9e6f2e227742dc9f7f205fbbc9cf353f17c444ead0e0d5a5756520dd64742dd0316c53dbb9f245c4d75c06708c60483a0069a8723e269c0a0c56226d68b36a10
+  metadata.gz: 3be5427f297b326a9a37d2aa9f336071b3a19e1fac2455d5b958a67df79cf5b26f8b97bf22c424a66befff7890828ea7062b6c084ce63a5114dd69543a1a590a
+  data.tar.gz: b8df25ee30ec7f83ea9f5af9731020cc7ed21365c0a611638fee0312f332a3019b5caed9cfdf83388d25d6d9a8393298278e445688e0e158633e91a2fc7e4d0f

data/README.md

@@ -51,6 +51,15 @@ Or install it yourself as:
     end
     iterator.close
 
+    #Block
+    rocksdb.each do |data|
+      puts data
+    end
+
+    #Hash access
+    rocksdb['key'] = data
+    puts rocksdb['key']
+
     
     rocksdb.close
 

data/ext/rocksdb/extconf.rb

@@ -5,7 +5,7 @@ RbConfig::CONFIG["CPP"] = "g++ -E -std=gnu++11"
 
 if have_header('rocksdb/db.h') and have_library('rocksdb') 
   $CPPFLAGS << " -std=gnu++11"
-  create_makefile("RocksDB")
+  create_makefile("RocksDB/RocksDB")
 else
   abort "can't find header or library of rocksdb"
 end

data/ext/rocksdb/rocksdb_db_rb.cc

@@ -27,7 +27,7 @@ extern "C" {
 
   VALUE db_alloc(VALUE klass){
     rocksdb_pointer* db_pointer = ALLOC(rocksdb_pointer);
-    return Data_Wrap_Struct(klass, 0, -1, db_pointer);
+    return Data_Wrap_Struct(klass, 0, db_free, db_pointer);
   }
 
   VALUE rocksdb_db_put(VALUE self, VALUE v_key, VALUE v_value) {
@@ -91,7 +91,7 @@ extern "C" {
 
     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());
+      RARRAY_PTR(v_array)[i] = rb_enc_str_new(values[i].data(), values[i].size(), rb_utf8_encoding());
     }
     return v_array;
   }
@@ -124,10 +124,19 @@ extern "C" {
     rocksdb_pointer* db_pointer;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
 
-    delete db_pointer->db;
+    db_free(db_pointer);
     return Qnil;
   }
 
+  void db_free(rocksdb_pointer* db_pointer){
+    std::cout << "free\n";
+    if(db_pointer->db != NULL){
+      delete db_pointer->db;
+      db_pointer->db = NULL;
+    }
+    delete db_pointer;
+  }
+
   VALUE rocksdb_db_new_iterator(VALUE self){
     rocksdb_pointer* db_pointer;
     rocksdb_iterator_pointer* rocksdb_it;
@@ -146,23 +155,20 @@ extern "C" {
 
 
   VALUE rocksdb_db_each(VALUE self){
+    if(!rb_block_given_p()){
+      return rocksdb_db_new_iterator(self);
+    }
+    
     rocksdb_pointer* db_pointer;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
     rocksdb::Iterator* it = db_pointer->db->NewIterator(rocksdb::ReadOptions());
 
-    long i;
-    volatile VALUE ary = rb_ary_new();
-
-    i = 0;
     for (it->SeekToFirst(); it->Valid(); it->Next()) {
-      VALUE v = rb_enc_str_new(it->value().data(), it->value().size(), rb_utf8_encoding());
-      rb_ary_store(ary, i, v);
-      rb_yield(RARRAY_PTR(ary)[i]);
-      i++;
+      rb_yield(rb_enc_str_new(it->value().data(), it->value().size(), rb_utf8_encoding()));
     }
+    
     delete it;
-
-    return ary;
+    return self;
   }
 
   VALUE rocksdb_db_reverse_each(VALUE self){
@@ -170,20 +176,12 @@ extern "C" {
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);
     rocksdb::Iterator* it = db_pointer->db->NewIterator(rocksdb::ReadOptions());
 
-    long i;
-    volatile VALUE ary = rb_ary_new();
-
-    i = 0;
     for (it->SeekToLast(); it->Valid(); it->Prev()) {
-      VALUE v = rb_enc_str_new(it->value().data(), it->value().size(), rb_utf8_encoding());
-      rb_ary_store(ary, i, v);
-      rb_yield(RARRAY_PTR(ary)[i]);
-      i++;
+      rb_yield(rb_enc_str_new(it->value().data(), it->value().size(), rb_utf8_encoding()));
     }
+    
     delete it;
-
-    return ary;
-
+    return self;
   }
 
   VALUE rocksdb_db_debug(VALUE self){

data/ext/rocksdb/rocksdb_db_rb.h

@@ -17,5 +17,5 @@ extern "C" {
   VALUE rocksdb_db_each(VALUE self);
   VALUE rocksdb_db_each_index(VALUE self);
   VALUE rocksdb_db_reverse_each(VALUE self);
-
+  void db_free(rocksdb_pointer* db_pointer);
 }

data/lib/rocksdb/ruby/version.rb

@@ -1,5 +1,5 @@
 module Rocksdb
   module Ruby
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/spec/db_spec.rb

@@ -63,9 +63,12 @@ describe RocksDB do
     @rocksdb.put("test:japanese", "あいうえお")
 
     expect(@rocksdb.get("test:japanese")).to eq "あいうえお"
+    expect(@rocksdb.multi_get(["test:japanese"])).to eq ["あいうえお"]
   end
 
   it 'should use each' do
+    iter = @rocksdb.each 
+
     array = []
     @rocksdb.each do |value|
       expect(value).not_to be_empty
@@ -79,7 +82,7 @@ describe RocksDB do
     end
 
     expect(array).to eq rev_array.reverse
-    
+    iter.close
   end
 
   it 'should exists?' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocksdb-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Isamu Arimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler