tarantool 0.3.0.7 → 0.4.2.1

data/test/test_space_array_fiber.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../shared_space_array.rb', __FILE__)
 
 describe 'Tarantool::FiberDB::SpaceArray' do
+  before { TConf.run(:master1) }
   let(:tarantool) { Tarantool.new(TCONFIG.merge(type: :em)) }
   alias blockrun fibrun
   it_behaves_like :blocking_array_space

data/test/test_space_hash_block.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../shared_space_hash.rb', __FILE__)
 
 describe 'Tarantool::BlockDB::SpaceHash' do
+  before { TConf.run(:master1) }
   let(:tarantool) { Tarantool.new(TCONFIG.merge(type: :block)) }
   it_behaves_like :blocking_hash_space
 end

data/test/test_space_hash_fiber.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../shared_space_hash.rb', __FILE__)
 
 describe 'Tarantool::FiberDB::SpaceHash' do
+  before { TConf.run(:master1) }
   let(:tarantool) { Tarantool.new(TCONFIG.merge(type: :em)) }
   alias blockrun fibrun
   it_behaves_like :blocking_hash_space

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarantool
 version: !ruby/object:Gem::Version
-  version: 0.3.0.7
+  version: 0.4.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iproto
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: murmurhash3
+  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
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: sumbur
+  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
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: Tarantool KV-storage client.
 email:
 - ceo@prepor.ru
@@ -44,10 +76,11 @@ files:
 - lib/tarantool/response.rb
 - lib/tarantool/base_record.rb
 - lib/tarantool/util.rb
-- lib/tarantool/record.rb
 - lib/tarantool/light_record.rb
 - lib/tarantool/version.rb
+- lib/tarantool/shards_support.rb
 - lib/tarantool/core-ext.rb
+- lib/tarantool/serializers/ber_array.rb
 - lib/tarantool/serializers/bson.rb
 - lib/tarantool/callback_db.rb
 - lib/tarantool/exceptions.rb
@@ -60,26 +93,28 @@ files:
 - lib/tarantool.rb
 - test/test_light_record.rb
 - test/shared_record.rb
-- test/tarantool_repl.cfg
+- test/shared_replicated_shard.rb
 - test/shared_space_array.rb
+- test/test_shard_replication_fiber.rb
 - test/test_space_hash_block.rb
 - test/test_space_hash_fiber.rb
-- test/test_record.rb
-- test/test_record_composite_pk.rb
+- test/test_reshard_block.rb
 - test/tarantool.cfg
 - test/helper.rb
 - test/test_query_fiber.rb
 - test/test_space_array_callback_nodef.rb
+- 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/box.pid
+- test/shared_reshard.rb
 - test/shared_query.rb
+- test/test_shard_replication_block.rb
 - test/test_space_array_block.rb
 - test/shared_space_hash.rb
-- test/tarant/init.lua
+- test/test_light_record_callback.rb
 - Gemfile
 - LICENSE
 - Rakefile
@@ -112,23 +147,25 @@ summary: Tarantool KV-storage client.
 test_files:
 - test/test_light_record.rb
 - test/shared_record.rb
-- test/tarantool_repl.cfg
+- test/shared_replicated_shard.rb
 - test/shared_space_array.rb
+- test/test_shard_replication_fiber.rb
 - test/test_space_hash_block.rb
 - test/test_space_hash_fiber.rb
-- test/test_record.rb
-- test/test_record_composite_pk.rb
+- test/test_reshard_block.rb
 - test/tarantool.cfg
 - test/helper.rb
 - test/test_query_fiber.rb
 - test/test_space_array_callback_nodef.rb
+- 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/box.pid
+- test/shared_reshard.rb
 - test/shared_query.rb
+- test/test_shard_replication_block.rb
 - test/test_space_array_block.rb
 - test/shared_space_hash.rb
-- test/tarant/init.lua
+- test/test_light_record_callback.rb

data/lib/tarantool/record.rb

