replidog 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44af9edc1ca7b64ca4c802cec1e865f31318533b
-  data.tar.gz: 29a251aad399f14c85813e655dc184b46ecab204
+  metadata.gz: cb2c9700cd4d59f081d362c08eac02be9943b8cc
+  data.tar.gz: 33f1819e45ec2d9ebd7bcdf7a76186b552fe72a5
 SHA512:
-  metadata.gz: e8a1858c3e07cbe87e516d80705e448d6afc508a1b5e3c0bc6dc30ebade7cebcb99c8bbe0e03d9465b2b8cdc6247ea08b93d5bcae62633d938530b8808820be0
-  data.tar.gz: 09914f2faa17a58fc50f5428efea7b4acc38246da64c57fa3280610c301a20b2e75f255578e5cc665f88dce212157a2c4aba8ff59ccda4a8521c48d3f12a123f
+  metadata.gz: 2b0ea44389e81fb76b256d77658bf1557f7198308f23a7735b012ff3405d99496f8d52ad7a166c4f235fe9338cd338cc4c2ed07c5f1b1a79faafca5c6259ce7c
+  data.tar.gz: af3bf2d9607c49327c52878fae02bde825db827124d702f96934dd1561866aabaf7bb20bbec95146383e7151cf7b239a15080f802175043bab53275f8531a715

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 1.1.0
+- Support multithread
+
+## 1.0.0
+- Support Rails 5.0
+
+## 0.1.0
+- First release

data/lib/replidog/proxy.rb

@@ -14,6 +14,7 @@ module Replidog
     def initialize(handler, configuration)
       @handler = handler
       @configuration = configuration
+      @lock = Mutex.new
     end
 
     def current_model
@@ -58,6 +59,7 @@ module Replidog
 
     def clear_all_slave_connections!
       slave_connection_pool_table.each_value do |pool|
+        pool.automatic_reconnect = false
         pool.disconnect!
       end
     end
@@ -149,7 +151,9 @@ module Replidog
     end
 
     def slave_connection_index
-      index.tap { increment_slave_connection_index }
+      @lock.synchronize do
+        index.tap { increment_slave_connection_index }
+      end
     end
 
     def increment_slave_connection_index

data/lib/replidog/proxy_handler.rb

@@ -1,29 +1,36 @@
+require "concurrent/map"
+
 module Replidog
   class ProxyHandler
     def initialize
-      @proxies = {}
-      @class_to_proxy = {}
+      @proxies = Concurrent::Map.new(initial_capacity: 2)
+      @class_to_proxy = Concurrent::Map.new(initial_capacity: 2)
     end
 
     def establish_connection(configuration, klass)
-      @proxies[configuration] ||= Proxy.new(self, configuration)
-      @class_to_proxy[klass.name] ||= @proxies[configuration]
+      @class_to_proxy.clear
+      raise RuntimeError, "Anonymous class is not allowed." unless klass.name
+      @proxies[klass.name] = Proxy.new(self, configuration)
     end
 
     def retrieve_proxy(klass)
-      proxy = @class_to_proxy[klass.name]
-      return proxy if proxy
-      return nil if ActiveRecord::Base == klass
-      retrieve_proxy(klass.superclass)
+      @class_to_proxy[klass.name] ||=
+        begin
+          until proxy = @proxies[klass.name]
+            klass = klass.superclass
+            break unless klass <= ActiveRecord::Base
+          end
+
+          @class_to_proxy[klass.name] = proxy
+        end
     end
 
     def remove_connection(klass)
-      proxy = @class_to_proxy.delete(klass.name)
-      return nil unless proxy
-
-      @proxies.delete(proxy.configuration)
-      proxy.clear_all_slave_connections!
-      proxy.configuration.config
+      if proxy = @proxies.delete(klass.name)
+        @class_to_proxy.clear
+        proxy.clear_all_slave_connections!
+        proxy.configuration.config
+      end
     end
 
     def clear_active_slave_connections!

data/lib/replidog/version.rb

@@ -1,3 +1,3 @@
 module Replidog
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/replidog.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord", '>= 3.2.0'
   spec.add_dependency "activesupport", '>= 3.2.0'
+  spec.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2"
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "coffee-rails", ">= 3.2.0"

data/spec/replidog/model_spec.rb

@@ -10,6 +10,11 @@ describe Replidog::Model do
     User.using(:slave).first
   end
 
+  before do
+    ActiveRecord::Base.establish_connection
+    UserTable.establish_connection :test_user
+  end
+
   describe ".extended" do
     it "shares the same proxy_handler" do
       expect(Recipe.proxy_handler).to eq User.proxy_handler
@@ -79,18 +84,49 @@ describe Replidog::Model do
         expect(Recipe.first).to be_nil
       end
 
-      it "selects replications by roundrobin order" do
-        Recipe.using(:slave1).create(title: "test")
-        Recipe.connection.index = 0
-        expect(Recipe.first).not_to be_nil
-        expect(Recipe.first).to be_nil
-        expect(Recipe.first).to be_nil
-        expect(Recipe.first).not_to be_nil
-        expect(Recipe.first).to be_nil
-        expect(Recipe.first).to be_nil
-        expect(Recipe.first).not_to be_nil
-        expect(Recipe.first).to be_nil
-        expect(Recipe.first).to be_nil
+      context "with single thread" do
+        it "selects replications by roundrobin order" do
+          Recipe.using(:slave1).create(title: "test")
+          Recipe.connection.index = 0
+          expect(Recipe.first).not_to be_nil
+          expect(Recipe.first).to be_nil
+          expect(Recipe.first).to be_nil
+          expect(Recipe.first).not_to be_nil
+          expect(Recipe.first).to be_nil
+          expect(Recipe.first).to be_nil
+          expect(Recipe.first).not_to be_nil
+          expect(Recipe.first).to be_nil
+          expect(Recipe.first).to be_nil
+        end
+      end
+
+      context "with multi thread" do
+        it "selects replications by roundrobin order" do
+          Recipe.using(:slave1).create(title: "test")
+          # Clear connection pool
+          ActiveRecord::Base.establish_connection
+          Recipe.connection.index = 0
+
+          recipes = []
+          pool_size = 5
+          iteration_size = 2
+          slave_size = 3
+          num_of_trials = pool_size * iteration_size
+
+          threads = []
+
+          pool_size.times do |i|
+            threads << Thread.new do
+              iteration_size.times do
+                recipes << Recipe.first
+              end
+            end
+          end
+
+          threads.each(&:join)
+
+          expect(recipes.compact.size).to eq (num_of_trials + slave_size - 1) / slave_size
+        end
       end
     end
   end

data/spec/replidog/proxy_spec.rb

@@ -2,8 +2,8 @@ require "spec_helper"
 
 describe Replidog::Proxy do
   before do
-    # call establish_connection
-    UserTable
+    ActiveRecord::Base.establish_connection
+    UserTable.establish_connection :test_user
   end
 
   describe "#enable_query_cache!" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: replidog
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Manabu Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +291,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -345,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: master-slave replication helper for ActiveRecord