roma 0.8.14 → 1.0.0

data/ruby/server/lib/roma/version.rb

@@ -1,4 +1,4 @@
 
 module Roma
-  VERSION = "0.8.14"
+  VERSION = "1.0.0"
 end

data/ruby/server/test/t_protocol.rb

@@ -11,7 +11,7 @@ class ProtocolTest < Test::Unit::TestCase
   end
 
   def teardown
-    @sock.close
+    @sock.close if @sock
     stop_roma
   rescue => e
     puts "#{e} #{$@}"

data/ruby/server/test/t_storage.rb

@@ -444,7 +444,7 @@ class TCStorageTest < Test::Unit::TestCase
       @st.delete(0, "key#{i}", 0)
     }
     count = 0
-    @st.each_vn_dump(0){|data|
+    res = @st.each_vn_dump(0){|data|
       vn, last, clk, expt, klen = data.slice!(0..19).unpack('NNNNN')
       k = data.slice!(0..(klen-1))
       vlen, = data.slice!(0..3).unpack('N')
@@ -457,6 +457,7 @@ class TCStorageTest < Test::Unit::TestCase
       assert_nil( @st.load_stream_dump(vn, last, clk, expt, k, v) )
       @st.load_stream_dump(2, last, clk, expt, k, v)
     }
+    assert(res)
     assert_equal(100,count)
     
     count = 0
@@ -493,34 +494,40 @@ class TCStorageTest < Test::Unit::TestCase
     }
 
     count = 0
