querrel 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10e25c9b7852624e963fb30af3d5fe9197f82205
-  data.tar.gz: 2cd4c6c58b3bbc6939df6d3e7033775bce6dbcb0
+  metadata.gz: 8a221606ea4c6afe6ec28d674c8a3991bb221d15
+  data.tar.gz: 3c1bb8daff36108b3addd087d3769cbe3b5cefab
 SHA512:
-  metadata.gz: ba13c28586b08e6253b7f3fb5a535e1658772f03301babebdb8886669e9606e8d560198a90f54d77c890320f0a37936210aa5c4720c7d9b38b5499dd6b4e1388
-  data.tar.gz: cf49fe63a453d70c3ca8271463f6a77d4463291f3dc2319c477859671b22c6d924a0abd73a248908c2291a7aa27d783117dcbec0baaf31108e8ab92cfe35ede4
+  metadata.gz: 971c487ef162a42b1874616ea1f267a13836d0671766fe12f83dc359fef3df071d0b4b9c6cf8e39d9cd85cf896184b806f3bfb6881c4f9fb5d102942c7c9e744
+  data.tar.gz: d2aa19d3e6cb412bee5210107b616607847870baf61bc5d4c8948a13d756c771c278610aa578f5f5e4f1f0c6a225cb2af61a3b384a30a85751e00e52602681cd

data/lib/querrel.rb

@@ -8,11 +8,15 @@ module Querrel
     end
 
     def query(scope, opts, &blk)
-      Querreller.new(opts.delete(:on), opts).query(scope)
+      Querreller.new(opts.delete(:on), opts).query(scope, &blk)
     end
 
     def map(scope, opts, &blk)
-      Querreller.new(opts.delete(:on), opts).map(scope)
+      Querreller.new(opts.delete(:on), opts).map(scope, &blk)
+    end
+
+    def run(opts, &blk)
+      Querreller.new(opts.delete(:on), opts).run(&blk)
     end
   end
 end

data/lib/querrel/connected_model_factory.rb

@@ -0,0 +1,12 @@
+module Querrel
+  class ConnectedModelFactory
+    def self.[](model, con_spec = nil)
+      con_spec ||= Thread.current[:querrel_con_spec]
+      dynamic_class_name = "#{model.name}#{Thread.current.object_id}"
+      Class.new(model).tap do |m|
+        m.send(:define_singleton_method, :name) { dynamic_class_name }
+        m.establish_connection(con_spec.config)
+      end
+    end
+  end
+end

data/lib/querrel/connection_resolver.rb

@@ -15,7 +15,8 @@ module Querrel
         when Hash
           specs = conns
         when Array
-          specs = ActiveRecord::Base.configurations.select{ |n, _| conns.include?(n.to_sym) }
+          conns.map!(&:to_s)
+          specs = ActiveRecord::Base.configurations.select{ |n, _| conns.include?(n.to_s) }
         end
       end
 

data/lib/querrel/map_reduce.rb

@@ -0,0 +1,50 @@
+module Querrel
+  module MapReduce
+    def query(scope, options = {}, &blk)
+      buckets = map(scope, options, &blk)
+      reduce(buckets)
+    end
+
+    def map(scope, options = {}, &blk)
+      if options.key?(:on)
+        resolver = ConnectionResolver.new(options[:on], !!options[:db_names])
+        dbs = resolver.configurations.keys
+      else
+        resolver = @connection_resolver
+        dbs = @connection_resolver.configurations.keys
+      end
+
+      query_model = scope.model
+      results = {}
+
+      threads = []
+      dbs.each do |db|
+        threads << Thread.new do
+          con_spec = retrieve_connection_spec(db, resolver)
+          Thread.current[:querrel_con_spec] = con_spec
+          dynamic_class = ConnectedModelFactory[query_model, con_spec]
+
+          begin
+            local_scope = dynamic_class.all.merge(scope)
+            results[db] = if block_given?
+              res = yield(local_scope)
+              res.to_a.each(&:readonly!) if res.is_a?(ActiveRecord::Relation)
+              res
+            else
+              local_scope.to_a.each(&:readonly!)
+            end
+          ensure
+            dynamic_class.connection_pool.release_connection
+          end
+        end
+      end
+      threads.each(&:join)
+
+      results
+    end
+
+    def reduce(buckets)
+      buckets.flat_map{ |db, results| results }
+    end
+  end
+end

data/lib/querrel/querreller.rb

@@ -1,60 +1,34 @@
+require 'querrel/connected_model_factory'
 require 'querrel/connection_resolver'
+require 'querrel/map_reduce'
 
 module Querrel
   class Querreller
+    include MapReduce
     attr_accessor :connection_resolver
 
     def initialize(dbs, options = {})
       @connection_resolver = ConnectionResolver.new(dbs, options[:db_names])
     end
 
-    def query(scope, options = {}, &blk)
-      buckets = map(scope, options, &blk)
-      reduce(buckets)
-    end
-
-    def map(scope, options = {}, &blk)
+    def run(options = {}, &blk)
       if options.key?(:on)
-        resolver = ConnectionResolver.new(dbs, !!options[:db_names])
+        resolver = ConnectionResolver.new(options[:on], !!options[:db_names])
         dbs = resolver.configurations.keys
       else
         resolver = @connection_resolver
         dbs = @connection_resolver.configurations.keys
       end
 
