tarantool 0.4.3.2 → 0.4.3.3

data/lib/tarantool/exceptions.rb

@@ -26,7 +26,9 @@ module Tarantool
   # general error return codes
   class BadReturnCode < StatusCode; end
   class NonMaster     < BadReturnCode; end
+  class IsSecondaryPort < NonMaster; end
   class IllegalParams < BadReturnCode; end
+  class BadIntegrity  < BadReturnCode; end
   class UnsupportedCommand < BadReturnCode; end
   class WrongField    < BadReturnCode; end
   class WrongNumber   < BadReturnCode; end
@@ -37,12 +39,15 @@ module Tarantool
   class StoredProcedureNotDefined < BadReturnCode; end
   class TupleExists   < BadReturnCode; end
   class TupleDoesntExists < BadReturnCode; end
+  class DuplicateKey  < BadReturnCode; end
   CODE_TO_EXCEPTION = {
     0x0401 => TupleReadOnly,
     0x0601 => TupleIsLocked,
     0x0701 => MemoryIssue,
     0x0102 => NonMaster,
     0x0202 => IllegalParams,
+    0x0302 => IsSecondaryPort,
+    0x0802 => BadIntegrity,
     0x0a02 => UnsupportedCommand,
     0x1e02 => WrongField,
     0x1f02 => WrongNumber,
@@ -53,6 +58,7 @@ module Tarantool
     0x3202 => StoredProcedureNotDefined,
     0x3302 => LuaError,
     0x3702 => TupleExists,
+    0x3802 => DuplicateKey,
   }
   CODE_TO_EXCEPTION.default = BadReturnCode
 end

data/lib/tarantool/version.rb

@@ -1,4 +1,4 @@
 module Tarantool
-  VERSION = "0.4.3.2"
-  RECORD_VERSION = "0.4.1.2"
+  VERSION = "0.4.3.3"
+  RECORD_VERSION = "0.4.2"
 end

data/lib/tarantool/version.rb.orig

@@ -0,0 +1,9 @@
+module Tarantool
+<<<<<<< HEAD
+  VERSION = "0.4.3.2"
+  RECORD_VERSION = "0.4.2"
+=======
+  VERSION = "0.4.3.3"
+  RECORD_VERSION = "0.4.1.2"
+>>>>>>> 90ffab2... fix exception for secondary port
+end

data/test/shared_replicated_shard.rb

@@ -577,6 +577,24 @@ shared_examples_for 'replication and shards' do
       ]}.must_equal [one, two]
     end
 
+    it "should not delete under wrong explicit shard" do
+      blockrun{[
+        space_both.shard(1).delete(1, return_tuple: true),
+        space_both.shard(0).delete(2, return_tuple: true)
+      ]}.must_equal [nil, nil]
+    end
+
+    it "should delete under right explicit shard" do
+      blockrun{[
+        space_both.shard(0).delete(1, return_tuple: true),
+        space_both.shard(1).delete(2, return_tuple: true),
+        space_both.shard(0).by_pk(1),
+        space_both.shard(1).by_pk(1),
+        space_both.shard(0).by_pk(2),
+        space_both.shard(1).by_pk(2)
+      ]}.must_equal [one, two, nil, nil, nil, nil]
+    end
+
     it "should call on both" do
       result = blockrun{ space_both.call('box.select_range', [0, 100]) }
       result.sort_by{|t| get_id(t)}.must_equal [one, two]

data/test/tarantool.cfg

@@ -62,3 +62,9 @@ space[3].index[1].type = "TREE"
 space[3].index[1].unique = 0
 space[3].index[1].key_field[0].fieldno = 1
 space[3].index[1].key_field[0].type = "STR"
+
+space[4].enabled = 1
+space[4].index[0].type = "TREE"
+space[4].index[0].unique = 1
+space[4].index[0].key_field[0].fieldno = 0
+space[4].index[0].key_field[0].type = "STR"

data/test/tarantool.log

