rocksdb-ruby 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e6ff2cad354cadc31a44416ef54a7d34f1d3378
-  data.tar.gz: 9c9ec1928f6528ee8d0d5ca65280cdaa0d577ef4
+  metadata.gz: b3d3d57184046e4127d2d843d04e549d85547311
+  data.tar.gz: d062ed4026b6469c6f14a6788894d442e648bf93
 SHA512:
-  metadata.gz: 16d1135da6af3589a3a7d99d1ab2da714a353fb3286e7ed9f70fa540a3079719396be9a5512719890d89df9bc074303be04c8b8eb105eb1f175680c33e472168
-  data.tar.gz: 80e078c1ac478de2e77527d532080efb127d992ab77505e8924da3c9c0ca65d18cf044c318320823c995744ecd184c2957bc91ae8774e2a5c9b579f6f763f613
+  metadata.gz: 2f650e958abed13456d2967404041de91a08da1ee303def9f16cc9abfbc8a5e4a6143daac8cdc922e7a0d1970e91c7fab5cbe4843c27b51fc63a9c231a9a4485
+  data.tar.gz: 12e3da582a353960c906e1b4cc76a5f1d0a84fb7ada488d0d6ed5bd6f91754e26d27625e0e45c1b5d48c67e9a3cecc2657b9e048cd0379ded83e3f5607b13980

data/ext/rocksdb/rocksdb_db_rb.cc

@@ -28,7 +28,12 @@ extern "C" {
       if(v == Qtrue){
 	readonly = true;
       }
+      set_opt(&options, &v_options);
     }
+    //std::cout << options.max_bytes_for_level_base << "\n";
+    //std::cout << options.max_grandparent_overlap_factor << "\n";
+    //std::cout << options.delete_obsolete_files_period_micros << "\n";
+
     options.create_if_missing = true;
     if(readonly){
       status = rocksdb::DB::OpenForReadOnly(options, db_file_name, &db);
@@ -41,6 +46,26 @@ extern "C" {
     return status.ok() ? Qtrue : Qfalse;
   }
 
+  void set_opt_unit_val(uint64_t* opt, char* name, VALUE *v_options){
+
+    VALUE v2 = rb_hash_aref(*v_options, ID2SYM(rb_intern(name)));
+    if(RB_TYPE_P(v2, T_FIXNUM)){
+      *opt = NUM2INT(v2);
+    }
+  }
+  void set_opt_int_val(int* opt, char* name, VALUE *v_options){
+    VALUE v2 = rb_hash_aref(*v_options, ID2SYM(rb_intern(name)));
+    if(RB_TYPE_P(v2, T_FIXNUM)){
+      *opt = NUM2INT(v2);
+    }
+  }
+
+  void set_opt(rocksdb::Options* options, VALUE *v_options){
+    set_opt_unit_val(&options->max_bytes_for_level_base, (char *) "max_bytes_for_level_base", v_options);
+    set_opt_int_val(&options->max_grandparent_overlap_factor, (char *) "max_grandparent_overlap_factor", v_options);
+    set_opt_unit_val(&options->delete_obsolete_files_period_micros, (char *) "delete_obsolete_files_period_micros", v_options);
+  }
+
   VALUE db_alloc(VALUE klass){
     rocksdb_pointer* db_pointer = ALLOC(rocksdb_pointer);
     return Data_Wrap_Struct(klass, 0, db_free, db_pointer);
@@ -189,6 +214,44 @@ extern "C" {
     return self;
   }
 
+  VALUE rocksdb_db_each_index(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());
+
+    for (it->SeekToFirst(); it->Valid(); it->Next()) {
+      rb_yield(rb_enc_str_new(it->key().data(), it->key().size(), rb_utf8_encoding()));
+    }
+    
+    delete it;
+    return self;
+  }
+
+  VALUE rocksdb_db_each_with_index(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());
+
+    for (it->SeekToFirst(); it->Valid(); it->Next()) {
+      VALUE a = rb_enc_str_new(it->key().data(), it->key().size(), rb_utf8_encoding());
+      VALUE b = rb_enc_str_new(it->value().data(), it->value().size(), rb_utf8_encoding());
+      rb_yield_values(2, a, b);
+    }
+    
+    delete it;
+    return self;
+  }
+
+  
+
   VALUE rocksdb_db_reverse_each(VALUE self){
     rocksdb_pointer* db_pointer;
     Data_Get_Struct(self, rocksdb_pointer, db_pointer);

data/ext/rocksdb/rocksdb_db_rb.h

@@ -16,6 +16,10 @@ extern "C" {
   VALUE rocksdb_db_new_iterator(VALUE self);
   VALUE rocksdb_db_each(VALUE self);
   VALUE rocksdb_db_each_index(VALUE self);
+  VALUE rocksdb_db_each_with_index(VALUE self);
   VALUE rocksdb_db_reverse_each(VALUE self);
   void db_free(rocksdb_pointer* db_pointer);
+  void set_opt(rocksdb::Options* opt, VALUE *v_options);
+  void set_opt_unit_val(uint64_t* opt, char* name, VALUE *v_options);
+  void set_opt_int_val(int* opt, char* name, VALUE *v_options);
 }

data/ext/rocksdb/rocksdb_rb.cc

@@ -32,6 +32,8 @@ extern "C" {
     rb_define_method(cRocksdb_db, "new_iterator", (METHOD)rocksdb_db_new_iterator, 0);
 
     rb_define_method(cRocksdb_db, "each", (METHOD)rocksdb_db_each, 0);
+    rb_define_method(cRocksdb_db, "each_index", (METHOD)rocksdb_db_each_index, 0);
+    rb_define_method(cRocksdb_db, "each_with_index", (METHOD)rocksdb_db_each_with_index, 0);
     rb_define_method(cRocksdb_db, "reverse_each", (METHOD)rocksdb_db_reverse_each, 0);
 
     cRocksdb_write_batch = rb_define_class_under(cRocksdb, "Batch", rb_cObject);

data/lib/rocksdb/ruby/version.rb

@@ -1,5 +1,5 @@
 module Rocksdb
   module Ruby
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/db_options_spec.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require "rocksdb"
+
+describe RocksDB do
+  before do
+    @rocksdb = RocksDB::DB.new "/tmp/file3", {:max_bytes_for_level_base => 10485760, :max_grandparent_overlap_factor => 20}
+  end
+
+  it 'should get data' do
+    @rocksdb.put("test:multi_db", "10")
+    expect(@rocksdb.get("test:multi_db")).to eq "10"
+  end
+
+  after do
+    @rocksdb.close
+  end
+end

data/spec/db_spec.rb

@@ -81,8 +81,19 @@ describe RocksDB do
       expect(value).not_to be_empty
       rev_array << value
     end
+ 
 
     expect(array).to eq rev_array.reverse
+
+    @rocksdb.each_index do |key|
+      expect(key).not_to be_empty
+    end
+
+    @rocksdb.each_with_index do |key, value|
+      expect(key).not_to be_empty
+      expect(value).not_to be_empty
+    end
+
     iter.close
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocksdb-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Isamu Arimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,7 @@ files:
 - lib/rocksdb/ruby.rb
 - lib/rocksdb/ruby/version.rb
 - rocksdb-ruby.gemspec
+- spec/db_options_spec.rb
 - spec/db_readonly_spec.rb
 - spec/db_spec.rb
 - spec/iterator_spec.rb
@@ -105,11 +106,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A simple RocksDB library for Ruby
 test_files:
+- spec/db_options_spec.rb
 - spec/db_readonly_spec.rb
 - spec/db_spec.rb
 - spec/iterator_spec.rb