-      query_model = scope.model
-      results = {}
-
       threads = []
       dbs.each do |db|
         threads << Thread.new do
           con_spec = retrieve_connection_spec(db, resolver)
-          dynamic_class_name = "TempModel#{Thread.current.object_id}"
-          dynamic_class = Class.new(query_model)
-          dynamic_class.send(:define_singleton_method, :name) { dynamic_class_name }
-
-          begin
-            dynamic_class.establish_connection(con_spec.config)
-            local_scope = dynamic_class.all.merge(scope)
-            results[db] = if block_given?
-              res = yield(local_scope)
-              res.to_a.each(&:readonly!) if res.is_a?(ActiveRecord::Relation)
-              res
-            else
-              local_scope.to_a.each(&:readonly!)
-            end
-          ensure
-            dynamic_class.connection_pool.release_connection
-          end
+          Thread.current[:querrel_con_spec] = con_spec
+          yield(ConnectedModelFactory)
         end
       end
       threads.each(&:join)
-
-      results
-    end
-
-    def reduce(buckets)
-      buckets.flat_map{ |db, results| results }
     end
 
     def retrieve_connection_spec(db, resolver)

data/lib/querrel/version.rb

@@ -1,3 +1,3 @@
 module Querrel
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/instance_test.rb

@@ -39,6 +39,24 @@ class InstanceTest < Querrel::Test
       scope.pluck(:name)
     end
 
-    assert names * @dbs.length, res
+    assert_equal names * @dbs.length, res
+  end
+
+  def test_runner
+    s = Mutex.new
+    configs_actual = []
+
+    @q.run do |q|
+      s.synchronize do
+        configs_actual << q[Product].connection_config
+      end
+    end
+
+    configs = Querrel::ConnectionResolver.new(@dbs, false).configurations.values
+
+    configs = configs.map{ |c| Hash[c.map{ |k, v| [k.to_s, v] }] }.sort_by{ |c| c["database"] }
+    configs_actual = configs_actual.map{ |c| Hash[c.map{ |k, v| [k.to_s, v] }] }.sort_by{ |c| c["database"] }
+
+    assert_equal configs, configs_actual
   end
 end

data/test/non_instance_test.rb

@@ -1,3 +1,4 @@
+require 'thread'
 require_relative 'setup/test_helper'
 
 class NonInstanceTest < Querrel::Test
@@ -38,6 +39,23 @@ class NonInstanceTest < Querrel::Test
       scope.pluck(:name)
     end
 
-    assert names * @dbs.length, res
+    assert_equal names * @dbs.length, res
+  end
+
+  def test_runner
+    s = Mutex.new
+    configs_actual = []
+    Querrel.run(on: @dbs) do |q|
+      s.synchronize do
+        configs_actual << q[Product].connection_config
+      end
+    end
+
+    configs = Querrel::ConnectionResolver.new(@dbs, false).configurations.values
+
+    configs = configs.map{ |c| Hash[c.map{ |k, v| [k.to_s, v] }] }.sort_by{ |c| c["database"] }
+    configs_actual = configs_actual.map{ |c| Hash[c.map{ |k, v| [k.to_s, v] }] }.sort_by{ |c| c["database"] }
+
+    assert_equal configs, configs_actual
   end
 end

data/test/resolver_test.rb

@@ -2,11 +2,16 @@ require_relative 'setup/test_helper'
 
 class InstanceTest < Querrel::Test
   def test_env_resolver
-    conns = [:sqlite_db_0, :sqlite_db_1]
-    resolver = Querrel::ConnectionResolver.new(conns, false)
+    sym_conns = [:sqlite_db_0, :sqlite_db_1]
+    resolver_sym = Querrel::ConnectionResolver.new(sym_conns, false)
+    string_conns = ['sqlite_db_0', 'sqlite_db_1']
+    resolver_string = Querrel::ConnectionResolver.new(string_conns, false)
+
+    assert_equal 2, resolver_sym.configurations.length
+    assert_equal string_conns, resolver_sym.configurations.keys
 
-    assert_equal 2, resolver.configurations.length
-    assert_equal conns.map(&:to_s), resolver.configurations.keys
+    assert_equal 2, resolver_string.configurations.length
+    assert_equal string_conns, resolver_string.configurations.keys
   end
 
   def test_db_name_resolver
@@ -34,7 +39,4 @@ class InstanceTest < Querrel::Test
 
     assert_equal conns, resolver.configurations
   end
-
-  def test_default_resolver
-  end
 end

data/test/setup/database.yml

@@ -1,4 +1,4 @@
-<% 100.times do |i| %>
+<% 20.times do |i| %>
 sqlite_db_<%= i %>:
   adapter: sqlite3
   database: test/dbs/test_db_<%= i %>.sqlite3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: querrel
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Campbell
@@ -93,7 +93,9 @@ files:
 - README.md
 - Rakefile
 - lib/querrel.rb
+- lib/querrel/connected_model_factory.rb
 - lib/querrel/connection_resolver.rb
+- lib/querrel/map_reduce.rb
 - lib/querrel/querreller.rb
 - lib/querrel/version.rb
 - querrel.gemspec