roma-storage 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c2510a2520e68f70dae57e6d038295a89b10e246bcd5f1b10539691ff9258bf
-  data.tar.gz: 65f8e45637f5bbf488b77d0969ea3e2d7fb68da23973bd7148df0208e41c69aa
+  metadata.gz: 7c31aa7cc18149d6d2a51e416510910f8933d7d1c9b1e92cbe104baa6bc9f184
+  data.tar.gz: 6cf7dbbb472c7f33c2ce255fea9614785af25943774f2fcdbf4b4aed191dc3cf
 SHA512:
-  metadata.gz: 11c99d2cd9a446abece1a9fa8cfa42a87eb8cd51203c4ff1de20d1e58072e64e28a10d5c668af546e213f4c64e623ecdfe4383edabde9155c9abd7cbab93fc67
-  data.tar.gz: 848ede96b5092d9b20c0e8587eaf721cc87b408af343c4dd07b6ac89e10beeb012d7952ad39b663a37c22a4a82aa077e11db482357d5b191f45082b6acb00f3c
+  metadata.gz: b50736e004324c4c4bd3f351d2e6f4fdeabfae3710dbe6d1626b8ca6b0ddc3beb279ee7555957b7da87c6ae2436d910d1079ecfb46778de6b6156b07f5abd6bd
+  data.tar.gz: 5a65bcde0d87fb4053e55a9e6e8e07a1e8242c4a1d1b1e3093d271a14eb9151bb444890c1119c614d1bcda854bad5bb541547f79796d37e199bdf4af21a7786e

data/README.md

@@ -1,5 +1,9 @@
 # Roma::Storage
 
