switchman 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cfc736ed07b0e8b80b62928efb9e523a6e8e6ab31841ef4f7022ffbba7a7b57
-  data.tar.gz: 1879cbef2d1e8ab2d451fcf31ebe3b0a37c10e27eb1099ca96e73f58446adfae
+  metadata.gz: e5760f08a540406e8e7d546f0104c1ff8833ce7610daba34810b53ffe5caa295
+  data.tar.gz: 4bf65b183425addbec13ae77d9e4f1e3b89244afbcf9625a7e86717e216ce778
 SHA512:
-  metadata.gz: c82b93120355776072460d8e2ec1a648ed76454ed178ee3a102b66303dc9716b23bdea855a8047995c454b2528bbe580ceccba43a36edc4afb2d4458e984b493
-  data.tar.gz: a97fb461a01e06ad8498635382d316ca84e0830a54984e45ce4c1cb575c3ff11e121185c67618246d175ff61eee2c1931acc5b48876235d65b6802a349621077
+  metadata.gz: e3e6467f46cb98d78e53b96b1661dbb0cfb59efd25cade9d5f1f2bde4ba067478871c42f91bd06c11c42ed6153c37fca9ef0a20555f3598f910dbda17ce9b42c
+  data.tar.gz: eba93dc04390850eba1a7224bcf5f8fbd5b272133cbac94211c512df023a3e9a7d3951267b55bbc831012f03d443ff6705f74c601bc41a05efb389ecae4240c2

data/lib/switchman/active_record/association.rb

@@ -85,7 +85,7 @@ module Switchman
         # Copypasta from Activerecord but with added global_id_for goodness.
         def records_for(ids)
           scope.where(association_key_name => ids).load do |record|
-            global_key = if record.class.connection_classes == UnshardedRecord
+            global_key = if model.connection_classes == UnshardedRecord
                            convert_key(record[association_key_name])
                          else
                            Shard.global_id_for(record[association_key_name], record.shard)

data/lib/switchman/active_record/calculations.rb

@@ -50,7 +50,7 @@ module Switchman
 
       def calculate_simple_average(column_name, distinct)
         # See activerecord#execute_simple_calculation
-        relation = reorder(nil)
+        relation = except(:order)
         column = aggregate_column(column_name)
         relation.select_values = [operation_over_aggregate_column(column, 'average', distinct).as('average'),
                                   operation_over_aggregate_column(column, 'count', distinct).as('count')]

data/lib/switchman/active_record/postgresql_adapter.rb

@@ -87,6 +87,10 @@ module Switchman
         name.quoted
       end
 
+      def with_global_table_name(&block)
+        with_local_table_name(false, &block)
+      end
+
       def with_local_table_name(enable = true) # rubocop:disable Style/OptionalBooleanParameter
         old_value = @use_local_table_name
         @use_local_table_name = enable

data/lib/switchman/active_record/query_methods.rb

@@ -239,6 +239,10 @@ module Switchman
         connection.with_local_table_name { super }
       end
 
+      def table_name_matches?(from)
+        connection.with_global_table_name { super }
+      end
+
       def transpose_predicates(predicates,
                                source_shard,
                                target_shard,
@@ -281,7 +285,7 @@ module Switchman
         remove = true if type == :primary &&
                          remove_nonlocal_primary_keys &&
                          predicate.left.relation.klass == klass &&
-                         predicate.is_a?(::Arel::Nodes::Equality)
+                         (predicate.is_a?(::Arel::Nodes::Equality) || predicate.is_a?(::Arel::Nodes::HomogeneousIn))
 
         current_source_shard =
           if source_shard
@@ -301,7 +305,7 @@ module Switchman
         new_right_value =
           case right
           when Array
-            right.map { |val| transpose_predicate_value(val, current_source_shard, target_shard, type, remove) }
+            right.map { |val| transpose_predicate_value(val, current_source_shard, target_shard, type, remove).presence }.compact
           else
             transpose_predicate_value(right, current_source_shard, target_shard, type, remove)
           end
@@ -315,7 +319,13 @@ module Switchman
             predicate.class.new(predicate.left, right.class.new(new_right_value, right.attribute))
           end
         elsif predicate.is_a?(::Arel::Nodes::HomogeneousIn)
-          predicate.class.new(new_right_value, predicate.attribute, predicate.type)
+          # switch to a regular In, so that Relation::WhereClause#contradiction? knows about it
+          if new_right_value.empty?
+            klass = predicate.type == :in ? ::Arel::Nodes::In : ::Arel::Nodes::NotIn
+            klass.new(predicate.attribute, new_right_value)
+          else
+            predicate.class.new(new_right_value, predicate.attribute, predicate.type)
+          end
         else
           predicate.class.new(predicate.left, new_right_value)
         end

data/lib/switchman/active_record/relation.rb

@@ -112,10 +112,57 @@ module Switchman
             shards.first.activate(klass.connection_classes) { yield(self, shards.first) }
           end
         else
-          # TODO: implement local limit to avoid querying extra shards
-          Shard.with_each_shard(shards, [klass.connection_classes]) do
-            shard(Shard.current(klass.connection_classes), :to_a).activate(&block)
+          result_count = 0
+          can_order = false
+          result = Shard.with_each_shard(shards, [klass.connection_classes]) do
+            # don't even query other shards if we're already past the limit
+            next if limit_value && result_count >= limit_value && order_values.empty?
+
+            relation = shard(Shard.current(klass.connection_classes), :to_a)
+            # do a minimal query if possible
+            relation = relation.limit(limit_value - result_count) if limit_value && !result_count.zero? && order_values.empty?
+
+            shard_results = relation.activate(&block)
+
+            if shard_results.present?
+              can_order ||= can_order_cross_shard_results? unless order_values.empty?
+              raise OrderOnMultiShardQuery if !can_order && !order_values.empty? && result_count.positive?
+
+              result_count += shard_results.is_a?(Array) ? shard_results.length : 1
+            end
+            shard_results
+          end
+
+          result = reorder_cross_shard_results(result) if can_order
+          result.slice!(limit_value..-1) if limit_value
+          result
+        end
+      end
+
+      def can_order_cross_shard_results?
+        # we only presume to be able to post-sort the most basic of orderings
+        order_values.all? { |ov| ov.is_a?(::Arel::Nodes::Ordering) && ov.expr.is_a?(::Arel::Attributes::Attribute) }
+      end
+
+      def reorder_cross_shard_results(results)
+        results.sort! do |l, r|
+          result = 0
+          order_values.each do |ov|
+            a = l.attribute(ov.expr.name)
+            b = r.attribute(ov.expr.name)
+            next if a == b
+
+            if a.nil? || b.nil?
+              result = 1 if a.nil?
+              result *= -1 if ov.is_a?(::Arel::Nodes::Descending)
+            else
+              result = a <=> b
+            end
+
+            result *= -1 if ov.is_a?(::Arel::Nodes::Descending)
+            break unless result.zero?
           end
+          result
         end
       end
     end

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = '3.0.1'
+  VERSION = '3.0.3'
 end

data/lib/switchman.rb

@@ -17,4 +17,6 @@ module Switchman
   def self.cache=(cache)
     @cache = cache
   end
+
+  class OrderOnMultiShardQuery < RuntimeError; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord