tarantool 0.5.1 → 0.5.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d45dfdd4a7f89cdee76444521a0bf9cf82a7da18
+  data.tar.gz: 3f2c6296ec71a7abc6cec77a81d5bab886504122
+SHA512:
+  metadata.gz: 9542b6c58e584561c1ebeb7125e7edbbd2b83fca3ef17bfc0ae7cb91c1d8c47bf290ada319ce1a9c4d1a89fddca31eda100aa75827ad89aef21f6d9b0a930d4c
+  data.tar.gz: 3c9b4b6e282c973505ea8f640c8db589a5e63209fe1505f2b3f57b96182e2f37855d99a666def9472c4a61b8ce7bcaee2e0fbc3f23a29a6b0d281f060826d71c

data/ext/tarantool/response_c.c

@@ -87,9 +87,9 @@ slice_ber(const uint8_t **str, size_t *len)
         uint8_t digit = **str;
         res = (res << 7) | (digit & 127);
         (*str)++; (*len)--;
-        if (digit < 128) return res;
+        if ((digit & 128) == 0) return res;
     }
-    rb_raise(rb_eValueError, "Response too short");
+    rb_raise(rb_eValueError, "Response too short for ber");
     return 0;
 }
 
@@ -131,8 +131,8 @@ unpack_tuples(VALUE self, VALUE data, VALUE fields, VALUE _tail, VALUE tuples_af
         if (len < 8) {
             rb_raise(rb_eValueError, "Response too short");
         }
-        end = str + 8 + *(uint32_t*)str;
-        tuplen = *(uint32_t*)(str+4);
+        end = str + 8 + get_uint32(str);
+        tuplen = get_uint32(str+4);
         tuple = rb_ary_new2(tuplen);
         str += 8;
         len -= 8;

data/lib/tarantool/response.rb

@@ -73,6 +73,7 @@ module Tarantool
       end
     end
 
+    X02 = '%02x'.freeze
     def unpack_tuples(data)
       tuples_affected = ::BinUtils.slice_int32_le!(data)
       fields = fields()
@@ -81,7 +82,13 @@ module Tarantool
       else
         tail = 1
       end
-      _unpack_tuples(data, fields, tail, tuples_affected)
+      orig_data = data.dup
+      begin
+        _unpack_tuples(data, fields, tail, tuples_affected)
+      rescue ValueError => e
+        $stderr.puts "Value Error: tuples=#{tuples_affected}, data='#{orig_data.each_byte.map{|b| format(X02, b)}.join(' ')}'"
+        raise e
+      end
     end
 
     def _unpack_tuples(data, fields, tail, tuples_affected)

data/lib/tarantool/version.rb

@@ -1,4 +1,4 @@
 module Tarantool
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
   RECORD_VERSION = "0.4.3"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarantool
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.5.2
 platform: ruby
 authors:
 - Andrew Rudenko
@@ -10,71 +9,63 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  name: iproto
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.8
-    none: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.8
-    none: false
-  prerelease: false
-  name: iproto
   type: :runtime
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  name: murmurhash3
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
-    none: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
-    none: false
-  prerelease: false
-  name: murmurhash3
   type: :runtime
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  name: sumbur
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
-    none: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
-    none: false
-  prerelease: false
-  name: sumbur
   type: :runtime
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  name: bin_utils
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
-    none: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
-    none: false
-  prerelease: false
-  name: bin_utils
   type: :runtime
 description: Tarantool KV-storage client.
 email:
@@ -87,62 +78,63 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- ext/tarantool/extconf.rb
+- ext/tarantool/response_c.c
+- lib/tarantool.rb
+- lib/tarantool/base_record.rb
 - lib/tarantool/block_db.rb
-- lib/tarantool/space_array.rb
+- lib/tarantool/callback_db.rb
+- lib/tarantool/core-ext.rb
 - lib/tarantool/em_db.rb
+- lib/tarantool/exceptions.rb
+- lib/tarantool/fiber_db.rb
+- lib/tarantool/light_record.rb
 - lib/tarantool/query.rb
-- lib/tarantool/shards_support.rb
+- lib/tarantool/record/select.rb
+- lib/tarantool/request.rb
+- lib/tarantool/response.rb
+- lib/tarantool/serializers.rb
 - lib/tarantool/serializers/ber_array.rb
 - lib/tarantool/serializers/bson.rb
-- lib/tarantool/version.rb
+- lib/tarantool/shards_support.rb
+- lib/tarantool/space_array.rb
 - lib/tarantool/space_hash.rb
-- lib/tarantool/request.rb
-- lib/tarantool/fiber_db.rb
-- lib/tarantool/serializers.rb
-- lib/tarantool/callback_db.rb
-- lib/tarantool/exceptions.rb
-- lib/tarantool/light_record.rb
-- lib/tarantool/record/select.rb
 - lib/tarantool/util.rb
-- lib/tarantool/core-ext.rb
-- lib/tarantool/base_record.rb
-- lib/tarantool/response.rb
-- lib/tarantool.rb
-- ext/tarantool/extconf.rb
-- ext/tarantool/response_c.c
-- test/shared_query.rb
-- test/test_reshard_block.rb
-- test/test_space_array_callback.rb
-- test/test_reshard_fiber.rb
-- test/tarantool1.cfg
-- test/test_space_array_callback_nodef.rb
-- test/test_shard_replication_fiber.rb
+- lib/tarantool/version.rb
+- test/helper.rb
+- test/init.lua
 - test/run_all.rb
+- test/shared_query.rb
+- test/shared_record.rb
+- test/shared_replicated_shard.rb
 - test/shared_reshard.rb
-- test/init.lua
-- test/helper.rb
-- test/test_shard_replication_block.rb
-- test/tarantool.log
-- test/tarantool.cfg
 - test/shared_space_array.rb
-- test/test_query_fiber.rb
+- test/shared_space_hash.rb
+- test/tarantool.cfg
+- test/tarantool.log
+- test/tarantool1.cfg
 - test/test_light_record.rb
-- test/shared_record.rb
-- test/test_space_hash_fiber.rb
+- test/test_light_record_callback.rb
 - test/test_query_block.rb
+- test/test_query_fiber.rb
+- test/test_reshard_block.rb
+- test/test_reshard_fiber.rb
+- test/test_shard_replication_block.rb
+- test/test_shard_replication_fiber.rb
 - test/test_space_array_block.rb
-- test/shared_space_hash.rb
-- test/shared_replicated_shard.rb
+- test/test_space_array_callback.rb
+- test/test_space_array_callback_nodef.rb
 - test/test_space_array_fiber.rb
 - test/test_space_hash_block.rb
-- test/test_light_record_callback.rb
-- Gemfile
-- LICENSE
-- Rakefile
-- README.md
+- test/test_space_hash_fiber.rb
 homepage: http://github.com/mailru/tarantool-ruby
 licenses:
 - BSD-2-Clause
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -151,52 +143,44 @@ require_paths:
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      hash: 2817518417996547938
       version: '0'
-      segments:
-      - 0
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      hash: 2817518417996547938
       version: '0'
-      segments:
-      - 0
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tarantool KV-storage client.
 test_files:
-- test/shared_query.rb
-- test/test_reshard_block.rb
-- test/test_space_array_callback.rb
-- test/test_reshard_fiber.rb
-- test/tarantool1.cfg
-- test/test_space_array_callback_nodef.rb
-- test/test_shard_replication_fiber.rb
+- test/helper.rb
+- test/init.lua
 - test/run_all.rb
+- test/shared_query.rb
+- test/shared_record.rb
+- test/shared_replicated_shard.rb
 - test/shared_reshard.rb
-- test/init.lua
-- test/helper.rb
-- test/test_shard_replication_block.rb
-- test/tarantool.log
-- test/tarantool.cfg
 - test/shared_space_array.rb
-- test/test_query_fiber.rb
+- test/shared_space_hash.rb
+- test/tarantool.cfg
+- test/tarantool.log
+- test/tarantool1.cfg
 - test/test_light_record.rb
-- test/shared_record.rb
-- test/test_space_hash_fiber.rb
+- test/test_light_record_callback.rb
 - test/test_query_block.rb
+- test/test_query_fiber.rb
+- test/test_reshard_block.rb
+- test/test_reshard_fiber.rb
+- test/test_shard_replication_block.rb
+- test/test_shard_replication_fiber.rb
 - test/test_space_array_block.rb
-- test/shared_space_hash.rb
-- test/shared_replicated_shard.rb
+- test/test_space_array_callback.rb
+- test/test_space_array_callback_nodef.rb
 - test/test_space_array_fiber.rb
 - test/test_space_hash_block.rb
-- test/test_light_record_callback.rb
+- test/test_space_hash_fiber.rb