activerecord-shard_for 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13ad1572bb8ed11c7e554775318e57ed90d790c2
-  data.tar.gz: 3fbd2d039d58050bce3b5c99d15e5d9fa3d4a9c4
+  metadata.gz: 18b127f1099df390fc67db8548a308d1dc66cded
+  data.tar.gz: 25f90de3cad7a5824d1f164370e6b146589614b8
 SHA512:
-  metadata.gz: d63e1c46d46ea2aeac501ef28b1a072bd4c321150f5394fc83591204cd72045e33a4bb2e8de0e5c5dee90ab484676fd108cac0431e16229412f89c5db3b2616e
-  data.tar.gz: 28909b54eb841e9fa7eb5fbcb4d0818c06dbfed05a1931cb905ecc4e8b96e30ac01e9a04d638975699d17c084c9bb27b90c7387e1f3127ca694f4c16dea0daa3
+  metadata.gz: f0b5fc995889395482558bc950bc113a2692e21f8dc7a5ef0d75de8a1cb172e0c100cfeb28c77fc05536df4243513c5a4a54316d94d34299e7605cc9044fd764
+  data.tar.gz: 15dda5d854a5191a9559b020722a1fc6c960f8412479fda3d53a4fe6beeb2e6a738d0f948f29c5eb942ed31058e7bd474851b26bb79c3cee6e39c843d21112fb

data/.rubocop.yml

@@ -8,6 +8,18 @@ AllCops:
     - vendor/bundle/**/*
   DisplayCopNames: true
 
+Style/StderrPuts:
+  Enabled: false
+
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+Style/ExpandPathArguments:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
 Style/FrozenStringLiteralComment:
   Enabled: false
 
@@ -20,9 +32,19 @@ Metrics/LineLength:
 Style/EmptyCaseCondition:
   Enabled: false
 
+Layout/EmptyLineAfterMagicComment:
+  Enabled: false
+
+Layout/FileName:
+  Exclude:
+    - Appraisals
+
 Metrics/MethodLength:
   Max: 15
 
+Metrics/AbcSize:
+  Max: 20
+
 Style/ParallelAssignment:
   Enabled: false
 

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 sudo: false
 rvm:
-- 2.2.4
-- 2.3.1
-- 2.4.0
+- 2.2.7
+- 2.3.4
+- 2.4.1
 branches:
   only:
     - master
@@ -18,10 +18,18 @@ script:
 - CODECLIMATE_REPO_TOKEN=dfc951e2d70b56ee62ffe989eb6286a6f21bf57209ccbd111bd336c372d8d06e bundle exec codeclimate-test-reporter
 gemfile:
 - gemfiles/ar_5.0.gemfile
+- gemfiles/ar_5.1.gemfile
+- gemfiles/ar_5.2.gemfile
 - gemfiles/rails_edge.gemfile
 matrix:
   allow_failures:
   - gemfile: gemfiles/rails_edge.gemfile
+  # rails_edge required ruby version over 2.4.1
+  exclude:
+  - rvm: 2.2.7
+    gemfile: gemfiles/rails_edge.gemfile
+  - rvm: 2.3.4
+    gemfile: gemfiles/rails_edge.gemfile
 notifications:
   slack:
     secure: S1W/Lw+dH3wb8FfkMIWPZmr6M4Q6S2WMkSlanpKva1HM7K5QL7hXdmUl2yBUxJE26BHSsb1ScozMEzadyda2+i/W34UvZ7LXgKeHkUKEdjy/AmsSJPK1ZjMfgnv10tVgbEIusNb4bF/sSuChdZKK3ILwOlqIPDlQNdMwF1xRA2xt5J7tb26UgyIzoCI4P3bJYMULWsEkk+UwHiJH0YO9ulkTZI/j0N+hLXQLJTZPjmKtMk/tE0NbBmFVL4md89hUcR5gKTGGrNzEMJ58K+zqeDG/DubkcIbA5ZuqKv+oE5m0pDODZExxnC+oeENTvq/VfYwOfD0pTDrBNYjj+Bm3YiyGDzQAgov9XPDG8g/fKEs/LNAT79UZXkZlFO99Yn/vrYH9o5DKpOE9smENUXylb55MgLTUiYe17CTp7pB3trbJl3wwIbLjSmTjAdSUNgPv8qDP4uk3K4U32mknXCDDkU9EI7f6F731ocdoxsGarEBcPcgjs73Y84iwDteQp847Gigtgo4Y4TCWH657uzLolR2O8NSw+vWT0VNI9qtR5PZD7iVYtSp1qHtPAKowCztodewY2Nu+Ds9Z95udf4GPUkFg/SNEJPTPrQFLiiJZ8UYP8NJEuA+IP1tc2zG3zU/ADrjenRC1ZiupQG7OMH82y11408U6PcHFSlF+7NuDkac=

data/Appraisals

@@ -1,7 +1,15 @@
 # vim: set ft=ruby
 
 appraise 'ar-5.0' do
-  gem 'activerecord', '~> 5.0.0'
+  gem 'activerecord', '~> 5.0.7'
+end
+
+appraise 'ar-5.1' do
+  gem 'activerecord', '~> 5.1.6'
+end
+
+appraise 'ar-5.2' do
+  gem 'activerecord', '~> 5.2.1'
 end
 
 appraise 'rails-edge' do

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG for activerecord-shard_for
 
