roma 1.1.0 → 1.2.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roma
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Junji Torii
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -27,19 +27,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: tokyocabinet
+  name: jaro_winkler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.29.1
-  type: :development
+        version: 1.3.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.29.1
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -132,12 +132,13 @@ executables:
 - cpdb
 - recoverlost_alist_all
 - log_merger
+- check_tc_flag
 - ssroute
 - safecopy_test
 - mkconfig
 - safecopy_integration_test
+- roma-adm
 - simple_bench
-- tc_data_restore.rb
 - mkrecent
 - recoverlost
 - mkroute
@@ -157,9 +158,11 @@ extra_rdoc_files:
 files:
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- bin/check_tc_flag
 - bin/chg_redundancy
 - bin/cpdb
 - bin/key_access
@@ -173,6 +176,7 @@ files:
 - bin/recoverlost_alist
 - bin/recoverlost_alist_all
 - bin/recoverlost_alist_keys
+- bin/roma-adm
 - bin/roma_watcher
 - bin/romad
 - bin/safecopy_integration_test
@@ -182,7 +186,6 @@ files:
 - bin/sample_watcher3
 - bin/simple_bench
 - bin/ssroute
-- bin/tc_data_restore.rb
 - bin/test-scenario
 - bin/tribunus
 - lib/roma/async_process.rb
@@ -199,6 +202,8 @@ files:
 - lib/roma/dns_cache.rb
 - lib/roma/event/con_pool.rb
 - lib/roma/event/handler.rb
+- lib/roma/event/jaro_winkler.rb
+- lib/roma/event/levenshtein.rb
 - lib/roma/logging/rlogger.rb
 - lib/roma/messaging/con_pool.rb
 - lib/roma/plugin/plugin_alist.rb
@@ -224,6 +229,7 @@ files:
 - lib/roma/storage/rh_storage.rb
 - lib/roma/storage/sqlite3_storage.rb
 - lib/roma/storage/tc_storage.rb
+- lib/roma/tools/check_tc_flag.rb
 - lib/roma/tools/chg_redundancy.rb
 - lib/roma/tools/cpdb.rb
 - lib/roma/tools/key_access.rb
@@ -238,6 +244,7 @@ files:
 - lib/roma/tools/recoverlost_alist_all.rb
 - lib/roma/tools/recoverlost_alist_keys.rb
 - lib/roma/tools/recoverlost_lib.rb
+- lib/roma/tools/roma-adm.rb
 - lib/roma/tools/roma_watcher.rb
 - lib/roma/tools/roma_watcher_config.yml.example
 - lib/roma/tools/safecopy_integration_test.rb
@@ -255,20 +262,30 @@ files:
 - test/config4mhash.rb
 - test/config4storage_error.rb
 - test/config4test.rb
+- test/cpdbtest/config4cpdb_base.rb
+- test/cpdbtest/config4cpdb_dbm.rb
+- test/cpdbtest/config4cpdb_groonga.rb
+- test/cpdbtest/config4cpdb_rh.rb
+- test/cpdbtest/config4cpdb_sqlite3.rb
+- test/cpdbtest/config4cpdb_tc.rb
+- test/cpdbtest/config4cpdb_tcmem.rb
 - test/rcirb.rb
 - test/roma-test-utils.rb
 - test/run-test.rb
 - test/storage_error_storage.rb
 - test/t_command_definition.rb
 - test/t_cpdata.rb
+- test/t_cpdb.rb
 - test/t_eventmachine.rb
 - test/t_listplugin.rb
+- test/t_logshift.rb
 - test/t_mapcountplugin.rb
 - test/t_mapplugin.rb
 - test/t_mhash.rb
 - test/t_protocol.rb
 - test/t_rclient.rb
 - test/t_routing_data.rb
+- test/t_routing_logic.rb
 - test/t_storage.rb
 - test/t_storage_error.rb
 - test/t_writebehind.rb

