tarantool 0.5.5.1 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2ba9359cf06075c2df1253f0b5ea50b0d154871
-  data.tar.gz: d224be6e4900c2b6c400e58ad00b66c4c6fb1cd3
+  metadata.gz: 8aac164a2c5b7dea301ff686ce276e3e25e95ba2
+  data.tar.gz: aabe618a99624fec57ee6473ff153f7bb5f5a453
 SHA512:
-  metadata.gz: 5f12001871eba01ab75d1a9eb9e9a4892141009efe6c88aa43a47a7c9ad7066b24860479e1ea71cdf6a9ff84cfb33081f5b136e452f0113827daff14677a0e1b
-  data.tar.gz: fd7f23675481a2e8daeb36f44a3aefed5d8c5fa28d53f2b6b9f941fc9638e66cd4040b73f5aa4fd0927c76615721164246caf19909a100ff7315ba3ab15b721f
+  metadata.gz: 7f1d95caea8a114a6381b04369e9d365a10bb69cee65e7bbc4b8fb07bb76baa6e5dc42ca21dd6027a1599b94617049abc411d04193e084b9fea2a83b7846c0f7
+  data.tar.gz: 03a5848ccb38582768f5a017337b8154a39277e23e9875a76b1f949b2b158d19d4a05229ba5c55b25d11009a97bb8c3b4f00a6a449a50aed75caf1ba59e4d617

data/ext/tarantool/response_c.c

@@ -103,12 +103,11 @@ static VALUE
 unpack_field(VALUE self, VALUE data, VALUE field, VALUE i_o, VALUE realfield_o, VALUE serializers)
 {
     int i = NUM2INT(i_o);
-    const char *str = StringValuePtr(data);
+    const char *str = RSTRING_PTR(data);
     size_t len = RSTRING_LEN(data);
     size_t fieldsize = slice_ber((const uint8_t**)&str, &len);
     VALUE value;
-    rb_str_drop_bytes(data, RSTRING_LEN(data) - len);
-    str = StringValuePtr(data);
+    size_t offset = RSTRING_LEN(data) - len;
 
     if (fieldsize == 0) {
 	return Qnil;
@@ -190,7 +189,7 @@ unpack_field(VALUE self, VALUE data, VALUE field, VALUE i_o, VALUE realfield_o,
 	}
 	value = rb_funcall2(serializer, id_decode, 1, &substr);
     }
-    rb_str_drop_bytes(data, fieldsize);
+    rb_str_drop_bytes(data, offset + fieldsize);
     return value;
 }
 

data/lib/tarantool/response.rb

@@ -4,14 +4,86 @@ require 'tarantool/serializers'
 
 module Tarantool
   module UnpackTuples
-  end
-  begin
-    require 'tarantool/response_c'
-  rescue LoadError
+    include Util::Packer
+    include Util::TailGetter
+    UTF8 = 'utf-8'.freeze
+    def _unpack_field(tuple_str, field, i, realfield, serializers)
+      field_size = ::BinUtils.slice_ber!(tuple_str)
+      return nil if field_size == 0
+
+      case field
+      when :int, :integer
+        if field_size != 4
+          raise ValueError, "Bad field size #{field_size} for integer field ##{i}"
+        end
+        ::BinUtils.slice_int32_le!(tuple_str)
+      when :string, :str
+        str = tuple_str.slice!(0, field_size)
+        str[0,1] = EMPTY  if str < ONE
+        str.force_encoding(UTF8)
+      when :int64
+        if field_size != 8
+          raise ValueError, "Bad field size #{field_size} for 64bit integer field ##{i}"
+        end
+        ::BinUtils.slice_int64_le!(tuple_str)
+      when :bytes
+        tuple_str.slice!(0, field_size)
+      when :int16
+        if field_size != 2
+          raise ValueError, "Bad field size #{field_size} for 16bit integer field ##{i}"
+        end
+        ::BinUtils.slice_int16_le!(tuple_str)
+      when :int8
+        if field_size != 1
+          raise ValueError, "Bad field size #{field_size} for 8bit integer field ##{i}"
+        end
+        ::BinUtils.slice_int8!(tuple_str)
+      when :sint
+        if field_size != 4
+          raise ValueError, "Bad field size #{field_size} for integer field ##{i}"
+        end
+        ::BinUtils.slice_sint32_le!(tuple_str)
+      when :sint64
+        if field_size != 8
+          raise ValueError, "Bad field size #{field_size} for 64bit integer field ##{i}"
+        end
+        ::BinUtils.slice_sint64_le!(tuple_str)
+      when :sint16
+        if field_size != 2
+          raise ValueError, "Bad field size #{field_size} for 16bit integer field ##{i}"
+        end
+        ::BinUtils.slice_sint16_le!(tuple_str)
+      when :sint8
+        if field_size != 1
+          raise ValueError, "Bad field size #{field_size} for 8bit integer field ##{i}"
+        end
+        ::BinUtils.slice_sint8!(tuple_str)
+      when :varint
+        case field_size
+        when 8
+          ::BinUtils.slice_int64_le!(tuple_str)
+        when 4
+          ::BinUtils.slice_int32_le!(tuple_str)
+        when 2
+          ::BinUtils.slice_int16_le!(tuple_str)
+        else
+          raise ValueError, "Bad field size #{field_size} for integer field ##{i}"
+        end
+      when :auto
+        str = tuple_str.slice!(0, field_size).force_encoding('utf-8')
+        case field_size
+        when 8, 4, 2
+          Util::AutoType.new(str)
+        else
+          str
+        end
+      else
+        (serializers[realfield] ||= get_serializer(field)).decode(tuple_str.slice!(0, field_size))
+      end
+    end
   end
 
   module ParseIProto