-    @st.each_vn_dump(0){|data|
+    res = @st.each_vn_dump(0){|data|
       vn, last, clk, expt, klen = data.slice!(0..19).unpack('NNNNN')
       k = data.slice!(0..(klen-1))
       vlen, = data.slice!(0..3).unpack('N')
       v = data
       count += 1
 #      puts "#{vn} #{last} #{clk} #{expt} #{klen} #{k} #{vlen} #{v}"
-      assert_match(/key\d/, k)
-      if k[3..-1].to_i < 80
-        assert_match("val#{k[3..-1]}", v)
-      elsif k[3..-1].to_i < 90
-        assert_match("val#{k[3..-1].to_i + 1}", v)
-      else
-        assert(vlen == 0)
-      end
-
-      assert_nil( @st.load_stream_dump(vn, last, clk, expt, k, v) )
-      @st.load_stream_dump(2, last, clk, expt, k, v)
     }
-    assert_equal(100,count)
-    
-    count = 0
-    @st.each_vn_dump(1){|data| count += 1 }
-    assert_equal(0,count )
+    assert_equal(false, res)
+    assert_equal(0, count)
+  end
 
-    count = 0
-    @st.each_vn_dump(2){|data| count += 1 }
-    assert_equal(100,count )
+  def test_db_stat_with_each_vn_dump
+    n = 100 # number of data
+    m = 10 # number of vnode
+    # set data
+    n.times do |i|
+      m.times do|vn|
+        @st.set(vn,"key#{vn}_#{i}",0,0x7fffffff,"val#{i}")
+      end
+    end
+
+    m.times do |vn|
+      dn = @st.instance_eval{ @hdiv[vn] }
+      count = 0
+      res = @st.each_vn_dump(vn) do
+        assert_equal(false, @st.each_vn_dump(vn){})
+        assert_equal(:normal, @st.dbs[dn])
+        assert_equal(false, @st.set_db_stat(dn, :safecopy_flushing))
+        count += 1
+      end
+      assert_equal(n, count)
+      assert(res)
+    end
   end
 
   def test_db_stat

data/ruby/server/test/t_writebehind.rb

@@ -235,12 +235,33 @@ class WriteBehindTest < FileWriterTest
     wb0 = read_wb("#{wb_path}/0.wb")
     assert_equal(1, wb0.length)
     wb0.each do |last, cmd, key, val|
+      puts "#{cmd} #{key} #{val.inspect}"
       assert_equal(1, cmd)
       assert_equal("abc", key)
       assert_equal("value abc", val)
     end
   end
 
+  def test_wb2_set2
+    send_cmd("localhost_11211", "wb_command_map {:set=>1, :set__prev=>2}")
+    assert_equal("STORED", @rc.set("abc","val1",0,true))
+    assert_equal("STORED", @rc.set("abc","val2",0,true))
+    send_cmd("localhost_11211", "writebehind_rotate roma")
+
+    res = [[1,"abc","val1"], [2,"abc","val1"], [1,"abc","val2"]]
+    wb0 = read_wb("#{wb_path}/0.wb")
+    assert_equal(3, wb0.length)
+    i = 0
+    wb0.each do |last, cmd, key, val|
+      # puts "#{cmd} #{key} #{val.inspect} #{i}"
+      assert_equal(res[i][0], cmd)
+      assert_equal(res[i][1], key)
+      assert_equal(res[i][2], val)
+      i+=1
+    end
+  end
+
+
   def test_wb2_storage_commands
     h = {:set=>1,:delete=>2,:add=>3,:replace=>4,:append=>5,:prepend=>6,:cas=>7,:incr=>8,:decr=>9,:set_expt=>10}
     send_cmd("localhost_11211", "wb_command_map #{h}")
@@ -256,16 +277,73 @@ class WriteBehindTest < FileWriterTest
     assert_equal("STORED", res)
     assert_equal(129, @rc.incr("abc"))
     assert_equal(128, @rc.decr("abc"))
-    ## test for set_expt TODO
+    res = send_cmd("localhost_11211", "set_expt abc 100")
+    assert_equal("STORED", res.chomp)
     send_cmd("localhost_11211", "writebehind_rotate roma")
 
 
-    res = {1=>'1',2=>'1',3=>'1',4=>'2',5=>'23',6=>'123',7=>'128',8=>'129',9=>'128'}
+    res = {1=>'1',2=>'1',3=>'1',4=>'2',5=>'23',6=>'123',7=>'128',8=>'129',9=>'128', 10=>nil}
     wb0 = read_wb("#{wb_path}/0.wb")
-    assert_equal(9, wb0.length)
+    assert_equal(10, wb0.length)
     wb0.each do |last, cmd, key, val|
       # puts "#{cmd} #{key} #{val.inspect}"
-      assert_equal(res[cmd], val)
+      assert_equal(res[cmd], val) if res[cmd]
+    end
+  end
+
+  def test_wb2_storage_commands2
+    h = {
+      :set=>1, :set__prev=>11,
+      :delete=>2, :delete__prev=>12,
+      :add=>3, :add__prev=>13,
+      :replace=>4, :replace__prev=>14,
+      :append=>5,:append__prev=>15,
+      :prepend=>6,:prepend__prev=>16,
+      :cas=>7,:cas__prev=>17,
+      :incr=>8,:incr__prev=>18,
+      :decr=>9,:decr__prev=>19,
+      :set_expt=>10,:set_expt__prev=>20
+    }
+    send_cmd("localhost_11211", "wb_command_map #{h}")
+    assert_equal("STORED", @rc.set("abc","1",0,true))
+    assert_equal("DELETED", @rc.delete("abc"))
+    assert_equal("STORED", @rc.add("abc","1",0,true))
+    assert_equal("STORED", @rc.replace("abc","2",0,true))
+    assert_equal("STORED", @rc.append("abc","3"))
+    assert_equal("STORED", @rc.prepend("abc","1"))
+    res = @rc.cas("abc", 0, true) do |v|
+      v = "128"
+    end
+    assert_equal("STORED", res)
+    assert_equal(129, @rc.incr("abc"))
+    assert_equal(128, @rc.decr("abc"))
+    res = send_cmd("localhost_11211", "set_expt abc 100")
+    assert_equal("STORED", res.chomp)
+
+    send_cmd("localhost_11211", "writebehind_rotate roma")
+
+    res = [
+           [1, "abc", "1"], [12, "abc", "1"],
+           [2, "abc", "1"],
+           [3, "abc", "1"], [14, "abc", "1"],
+           [4, "abc", "2"], [15, "abc", "2"],
+           [5, "abc", "23"],[16, "abc", "23"],
+           [6, "abc", "123"], [17, "abc", "123"],
+           [7, "abc", "128"], [18, "abc", "128"],
+           [8, "abc", "129"], [19, "abc", "129"],
+           [9, "abc", "128"],
+           [20, "abc"], [10, "abc"]
+          ]
+
+    wb0 = read_wb("#{wb_path}/0.wb")
+    assert_equal(18, wb0.length)
+    i = 0
+    wb0.each do |last, cmd, key, val|
+      # puts "#{cmd} #{key} #{val.inspect}"
+      assert_equal(res[i][0], cmd)
+      assert_equal(res[i][1], key)
+      assert_equal(res[i][2], val) if res.length < 3
+      i += 1
     end
   end
 
@@ -336,7 +414,7 @@ class WriteBehindTest < FileWriterTest
     assert_equal('CLEARED', @rc.map_clear("abc"))
     send_cmd("localhost_11211", "writebehind_rotate roma")
 
-    res = {1=>'value1',2=>{},3=>{}}
+    res = {1=>{"mapkey1"=>"value1"},2=>{},3=>{}}
     wb0 = read_wb("#{wb_path}/0.wb")
     assert_equal(4, wb0.length)
     wb0.each do |last, cmd, key, val|
@@ -349,6 +427,43 @@ class WriteBehindTest < FileWriterTest
     end
   end
 
+  def test_wb2_map_commands2
+    h = {
+      :map_set=>1, :map_set__prev=>11, 
+      :map_delete=>2, :map_delete__prev=>12,
+      :map_clear=>3, :map_clear__prev=>13
+    }
+    send_cmd("localhost_11211", "wb_command_map #{h}")
+    assert_equal('STORED', @rc.map_set('abc','mapkey1','value1'))
+    assert_equal('STORED', @rc.map_set('abc','mapkey2','value2'))
+    assert_equal('DELETED', @rc.map_delete('abc', 'mapkey1'))
+    assert_equal('STORED', @rc.map_set('abc','mapkey1','value1'))
+    assert_equal('CLEARED', @rc.map_clear("abc"))
+    send_cmd("localhost_11211", "writebehind_rotate roma")
+
+    res = [
+           [1, {"mapkey1"=>"value1"}],
+           [11, {"mapkey1"=>"value1"}], [1, {"mapkey1"=>"value1", "mapkey2"=>"value2"}],
+           [12, {"mapkey1"=>"value1", "mapkey2"=>"value2"}], [2, {"mapkey2"=>"value2"}],
+           [11, {"mapkey2"=>"value2"}], [1, {"mapkey2"=>"value2", "mapkey1"=>"value1"}],
+           [13, {"mapkey2"=>"value2", "mapkey1"=>"value1"}], [3, {}]
+
+    ]
+    wb0 = read_wb("#{wb_path}/0.wb")
+    assert_equal(res.length, wb0.length)
+    cnt = 0
+    wb0.each do |last, cmd, key, val|
+      begin
+        val = Marshal.load(val)
+      rescue
+      end
+      #puts "#{cmd} #{key} #{val.inspect}"
+      assert_equal(res[cnt][0], cmd)
+      assert_equal(res[cnt][1], val)
+      cnt += 1
+    end
+  end
+
   def send_cmd(host, cmd)
     con = Roma::Messaging::ConPool.instance.get_connection(host)
     con.write("#{cmd}\r\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roma
 version: !ruby/object:Gem::Version
-  version: 0.8.14
+  version: 1.0.0
 platform: ruby
 authors:
 - Junji Torii
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: ruby/server/bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -29,27 +29,27 @@ description: |2
       ROMA server
 email: 
 executables:
-- recoverlost
-- chg_redundancy
-- mkroute
-- simple_bench
-- romad
-- recoverlost_alist
+- tribunus
+- cpdb
+- recoverlost_alist_all
+- log_merger
 - ssroute
+- safecopy_test
 - mkconfig
-- roma_watcher
+- safecopy_integration_test
+- simple_bench
 - mkrecent
-- log_merger
-- tribunus
-- key_list
-- safecopy_test
-- test-scenario
-- recoverlost_alist_keys
+- recoverlost
+- mkroute
+- recoverlost_alist
 - key_access
-- safecopy_integration_test
-- cpdb
+- key_list
 - multi_commander
-- recoverlost_alist_all
+- roma_watcher
+- recoverlost_alist_keys
+- chg_redundancy
+- test-scenario
+- romad
 extensions: []
 extra_rdoc_files:
 - README
@@ -103,6 +103,7 @@ files:
 - ruby/server/lib/roma/plugin/plugin_alist.rb
 - ruby/server/lib/roma/plugin/plugin_cmd_aliases.rb
 - ruby/server/lib/roma/plugin/plugin_debug.rb
+- ruby/server/lib/roma/plugin/plugin_gui.rb
 - ruby/server/lib/roma/plugin/plugin_map.rb
 - ruby/server/lib/roma/plugin/plugin_mapcount.rb
 - ruby/server/lib/roma/plugin/plugin_storage.rb