@@ -1,164 +0,0 @@
-require 'active_model'
-require 'tarantool/base_record'
-
-module Tarantool
-  class Record < BaseRecord
-    extend ActiveModel::Naming
-    include ActiveModel::AttributeMethods
-    include ActiveModel::Validations
-    include ActiveModel::Serialization
-    extend ActiveModel::Callbacks
-    include ActiveModel::Dirty
-
-    include ActiveModel::Serializers::JSON
-    include ActiveModel::Serializers::Xml
-
-    define_model_callbacks :save, :create, :update, :destroy
-    define_model_callbacks :initialize, :only => :after
-
-    class << self
-      def set_space_no(val)
-        self.space_no = val
-      end
-
-      def set_tarantool(val)
-        case val.class.name
-        when 'Tarantool::BlockDB', 'Tarantool::FiberDB'
-          self.tarantool = val
-        else
-          raise "Tarantool should be blocking of fibered!!! (i.e. of class Tarantool::BlockDB or Tarantool::FiberDB) (got #{val.class})"
-        end
-      end
-
-      def define_field_accessor(name, type)
-        generated_attribute_methods.class_eval <<-"EOF", __FILE__, __LINE__ - 1
-          def #{name}
-            @attributes[:"#{name}"]
-          end
-        EOF
-
-        if Symbol === type
-          convert_code = case type
-             when :int, :integer
-               "v = v.to_i  if String === v"
-             when :str, :string, :bytes
-               ""
-             else
-               if serializer = Serializers::MAP[type]
-                 "v = Serializers::MAP[#{type.inspect}].decode(v)  if String === v"
-               else
-                 raise ArgumentError, "unknown field type #{type.inspect}"
-               end
-             end
-
-          generated_attribute_methods.class_eval <<-"EOF", __FILE__, __LINE__ - 1
-            def #{name}=(v)
-              #{convert_code}
-              #{name}_will_change!  unless v == @attributes[:"#{name}"] || new_record?
-              @attributes[:"#{name}"] = v
-            end
-          EOF
-        else
-          generated_attribute_methods.class_eval do
-            define_method("#{name}=") do |v|
-              v = type.decode(v)  if String === v
-              send(:"#{name}_will_change!") unless v == @attributes[name]
-              @attributes[name] = v
-            end
-          end
-        end
-        define_attribute_method name
-      end
-    end
-
-    def initialize(attributes = {})
-      @__new_record = true
-      @attributes = self.class.default_values.dup
-      run_callbacks(:initialize) do
-        init attributes
-      end
-    end
-
-    def init(attributes)
-      set_attributes(attributes)
-    end
-
-    def __fetched(attributes)
-      @__new_record = false
-      # well, initalize callback could call #attributes
-      @attributes = self.class.default_values.dup
-      run_callbacks(:initialize) do
-        @attributes = attributes
-      end
-      self
-    end
-
-    def _in_callbacks(&blk)
-      run_callbacks(:save) {
-        run_callbacks(new_record? ? :create : :update, &blk)
-      }
-    end
-
-    def save(and_reload = true)
-      _in_callbacks do
-        if valid?
-          changes = changes()
-          if new_record?
-            if and_reload
-              @attributes = space.insert(@attributes, return_tuple: true)
-            else
-              space.insert(@attributes)
-            end
-          else
-            return true if changes.size == 0
-            ops = []
-            changes.each do |k, (old, new)|
-              ops << [k.to_sym, :set, new]
-            end
-            if and_reload
-              unless new_attrs = space.update(id, ops, return_tuple: true)
-                _raise_doesnt_exists
-              end
-            else
-              if space.update(id, ops) == 0
-                _raise_doesnt_exists
-              end
-            end
-          end
-          @previously_changed = changes
-          @changed_attributes.clear
-          old_record!
-          true
-        else
-          false
-        end
-      end
-    end
-
-    # update record in db first, reload updated fileds then
-    # (Contrasting with LightRecord, where it reloads all fields)
-    # Consider that update operation does not count changes made by
-    # attr setters in your code, only field values in DB.
-    #
-    #   record.update({:state => 'sleep', :sleep_count => [:+, 1]})
-    #   record.update([[:state, 'sleep'], [:sleep_count, :+, 1]])
-    def update(ops)
-      raise UpdateNewRecord, "Could not call update on new record"  if @__new_record
-      unless new_attrs = space.update(id, ops, return_tuple: true)
-        _raise_doesnt_exists
-      end
-      for op in ops
-        field = op.flatten.first
-        @attributes[field] = new_attrs[field]
-      end
-      self
-    end
-
-    def destroy
-      run_callbacks :destroy do
-        self.class.delete id
-        true
-      end
-    end
-  end
-end