+## 0.6.1
+
+- Allow settings `thread_pool_base_size` and command executor. [#18](https://github.com/yuemori/activerecord-shard_for/pull/18)
+- Bump up supporeted rails versions. [#19](https://github.com/yuemori/activerecord-shard_for/pull/19)
+  - Add rails 5.2
+
 ## 0.6.0
 
 - Support same connection to connect for same shard. [#15](https://github.com/yuemori/activerecord-shard_for/pull/15)

data/README.md

@@ -76,7 +76,7 @@ class User < ActiveRecord::Base
 end
 ```
 
-Use `.get` to retrive single record which is connected to proper database node. Use .put! to create new record to proper database node.
+Use `.get` to retrieve single record which is connected to proper database node. Use .put! to create new record to proper database node.
 
 `.all_shards` returns each model class which is connected to proper database node. You can query with these models and aggregate result.
 

data/gemfiles/.bundle/config

@@ -1 +1,2 @@
---- {}
+---
+BUNDLE_RETRY: "1"

data/gemfiles/ar_5.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0"
+gem "activerecord", "~> 5.0.7"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/ar_5.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.1.6"
+
+gemspec path: "../"

data/gemfiles/ar_5.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2.1"
+
+gemspec path: "../"

data/gemfiles/rails_edge.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", :github => "rails/rails"
-gem "arel", :github => "rails/arel"
+gem "activerecord", github: "rails/rails"
+gem "arel", github: "rails/arel"
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/activerecord/shard_for/all_shards_in_parallel.rb

@@ -4,8 +4,10 @@ module ActiveRecord
   module ShardFor
     class AllShardsInParallel
       # @param [Array<Class>] An array of shard model class
-      def initialize(shards)
+      # @param [Expeditor::Service] service
+      def initialize(shards, service:)
         @shards = shards
+        @service = service
       end
 
       # @yield [Class] A shard model class
@@ -16,7 +18,7 @@ module ActiveRecord
         return [] unless block_given?
 
         commands = @shards.map do |m|
-          Expeditor::Command.new { m.connection_pool.with_connection { yield m } }
+          Expeditor::Command.new(service: @service) { m.connection_pool.with_connection { yield m } }
         end
         commands.each(&:start)
         commands.map(&:get)

data/lib/activerecord/shard_for/database_tasks.rb

@@ -130,7 +130,7 @@ module ActiveRecord
           return cluster_name if cluster_name
 
           $stderr.puts <<-MSG
-Missing cluster_name. Find cluster_name via `rake activerecord:shard_for:info` then call `rake "activerecord:shard_for:#{name}[$cluster_name]"`.
+  Missing cluster_name. Find cluster_name via `rake activerecord:shard_for:info` then call `rake "activerecord:shard_for:#{name}[$cluster_name]"`.
           MSG
           exit_with_error
         end

data/lib/activerecord/shard_for/model.rb

@@ -10,6 +10,7 @@ module ActiveRecord
         class_attribute :shard_repository, instance_writer: false
         class_attribute :replication_mapping, instance_writer: false
         class_attribute :distkey, instance_writer: false
+        class_attribute :service, instance_writer: false
 
         include ActiveRecord::ShardFor::Patch
       end
@@ -17,11 +18,20 @@ module ActiveRecord
       module ClassMethods
         # The cluster config must be defined before `use_cluster`
         # @param [Symbol] name A cluster name which is set by ActiveRecord::ShardFor.configure
-        def use_cluster(name, router_name)
+        def use_cluster(name, router_name, thread_pool_size_base: 3)
           cluster_config = ActiveRecord::ShardFor.config.fetch_cluster_config(name)
           connection_router_class = ActiveRecord::ShardFor.config.fetch_connection_router(router_name)
           self.connection_router = connection_router_class.new(cluster_config)
           self.shard_repository = ActiveRecord::ShardFor::ShardRepository.new(cluster_config, self)
+          thread_size = (shard_repository.all.size * thread_pool_size_base)
+          self.service = Expeditor::Service.new(
+            executor: Concurrent::ThreadPoolExecutor.new(
+              min_threads: thread_size,
+              max_threads: thread_size,
+              max_queue: shard_repository.all.size,
+              fallback_policy: :abort
+            )
+          )
           self.abstract_class = true
         end
 
@@ -124,7 +134,7 @@ module ActiveRecord
         # @example
         #   User.all_shards_in_parallel.map {|m| m.where.find_by(name: 'Alice') }.compact
         def all_shards_in_parallel
-          AllShardsInParallel.new(all_shards)
+          AllShardsInParallel.new(all_shards, service: service)
         end
         alias_method :parallel, :all_shards_in_parallel
 

data/lib/activerecord/shard_for/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module ShardFor
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.6.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-shard_for
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - yuemori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -243,6 +243,8 @@ files:
 - bin/setup
 - gemfiles/.bundle/config
 - gemfiles/ar_5.0.gemfile
+- gemfiles/ar_5.1.gemfile
+- gemfiles/ar_5.2.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/activerecord/shard_for.rb
 - lib/activerecord/shard_for/abstract_shard_repository.rb
@@ -283,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Database sharding library for ActiveRecord