data/bin/tc_data_restore.rb

@@ -1,123 +0,0 @@
-require 'optparse'
-require 'tokyocabinet'
-require 'roma-client'
-#require 'roma/client/rclient'
-
-class TCRecover
-  include TokyoCabinet
-
-  def initialize(argv)
-    @timeout = 5
-    @data_path = nil
-    @division_num = 10
-    @wait_param = 0.001
-    
-    opts = OptionParser.new
-    opts.banner = "usage:#{File.basename($0)} [options] address:port storage_path ..."
-    opts.on("-n","--division [num]","(default=10)"){|v| @division_num = v.to_i }
-    opts.on("-w","--wait [num]","(default=0.001)"){|v| @wait_param = v.to_i }
-    opts.parse!(argv)
-    
-    if argv.length < 2
-      STDERR.puts opts.help
-      exit!
-    end
-
-    node = argv[0].sub(':','_')
-
-    @rc = Roma::Client::RomaClient.new([node])
-    @rttable = @rc.rttable
-    
-    @data_paths = argv[1..-1]
-
-    @data_paths.each do |path|
-      each_storage(path) do |tc|
-        #p tc
-        hdb = open_db(tc)
-        start_recover(hdb)
-        close_db(hdb)
-      end
-    end
-  end
-  
-  def open_db(fname)
-    hdb = HDB::new
-    if !hdb.open(fname, HDB::OREADER | HDB::ONOLCK)
-      ecode = hdb.ecode
-      raise RuntimeError.new("tcdb open error #{hdb.errmsg(ecode)}")
-    end
-    hdb
-  end
-  
-  def close_db(hdb)
-    if !hdb.close
-      ecode = hdb.ecode
-      raise RuntimeError.new("tcdb close error #{hdb.errmsg(ecode)}")
-    end
-  end
-  
-  # [ 0.. 3] vn
-  # [ 4.. 7] physical clock (unix time)
-  # [ 8..11] logical clock
-  # [12..15] exptime(unix time)
-  # [16..  ] value data
-  PACK_HEADER_TEMPLATE='NNNN'
-  PACK_TEMPLATE=PACK_HEADER_TEMPLATE+'a*'
-  def unpack_header(str)
-    str.unpack(PACK_HEADER_TEMPLATE)
-  end
-  def unpack_data(str)
-    str.unpack(PACK_TEMPLATE)
-  end
-  
-  def get_raw(key)
-    nid, d = @rttable.search_node(key)
-    cmd = "eval @storages[\"roma\"].get_raw2(\"#{key}\")"
-    timeout(@timeout){
-      sender = @rc.instance_variable_get(:@sender)
-      return sender.send_command(nid, cmd)
-    }
-  end
-  
-  def each_storage(path)
-    Dir::glob("#{path}/*").each{|file|
-      yield file if file =~ /\.tc/
-    }      
-  end
-
-  def cmp_clk(clk1, clk2)
-    if (clk1-clk2).abs < 0x80000000 # 1<<31
-      clk1 <=> clk2
-    else
-      clk2 <=> clk1
-    end
-  end
-
-  def start_recover(hdb)
-    hdb.each do |k, v|
-p k
-p v
-#p @rc.methods
-
-      rv = @rc[k]
-      p "#{k} : #{rv}"
-      next if rv
-
-      roma_raw_data = eval(get_raw(k))
-      b_vn, b_t, b_clk, b_expt, b_v = unpack_data(v)
-
-      if roma_raw_data
-        r_vn, r_t, r_clk, r_expt, r_v = roma_raw_data
-        if cmp_clk(r_clk, b_clk) <= 0
-          @rc[k] = Marshal.load(b_v)
-          print "."
-        end
-      else
-        @rc[k] = Marshal.load(b_v)
-        print "."
-      end
-    end
-  end
-end
-  
-tc_recover = TCRecover.new(ARGV)