data/test/box.pid

@@ -1 +0,0 @@
-2887

data/test/tarantool.log

@@ -1,6 +0,0 @@
-1341840795.677 2887 1/sched _ I> space 0 successfully configured
-1341840795.677 2887 1/sched _ I> space 1 successfully configured
-1341840795.677 2887 1/sched _ I> space 2 successfully configured
-1341840795.677 2887 1/sched _ I> recovery start
-1341840795.677 2887 1/sched _ recovery.m:274 E> can't find snapshot
-1341840795.677 2887 1/sched _ C> didn't you forget to initialize storage with --init-storage switch?

data/test/tarantool_repl.cfg

@@ -1,53 +0,0 @@
-slab_alloc_arena = 0.1
-pid_file = "box.pid"
-
-logger="cat - >> tarantool.log"
-work_dir="tarant_repl"
-
-primary_port = 34013
-secondary_port = 34014
-admin_port = 34015
-replication_source = "127.0.0.1:33012"
-
-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"

data/test/test_record.rb

@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-require File.expand_path('../shared_record', __FILE__)
-require 'tarantool/record'
-
-describe 'Tarantool::Record' do
-  let(:base_class){ Tarantool::Record }
-  it_behaves_like :record
-
-
-  describe "update" do
-    let(:user) { user_class.create login: 'prepor', name: 'Andrew', email: 'ceo@prepor.ru' }
-    it "should not reload fields not reffered in operations" do
-      user.name = "Petr"
-      user.update(email: "prepor@ceo.ru")
-      user.name.must_equal "Petr"
-      user.email.must_equal "prepor@ceo.ru"
-
-      fetched = user_class.by_pk('prepor')
-      fetched.name.must_equal "Andrew"
-      fetched.email.must_equal "prepor@ceo.ru"
-    end
-  end
-
-  describe "validations" do
-    describe "with validator on login size" do
-      before do
-        user_class.validates_length_of(:login, minimum: 3)
-      end
-      it "should invalidate all records with login less then 3 chars" do
-        u = user_class.new login: 'pr', name: 'Andrew', email: 'ceo@prepor.ru'
-        u.save.must_equal false
-        u.valid?.must_equal false
-        u.errors.size.must_equal 1
-        u.login = 'prepor'
-        u.save.must_equal true
-        u.valid?.must_equal true
-        u.errors.size.must_equal 0
-      end
-    end
-  end
-
-  describe "callbacks" do
-    let(:u) { user_class.new login: 'prepor', name: 'Andrew', email: 'ceo@prepor.ru '}
-    it "should run before / after create callbackss in right places" do
-      user_class.before_create :action_before_create
-      user_class.after_create :action_after_create      
-      mock(u).action_before_create { u.new_record?.must_equal true }
-      mock(u).action_after_create { u.new_record?.must_equal false }
-      u.save
-    end
-
-    describe "initialize" do
-      it "should run after_initialize after any initialization" do
-        user_class.after_initialize :action_after_initialize
-        any_instance_of(user_class) do |u|
-          mock(u).action_after_initialize.twice
-        end
-        u.save
-        user_class.find u.login
-      end
-
-      it "should not run after_initialize after reload" do        
-        user_class.after_initialize :action_after_initialize
-        any_instance_of(user_class) do |u|
-          mock(u).action_after_initialize.once
-        end
-        u.save
-        u.reload
-      end
-
-      it "should properly save record inside after_initialize" do
-        user_class.after_initialize do |u|
-          u.save
-        end
-        u
-        user_class.find u.login
-      end
-    end
-  end
-
-  describe "serialization" do
-    it "should support AM serialization API" do
-      h = { login: 'prepor', name: 'Andrew', email: 'ceo@prepor.ru' }
-      u = user_class.create h
-      u.as_json.must_equal({ 'user' => h.merge(apples_count: 0) })
-    end
-  end
-end