-    include Util::Packer
     def _parse_iproto(data)
       if Exception === data || data == ''
         data
@@ -25,11 +97,8 @@ module Tarantool
   end
 
   class Response < Struct.new(:cb, :request_type, :body, :get_tuples, :fields, :translators)
-    include Util::Packer
-    include Util::TailGetter
     include Serializers
     include UnpackTuples
-    UTF8 = 'utf-8'.freeze
 
     def call(data)
       if Exception === data
@@ -73,9 +142,9 @@ module Tarantool
       end
     end
 
-    X02 = '%02x'.freeze
     def unpack_tuples(data)
       tuples_affected = ::BinUtils.slice_int32_le!(data)
+      ta = tuples_affected
       fields = fields()
       if Integer === fields.last
         *fields, tail = fields
@@ -102,86 +171,11 @@ module Tarantool
         end
         tuples
       rescue ValueError => e
-        $stderr.puts "Value Error: tuples=#{tuples_affected}, data='#{orig_data.each_byte.map{|b| format(X02, b)}.join(' ')}'"
+        $stderr.puts "Value Error: tuples=#{ta} now=#{ta-tuples_affected}, remains=#{data.bytesize} remains_data='#{data.unpack('H*')[0].gsub(/../,'\& ')}' orig_size=#{orig_data.size} orig_data='#{orig_data.unpack('H*')[0].gsub(/../,'\& ')}'"
         raise e
       end
     end
 
-    def _unpack_field(tuple_str, field, i, realfield, serializers)
-      field_size = ::BinUtils.slice_ber!(tuple_str)
-      return nil if field_size == 0
-
-      case field
-      when :int, :integer
-        if field_size != 4
-          raise ValueError, "Bad field size #{field_size} for integer field ##{i}"
-        end
-        ::BinUtils.slice_int32_le!(tuple_str)
-      when :string, :str
-        str = tuple_str.slice!(0, field_size)
-        str[0,1] = EMPTY  if str < ONE
-        str.force_encoding(UTF8)
-      when :int64
-        if field_size != 8
-          raise ValueError, "Bad field size #{field_size} for 64bit integer field ##{i}"
-        end
-        ::BinUtils.slice_int64_le!(tuple_str)
-      when :bytes
-        tuple_str.slice!(0, field_size)
-      when :int16
-        if field_size != 2
-          raise ValueError, "Bad field size #{field_size} for 16bit integer field ##{i}"
-        end
-        ::BinUtils.slice_int16_le!(tuple_str)
-      when :int8
-        if field_size != 1
-          raise ValueError, "Bad field size #{field_size} for 8bit integer field ##{i}"
-        end
-        ::BinUtils.slice_int8!(tuple_str)
-      when :sint
-        if field_size != 4
-          raise ValueError, "Bad field size #{field_size} for integer field ##{i}"
-        end
-        ::BinUtils.slice_sint32_le!(tuple_str)
-      when :sint64
-        if field_size != 8
-          raise ValueError, "Bad field size #{field_size} for 64bit integer field ##{i}"
-        end
-        ::BinUtils.slice_sint64_le!(tuple_str)
-      when :sint16
-        if field_size != 2
-          raise ValueError, "Bad field size #{field_size} for 16bit integer field ##{i}"
-        end
-        ::BinUtils.slice_sint16_le!(tuple_str)
-      when :sint8
-        if field_size != 1
-          raise ValueError, "Bad field size #{field_size} for 8bit integer field ##{i}"
-        end
-        ::BinUtils.slice_sint8!(tuple_str)
-      when :varint
-        case field_size
-        when 8
-          ::BinUtils.slice_int64_le!(tuple_str)
-        when 4
-          ::BinUtils.slice_int32_le!(tuple_str)
-        when 2
-          ::BinUtils.slice_int16_le!(tuple_str)
-        else
-          raise ValueError, "Bad field size #{field_size} for integer field ##{i}"
-        end
-      when :auto
-        str = tuple_str.slice!(0, field_size).force_encoding('utf-8')
-        case field_size
-        when 8, 4, 2
-          Util::AutoType.new(str)
-        else
-          str
-        end
-      else
-        (serializers[realfield] ||= get_serializer(field)).decode(tuple_str.slice!(0, field_size))
-      end
-    end unless method_defined?(:_unpack_field)
-
     def return_code(data)
       ::BinUtils.slice_int32_le!(data)
     end