+[![Build Status](https://travis-ci.org/roma/roma-storage.svg?branch=master)](https://travis-ci.org/roma/roma-storage)
+[![Maintainability](https://api.codeclimate.com/v1/badges/c13d593018a15a64b6f8/maintainability)](https://codeclimate.com/github/roma/roma-storage/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/c13d593018a15a64b6f8/test_coverage)](https://codeclimate.com/github/roma/roma-storage/test_coverage)
+
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/roma/storage`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 TODO: Delete this and the text above, and describe your gem
@@ -32,7 +36,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/satoryu/roma-storage. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/roma/roma-storage. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -40,4 +44,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Roma::Storage project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/satoryu/roma-storage/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Roma::Storage project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/roma/roma-storage/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,6 +1,10 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'rake/testtask'
 
-RSpec::Core::RakeTask.new(:spec)
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/**/test_*.rb']
+  t.verbose = true
+end
 
-task :default => :spec
+task :default => :test

data/lib/roma/storage/basic_storage.rb

@@ -156,8 +156,8 @@ module Roma
 
         if @dbs[n] == :cachecleaning && d
           # in case of existing value is both @hdb and @hdbc
-          vn, lat, clk, expt = unpack_header(d)
-          cvn, clat, cclk, cexpt = unpack_header(c)
+          vn, _lat, clk, _expt = unpack_header(d)
+          _cvn, _clat, cclk, _cexpt = unpack_header(c)
           return d if cmp_clk(clk, cclk) > 0 # if @hdb newer than @hdbc
         end
         c
@@ -226,7 +226,7 @@ module Roma
         buf = db_get(vn, k)
         clk = 0
         if buf
-          vn, t, clk, expt2, v2 = unpack_data(buf)
+          vn, _t, clk, expt2, _v2 = unpack_data(buf)
           return nil if Time.now.to_i <= expt2
           clk = (clk + 1) & 0xffffffff
         end
@@ -242,7 +242,7 @@ module Roma
         return nil unless buf
 
         # buf != nil
-        vn, t, clk, expt2, v2 = unpack_data(buf)
+        vn, _t, clk, expt2, _v2 = unpack_data(buf)
         return nil if Time.now.to_i > expt2
         clk = (clk + 1) & 0xffffffff
 
@@ -256,7 +256,7 @@ module Roma
         return nil unless buf
 
         # buf != nil
-        vn, t, clk, expt2, v2 = unpack_data(buf)
+        vn, _t, clk, expt2, v2 = unpack_data(buf)
         return nil if Time.now.to_i > expt2
         clk = (clk + 1) & 0xffffffff
 
@@ -270,7 +270,7 @@ module Roma
         return nil unless buf
 
         # buf != nil
-        vn, t, clk, expt2, v2 = unpack_data(buf)
+        vn, _t, clk, expt2, v2 = unpack_data(buf)
         return nil if Time.now.to_i > expt2
         clk = (clk + 1) & 0xffffffff
 
@@ -282,7 +282,7 @@ module Roma
       def get(vn, k, d)
         buf = db_get(vn, k)
         return nil unless buf
-        vn, t, clk, expt, v = unpack_data(buf)
+        vn, _t, _clk, expt, v = unpack_data(buf)
 
         return nil if Time.now.to_i > expt
         v
@@ -331,7 +331,7 @@ module Roma
         v = ret = nil
         clk = 0
         if buf
-          vn, t, clk, expt, v2 = unpack_data(buf)
+          vn, _t, clk, expt, v2 = unpack_data(buf)
           return :deletemark if expt == 0
           clk = (clk + 1) & 0xffffffff
           v = v2 if v2 && v2.length != 0 && Time.now.to_i <= expt
@@ -358,7 +358,7 @@ module Roma
         return nil unless buf
 
         # buf != nil
-        vn, t, clk, expt2, v2 = unpack_data(buf)
+        vn, _t, clk, expt2, v2 = unpack_data(buf)
         return nil if Time.now.to_i > expt2
         clk = (clk + 1) & 0xffffffff
 
@@ -376,7 +376,7 @@ module Roma
         return nil unless buf
 
         # buf != nil
-        vn, t, clk, expt2, v2 = unpack_data(buf)
+        vn, _t, clk, expt2, v2 = unpack_data(buf)
         return nil if Time.now.to_i > expt2
         clk = (clk + 1) & 0xffffffff
 
@@ -393,7 +393,7 @@ module Roma
       def set_expt(vn, k, d, expt)
         buf = db_get(vn, k)
         if buf
-          vn, t, clk, expt2, v = unpack_data(buf)
+          vn, _t, clk, expt2, v = unpack_data(buf)
           return nil if Time.now.to_i > expt2
           clk = (clk + 1) & 0xffffffff
           ret = [vn, Time.now.to_i, clk, expt, v]
@@ -467,7 +467,7 @@ module Roma
         h = Marshal.load(dmp)
         h.each_pair{ |k, v|
           # remort data
-          r_vn, r_last, r_clk, r_expt = unpack_header(v)
+          r_vn, r_last, r_clk, _r_expt = unpack_header(v)
           raise "An invalid vnode number is include.key=#{k} vn=#{r_vn}" unless @hdiv.key?(r_vn)
           local = @hdb[@hdiv[r_vn]].get(k)
           if local == nil
@@ -475,7 +475,7 @@ module Roma
             @hdb[@hdiv[r_vn]].put(k, v)
           else
             # local data
-            l_vn, l_last, l_clk, l_expt = unpack_data(local)
+            _l_vn, l_last, l_clk, _l_expt = unpack_data(local)
             if r_last - l_last < @logic_clock_expire && cmp_clk(r_clk,l_clk) <= 0
             else # remort is newer.
               n += 1

data/lib/roma/storage/hash.rb

@@ -0,0 +1,114 @@
+require 'roma/storage/basic_storage'
+
+module Roma
+  module Storage
+
+    module RH_Ext
+      def put(k,v); self[k] = v; end
+      def get(k); self[k]; end
+      def out(k); delete(k); end
+      def rnum; length; end
+      def sync; true; end
+    end
+
+    class HashStorage < BasicStorage
+
+      def opendb
+        create_div_hash
+        @divnum.times do |i|
+          @hdb[i] = open_db(nil)
+          @hdbc[i] = nil
+          @dbs[i] = :normal
+        end
+      end
+
+      if RUBY_VERSION >= '1.9.2'
+        def each_clean_up(t, vnhash)
+          @do_clean_up = true
+          nt = Time.now.to_i
+          @hdb.each{ |hdb|
+            keys = hdb.keys
+            keys.each{ |k|
+              v = hdb[k]
+              return unless @do_clean_up
+              vn, last, _clk, expt = unpack_header(v)
+              vn_stat = vnhash[vn]
+              if vn_stat == :primary && ( (expt != 0 && nt > expt) || (expt == 0 && t > last) )
+                yield k, vn
+                hdb.out(k) if hdb.get(k) == v
+              elsif vn_stat == nil && t > last
+                yield k, vn
+                hdb.out(k) if hdb.get(k) == v
+              end
+              sleep @each_clean_up_sleep
+            }
+          }
+        end
+
+        def each_unpacked_db(target_vn, db)
+          count = 0
+          tn =  Time.now.to_i
+          keys = db[@hdiv[target_vn]].keys
+          keys.each do |k|
+            v = db[@hdiv[target_vn]][k]
+            vn, last, clk, expt, val = unpack_data(v)
+            if vn != target_vn || (expt != 0 && tn > expt)
+              count += 1
+              sleep @each_vn_dump_sleep if count % @each_vn_dump_sleep_count == 0
+              next
+            end
+            yield vn, last, clk, expt, k, val
+          end
+        end
+        private :each_unpacked_db
+
+
+        def each_hdb_dump(i,except_vnh = nil)
+          count = 0
+          keys = @hdb[i].keys
+          keys.each{|k|
+            v = @hdb[i][k]
+            vn, last, clk, expt, val = unpack_data(v)
+            if except_vnh && except_vnh.key?(vn) || Time.now.to_i > expt
+              count += 1
+              sleep @each_vn_dump_sleep if count % @each_vn_dump_sleep_count == 0
+            else
+              yield [vn, last, clk, expt, k.length, k, val.length, val].pack("NNNNNa#{k.length}Na#{val.length}")
+              sleep @each_vn_dump_sleep
+            end
+          }
+        end
+
+        # Create vnode dump.
+        def get_vnode_hash(vn)
+          buf = {}
+          count = 0
+          hdb = @hdb[@hdiv[vn]]
+          keys = hdb.keys
+          keys.each{ |k|
+            v = hdb[k]
+            count += 1
+            sleep @each_vn_dump_sleep if count % @each_vn_dump_sleep_count == 0
+            dat = unpack_data(v) #v.unpack('NNNN')
+            buf[k] = v if dat[0] == vn
+          }
+          return buf
+        end
+        private :get_vnode_hash
+        
+      end
+
+      private
+
+      def open_db(fname)
+        hdb = {}
+        hdb.extend(Roma::Storage::RH_Ext)
+        return hdb
+      end
+
+      def close_db(hdb); end
+
+    end # class HashStorage
+
+  end # module Storage
+end # module Roma

data/lib/roma/storage/ruby_hash_storage.rb

@@ -1,114 +1,9 @@
-require 'roma/storage/basic_storage'
+# Deprecated: require 'roma/storage/hash' and use Roma::Storage::HashStorage.
+require 'roma/storage/hash'
 
 module Roma
   module Storage
-
-    module RH_Ext
-      def put(k,v); self[k] = v; end
-      def get(k); self[k]; end
-      def out(k); delete(k); end
-      def rnum; length; end
-      def sync; true; end
-    end
-
-    class RubyHashStorage < BasicStorage
-
-      def opendb
-        create_div_hash
-        @divnum.times do |i|
-          @hdb[i] = open_db(nil)
-          @hdbc[i] = nil
-          @dbs[i] = :normal
-        end
-      end
-
-      if RUBY_VERSION >= '1.9.2'
-        def each_clean_up(t, vnhash)
-          @do_clean_up = true
-          nt = Time.now.to_i
-          @hdb.each{ |hdb|
-            keys = hdb.keys
-            keys.each{ |k|
-              v = hdb[k]
-              return unless @do_clean_up
-              vn, last, clk, expt = unpack_header(v)
-              vn_stat = vnhash[vn]
-              if vn_stat == :primary && ( (expt != 0 && nt > expt) || (expt == 0 && t > last) )
-                yield k, vn
-                hdb.out(k) if hdb.get(k) == v
-              elsif vn_stat == nil && t > last
-                yield k, vn
-                hdb.out(k) if hdb.get(k) == v
-              end
-              sleep @each_clean_up_sleep
-            }
-          }
-        end
-
-        def each_unpacked_db(target_vn, db)
-          count = 0
-          tn =  Time.now.to_i
-          keys = db[@hdiv[target_vn]].keys
-          keys.each do |k|
-            v = db[@hdiv[target_vn]][k]
-            vn, last, clk, expt, val = unpack_data(v)
-            if vn != target_vn || (expt != 0 && tn > expt)
-              count += 1
-              sleep @each_vn_dump_sleep if count % @each_vn_dump_sleep_count == 0
-              next
-            end
-            yield vn, last, clk, expt, k, val
-          end
-        end
-        private :each_unpacked_db
-
-
-        def each_hdb_dump(i,except_vnh = nil)
-          count = 0
-          keys = @hdb[i].keys
-          keys.each{|k|
-            v = @hdb[i][k]
-            vn, last, clk, expt, val = unpack_data(v)
-            if except_vnh && except_vnh.key?(vn) || Time.now.to_i > expt
-              count += 1
-              sleep @each_vn_dump_sleep if count % @each_vn_dump_sleep_count == 0
-            else
-              yield [vn, last, clk, expt, k.length, k, val.length, val].pack("NNNNNa#{k.length}Na#{val.length}")
-              sleep @each_vn_dump_sleep
-            end
-          }
-        end
-
-        # Create vnode dump.
-        def get_vnode_hash(vn)
-          buf = {}
-          count = 0
-          hdb = @hdb[@hdiv[vn]]
-          keys = hdb.keys
-          keys.each{ |k|
-            v = hdb[k]
-            count += 1
-            sleep @each_vn_dump_sleep if count % @each_vn_dump_sleep_count == 0
-            dat = unpack_data(v) #v.unpack('NNNN')
-            buf[k] = v if dat[0] == vn
-          }
-          return buf
-        end
-        private :get_vnode_hash
-        
-      end
-
-      private
-
-      def open_db(fname)
-        hdb = {}
-        hdb.extend(Roma::Storage::RH_Ext)
-        return hdb
-      end
-
-      def close_db(hdb); end
-
-    end # class RubyHashStorage
-
-  end # module Storage
-end # module Roma
+    RubyHashStorage = HashStorage
+    deprecate_constant :RubyHashStorage
+  end
+end

data/lib/roma/storage/version.rb

@@ -1,5 +1,5 @@
 module Roma
   module Storage
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/roma/storage.rb

@@ -1,5 +1,4 @@
 require 'roma/storage/version'
 require 'roma/storage/basic_storage'
-require 'roma/storage/dbm_storage'
 require 'roma/storage/dummy_storage'
-require 'roma/storage/ruby_hash_storage'
+require 'roma/storage/hash'

data/roma-storage.gemspec

@@ -7,30 +7,25 @@ Gem::Specification.new do |spec|
   spec.name          = "roma-storage"
   spec.version       = Roma::Storage::VERSION
   spec.authors       = ["Tatsuya Sato"]
-  spec.email         = ["tatsuya.b.sato@rakuten.com"]
+  spec.email         = ["satoryu.1981@gmail.com"]
 
-  spec.summary       = %q{Storages available for Roma server.}
-  spec.description   = %q{This gem provides storage classes available for Roma server.}
-  spec.homepage      = "https://roma-kvs.org/"
-  spec.license       = "GPL-3.0"
+  spec.summary       = %q{The storages of ROMA.}
+  spec.description   = %q{The base class of the storages of ROMA, and the storage on a Ruby Hash.}
+  spec.homepage      = "https://github.com/roma/roma-storage"
+  spec.license       = "GPL-3.0-only"
+  spec.required_ruby_version = '>= 3.4'
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["source_code_uri"] = spec.homepage
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|bin)/|^\.})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "test-unit"
 end

metadata

@@ -1,86 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: roma-storage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tatsuya Sato
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: This gem provides storage classes available for Roma server.
+        version: '0'
+description: The base class of the storages of ROMA, and the storage on a Ruby Hash.
 email:
-- tatsuya.b.sato@rakuten.com
+- satoryu.1981@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - lib/roma/storage.rb
 - lib/roma/storage/basic_storage.rb
 - lib/roma/storage/dummy_storage.rb
+- lib/roma/storage/hash.rb
 - lib/roma/storage/ruby_hash_storage.rb
 - lib/roma/storage/version.rb
 - roma-storage.gemspec
-homepage: https://roma-kvs.org/
+homepage: https://github.com/roma/roma-storage
 licenses:
-- GPL-3.0
+- GPL-3.0-only
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+  source_code_uri: https://github.com/roma/roma-storage
 rdoc_options: []
 require_paths:
 - lib
@@ -88,16 +83,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 4.0.10
 specification_version: 4
-summary: Storages available for Roma server.
+summary: The storages of ROMA.
 test_files: []

data/.gitignore

@@ -1,12 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-Gemfile.lock
-
-# rspec failure tracking
-.rspec_status

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.1
-before_install: gem install bundler -v 1.16.1

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "roma/storage"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here