tarantool 0.4.3.3 → 0.4.3.5

data/lib/tarantool.rb

@@ -1,4 +1,3 @@
-require 'eventmachine'
 require "iproto"
 require "tarantool/version"
 require "tarantool/exceptions"
@@ -33,7 +32,7 @@ module Tarantool
       if %w{round_robin master_first}.include?(replica_strategy)
         replica_strategy = replica_strategy.to_sym
       end
-      unless [:round_robin, :master_first].include?(replica_strategy)
+      unless [:round_robin, :master_first, :prefer_slave].include?(replica_strategy)
         raise ArgumentError, "Shard strategy could be :round_robin or :master_first, got #{replica_strategy.inspect}"
       end
 

data/lib/tarantool/block_db.rb

@@ -23,7 +23,12 @@ module Tarantool
         if (replicas = _shard(shard_number)).size == 1
           _parse_iproto(replicas[0].send_request(response.request_type, response.body))
         elsif read_write == :read
-          replicas = replicas.shuffle  if @replica_strategy == :round_robin
+          case @replica_strategy
+          when :round_robin
+            replicas = replicas.shuffle
+          when :prefer_slave
+            replicas = replicas[1..-1].shuffle << replicas[0]
+          end
           _one_shard_read(replicas, response.request_type, response.body)
         else
           _one_shard_write(replicas, response.request_type, response.body)

data/lib/tarantool/em_db.rb

@@ -1,3 +1,4 @@
+require 'eventmachine'
 module Tarantool
   class EMDB < DB
     IPROTO_CONNECTION_TYPE = :em_callback
@@ -42,7 +43,12 @@ module Tarantool
       if (replicas = _shard(shard_number)).size == 1
         replicas[0].send_request(response.request_type, response.body, OneReplica.new(response, feed))
       elsif read_write == :read
-        replicas = replicas.shuffle  if @replica_strategy == :round_robin
+        case @replica_strategy
+        when :round_robin
+          replicas = replicas.shuffle
+        when :prefer_slave
+          replicas = replicas[1..-1].shuffle << replicas[0]
+        end
         EM.next_tick OneShardRead.new(replicas, response, feed)
       else
         EM.next_tick OneShardWrite.new(replicas, response, feed)

data/lib/tarantool/version.rb

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

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: tarantool
 version: !ruby/object:Gem::Version
+  version: 0.4.3.5
   prerelease: 
-  version: 0.4.3.3
 platform: ruby
 authors:
 - Andrew Rudenko
@@ -10,71 +10,71 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.8
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.8
+    none: false
+  prerelease: false
   name: iproto
 - !ruby/object:Gem::Dependency
   type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
+    none: false
+  prerelease: false
   name: murmurhash3
 - !ruby/object:Gem::Dependency
   type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
+    none: false
+  prerelease: false
   name: sumbur
 - !ruby/object:Gem::Dependency
   type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
+    none: false
+  prerelease: false
   name: bin_utils
 description: Tarantool KV-storage client.
 email:
@@ -86,53 +86,52 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- lib/tarantool/request.rb
+- lib/tarantool/block_db.rb
+- lib/tarantool/space_array.rb
 - lib/tarantool/em_db.rb
-- lib/tarantool/record/select.rb
-- lib/tarantool/response.rb
-- lib/tarantool/base_record.rb
-- lib/tarantool/util.rb
-- lib/tarantool/light_record.rb
-- lib/tarantool/version.rb
+- lib/tarantool/query.rb
 - lib/tarantool/shards_support.rb
-- 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/version.rb
 - lib/tarantool/space_hash.rb
+- lib/tarantool/request.rb
 - lib/tarantool/fiber_db.rb
-- lib/tarantool/query.rb
-- lib/tarantool/block_db.rb
 - lib/tarantool/serializers.rb
-- lib/tarantool/space_array.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
-- test/test_light_record.rb
-- test/shared_record.rb
-- 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/shared_query.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/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/tarantool1.cfg
+- test/test_space_array_callback_nodef.rb
+- test/test_shard_replication_fiber.rb
+- test/run_all.rb
 - test/shared_reshard.rb
-- test/shared_query.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/test_light_record.rb
+- test/shared_record.rb
+- test/test_space_hash_fiber.rb
+- test/test_query_block.rb
 - test/test_space_array_block.rb
 - test/shared_space_hash.rb
+- test/shared_replicated_shard.rb
+- test/test_space_array_fiber.rb
+- test/test_space_hash_block.rb
 - test/test_light_record_callback.rb
 - Gemfile
 - LICENSE
@@ -146,47 +145,47 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Tarantool KV-storage client.
 test_files:
-- test/test_light_record.rb
-- test/shared_record.rb
-- 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/shared_query.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/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/tarantool1.cfg
+- test/test_space_array_callback_nodef.rb
+- test/test_shard_replication_fiber.rb
+- test/run_all.rb
 - test/shared_reshard.rb
-- test/shared_query.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/test_light_record.rb
+- test/shared_record.rb
+- test/test_space_hash_fiber.rb
+- test/test_query_block.rb
 - test/test_space_array_block.rb
 - test/shared_space_hash.rb
+- test/shared_replicated_shard.rb
+- test/test_space_array_fiber.rb
+- test/test_space_hash_block.rb
 - test/test_light_record_callback.rb

data/lib/tarantool/version.rb.orig

@@ -1,9 +0,0 @@
-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