data/lib/tarantool/version.rb

@@ -1,4 +1,4 @@
 module Tarantool
-  VERSION = "0.5.5.1"
+  VERSION = "0.5.8"
   RECORD_VERSION = "0.4.3"
 end

data/test/helper.rb

@@ -74,6 +74,7 @@ module TConf
     Dir.chdir(conf[:dir]) do
       conf[:pid] = spawn('tarantool_box')
     end
+    sleep(0.01)
   end
 
   def self.stop(name)
@@ -197,8 +198,9 @@ module Helper
   def exec_tarantool(cmd, lines_to_read)
     cmd = cmd.gsub(/^\s+/, '')
     pipe = tarantool_pipe
-    pipe.puts(cmd)
+    pipe.write(cmd)
     pipe.flush
+    pipe.close_write
     lines_to_read.times do
       #STDERR.puts pipe.gets
       pipe.gets
@@ -211,7 +213,7 @@ module Helper
        lua truncate(1)
        lua truncate(2)
        lua truncate(3)
-    ", 12
+    ", 8
   end
 
   def seed
@@ -224,7 +226,7 @@ module Helper
       insert into t2 values ('hi zo', 'ho zo', 1)
       insert into t2 values ('hi zo', 'pidas', 1, 3, 5)
       insert into t2 values ('coma', 'peredoma', 2)
-    ", 16
+    ", 8
   end
 
   def clear_db
@@ -292,7 +294,11 @@ end
 
 class MiniTest::Unit::TestCase
   include ::Helper
-  include ::RR::Adapters::MiniTest
+  #include ::RR::Adapters::MiniTest
+end
+
+module MiniTest::Spec::SharedExamples
+  include ::Helper
 end
 
 class << MiniTest::Spec

data/test/shared_record.rb

@@ -406,7 +406,7 @@ shared_examples_for :record do
       user_class.by_pk('ruden').must_be_nil
 
       user_class.by_pk('petro').attributes.must_equal petro.merge(apples_count: 0)
-      user_class.invoke('box.delete', user_class.space_no, 'petro', space_no: nil).must_equal 1
+      user_class.invoke('box.delete', user_class.space_no, 'petro', space_no: nil, types: [:str, :str]).must_equal 1
       user_class.by_pk('petro').must_be_nil
     end
 
@@ -416,7 +416,7 @@ shared_examples_for :record do
       user_class.by_pk('ruden').must_be_nil
 
       user_class.by_pk('petro').attributes.must_equal petro.merge(apples_count: 0)
-      user_class.call('box.delete', user_class.space_no, 'petro', space_no: nil)[0].
+      user_class.call('box.delete', user_class.space_no, 'petro', space_no: nil, types: [:str, :str])[0].
         attributes.must_equal petro.merge(apples_count: 0)
       user_class.by_pk('petro').must_be_nil
     end

data/test/test_space_array_callback.rb

@@ -105,18 +105,20 @@ describe 'Tarantool::CallbackDB::SpaceArray' do
     end
 
     it "should fetch longer records" do
-      emrun(2) {
+      emrun(3) {
         space2.by_pk(['hi zo', 'pidas'], &setp(0))
         space1.by_pk(2, &setp(1))
+        space1.by_pk(2, &setp(2))
       }
       results[0].must_equal ['hi zo', 'pidas', 1, 3, 5]
       results[1].must_equal [2, 'medium', 6, 'common', 7]
+      results[2].must_equal [2, 'medium', 6, 'common', 7]
     end
 
     it "should be able to insert" do
       asdf = ['asdf', 'asdf', 'asdf', 4, 5]
       qwer = ['qwer', 'qwer', 'qwer', 4, 20, 19]
-      zxcv = [4, 'zxcv', 7, 'zxcv', 8]
+      zxcv = [4, "\0zxcv", 7, 'zxcv', 8]
       xcvb = [5, 'xcvb', 7, 'xcvb', 8]
       emrun(4) {
         space0.insert(asdf, &setp(0))
@@ -124,6 +126,7 @@ describe 'Tarantool::CallbackDB::SpaceArray' do
         space1.insert(zxcv){|res|
           results[2] = res
           space1.by_pk(4, &setp(3))
+          space1.by_pk(2, &setp(5))
         }
         space1.insert(xcvb, return_tuple: true, &setp(4))
       }
@@ -132,6 +135,7 @@ describe 'Tarantool::CallbackDB::SpaceArray' do
       results[2].must_equal 1
       results[3].must_equal zxcv
       results[4].must_equal xcvb
+      results[5].must_equal [2, 'medium', 6, 'common', 7]
     end
 
     it "should be able to update" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarantool
 version: !ruby/object:Gem::Version
-  version: 0.5.5.1
+  version: 0.5.8
 platform: ruby
 authors:
 - Andrew Rudenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iproto