@@ -0,0 +1,25 @@
+1344852766.959 28990 1/spawner _ C> initialized
+1344852766.975 28988 1/sched _ I> space 0 successfully configured
+1344852766.975 28988 1/sched _ I> space 1 successfully configured
+1344852766.975 28988 1/sched _ I> space 2 successfully configured
+1344852766.975 28988 1/sched _ I> space 3 successfully configured
+1344852766.975 28988 1/sched _ I> recovery start
+1344852766.975 28988 1/sched _ I> recover from `./00000000000000000001.snap'
+1344852766.975 28988 1/sched _ I> snapshot recovered, confirmed lsn: 1
+1344852766.976 28988 1/sched _ I> building secondary indexes
+1344852766.976 28988 1/sched _ I> Building secondary keys in space 0...
+1344852766.976 28988 1/sched _ I> Space 0: done
+1344852766.976 28988 1/sched _ I> Building secondary keys in space 2...
+1344852766.976 28988 1/sched _ I> Space 2: done
+1344852766.976 28988 1/sched _ I> Building secondary keys in space 3...
+1344852766.976 28988 1/sched _ I> Space 3: done
+1344852766.976 28988 101/33013/primary _ I> bound to port 33013
+1344852766.976 28988 101/33013/primary _ I> I am primary
+1344852766.976 28988 102/33014/secondary _ I> bound to port 33014
+1344852766.977 28988 103/33015/admin _ I> bound to port 33015
+1344852766.977 28988 104/33016/replication _ I> bound to port 33016
+1344852766.977 28988 105/init.lua _ I> loading ./init.lua
+1344852766.977 28988 1/sched _ C> log level 4
+1344852766.977 28988 1/sched _ C> entering event loop
+1344852784.410 28988 1/sched _ C> exiting loop
+1344852784.412 28990 1/spawner _ I> Exiting: master shutdown

data/test/tarantool1.cfg

@@ -0,0 +1,64 @@
+slab_alloc_arena = 0.1
+pid_file = "box.pid"
+
+logger="cat - >> tarantool.log"
+work_dir="tarant1"
+
+primary_port = 34013
+secondary_port = 34014
+admin_port = 34015
+replication_port = 34016
+#replication_source = "localhost:32016"
+
+rows_per_wal = 50000
+
+space[0].enabled = 1
+
+space[0].index[0].type = "TREE"
+space[0].index[0].unique = 1
+space[0].index[0].key_field[0].fieldno = 0
+space[0].index[0].key_field[0].type = "STR"
+
+space[0].index[1].type = "TREE"
+space[0].index[1].unique = 0
+space[0].index[1].key_field[0].fieldno = 1
+space[0].index[1].key_field[0].type = "STR"
+space[0].index[1].key_field[1].fieldno = 2
+space[0].index[1].key_field[1].type = "STR"
+
+space[0].index[2].type = "TREE"
+space[0].index[2].unique = 0
+space[0].index[2].key_field[0].fieldno = 3
+space[0].index[2].key_field[0].type = "NUM"
+
+space[1].enabled = 1
+
+space[1].index[0].type = "HASH"
+space[1].index[0].unique = 1
+space[1].index[0].key_field[0].fieldno = 0
+space[1].index[0].key_field[0].type = "NUM"
+
+
+space[2].enabled = 1
+
+space[2].index[0].type = "TREE"
+space[2].index[0].unique = 1
+space[2].index[0].key_field[0].fieldno = 0
+space[2].index[0].key_field[0].type = "STR"
+space[2].index[0].key_field[1].fieldno = 1
+space[2].index[0].key_field[1].type = "STR"
+
+space[2].index[1].type = "TREE"
+space[2].index[1].unique = 0
+space[2].index[1].key_field[0].fieldno = 2
+space[2].index[1].key_field[0].type = "NUM"
+
+space[3].enabled = 1
+space[3].index[0].type = "HASH"
+space[3].index[0].unique = 1
+space[3].index[0].key_field[0].fieldno = 0
+space[3].index[0].key_field[0].type = "NUM"
+space[3].index[1].type = "TREE"
+space[3].index[1].unique = 0
+space[3].index[1].key_field[0].fieldno = 1
+space[3].index[1].key_field[0].type = "STR"

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: tarantool
 version: !ruby/object:Gem::Version
-  version: 0.4.3.2
   prerelease: 
+  version: 0.4.3.3
 platform: ruby
 authors:
 - Andrew Rudenko
@@ -10,17 +10,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: iproto
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.8
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -28,15 +27,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.8
+  name: iproto
 - !ruby/object:Gem::Dependency
-  name: murmurhash3
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -44,15 +43,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
+  name: murmurhash3
 - !ruby/object:Gem::Dependency
-  name: sumbur
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -60,15 +59,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
+  name: sumbur
 - !ruby/object:Gem::Dependency
-  name: bin_utils
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.3
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -76,6 +75,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.3
+  name: bin_utils
 description: Tarantool KV-storage client.
 email:
 - ceo@prepor.ru
@@ -98,6 +98,7 @@ files:
 - lib/tarantool/core-ext.rb
 - lib/tarantool/serializers/ber_array.rb
 - lib/tarantool/serializers/bson.rb
+- lib/tarantool/version.rb.orig
 - lib/tarantool/callback_db.rb
 - lib/tarantool/exceptions.rb
 - lib/tarantool/space_hash.rb
@@ -119,12 +120,14 @@ files:
 - test/helper.rb
 - test/test_query_fiber.rb
 - test/test_space_array_callback_nodef.rb
+- test/tarantool1.cfg
 - test/init.lua
 - test/run_all.rb
 - test/test_space_array_callback.rb
 - test/test_space_array_fiber.rb
 - test/test_reshard_fiber.rb
 - test/test_query_block.rb
+- test/tarantool.log
 - test/shared_reshard.rb
 - test/shared_query.rb
 - test/test_shard_replication_block.rb
@@ -173,12 +176,14 @@ test_files:
 - test/helper.rb
 - test/test_query_fiber.rb
 - test/test_space_array_callback_nodef.rb
+- test/tarantool1.cfg
 - test/init.lua
 - test/run_all.rb
 - test/test_space_array_callback.rb
 - test/test_space_array_fiber.rb
 - test/test_reshard_fiber.rb
 - test/test_query_block.rb
+- test/tarantool.log
 - test/shared_reshard.rb
 - test/shared_query.rb
 - test/test_shard_replication_block.rb