switchman 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f89b4901f87f3beb95a7714ad526cb67907068d
-  data.tar.gz: b16ba8ab6429b604f83a5a6cdc45f5c4a4322e06
+  metadata.gz: 9a061d43139c6beef4a69af819d1797a7d14650d
+  data.tar.gz: 4efbe1614848d2d2ba0e23d8bc8b993ff44a9fc9
 SHA512:
-  metadata.gz: ccc0efa41d2ecc1b2d7eacda7bb6cf9574156fb4d4fda8c57affb3c115086574a8f500369f9eaf10e59362016f964babad253c68bcdc6f079143a722f23c244d
-  data.tar.gz: 203bbd2ed5c185f4e737d292c5b9c16640500811035bc7b21f84b5a10372db1fd466124ed737e063b417c4819a6f8075c338164818ffce551d7748d59ba51bd0
+  metadata.gz: 423e156b64348617b371ff59e042db181a69eda6a64bae54c5823b4e8e6e4f35b0ed748c4ee2f6e4d462bd17501f6bd417c881d3edb6c21266f7421650716d15
+  data.tar.gz: 8ced56c4ab5bf0327b98d8fa4d25b228b02badb181866f722d79cce44eece0148f1b0dd328ec93a91181d7802a65123cd1c3e33d2811a35115bdae95a18eb83b

data/lib/switchman/active_record/query_methods.rb

@@ -91,6 +91,7 @@ module Switchman
         end
       end
 
+
       private
 
       [:where, :having].each do |type|
@@ -222,6 +223,22 @@ module Switchman
         super.tap { |factory| factory.scope = self }
       end
 
+      def arel_columns(columns)
+        columns.map do |field|
+          if (Symbol === field || String === field) && ::Rails.version >= '5' && (klass.has_attribute?(field) || klass.attribute_alias?(field)) && !from_clause.value
+            klass.arel_attribute(field, table)
+          elsif (Symbol === field || String === field) && ::Rails.version < '5' && columns_hash.key?(field.to_s) && !from_value
+            arel_table[field]
+          elsif Symbol === field
+            # the rest of this is pulled from AR - the only change is from quote_table_name to quote_column_name here
+            # otherwise qualified names will add the schema to a column
+            connection.quote_column_name(field.to_s)
+          else
+            field
+          end
+        end
+      end
+
       # semi-private
       public
       def transpose_predicates(predicates, source_shard, target_shard, remove_nonlocal_primary_keys = false, binds = nil)

data/lib/switchman/active_record/statement_cache.rb

@@ -1,6 +1,22 @@
 module Switchman
   module ActiveRecord
     module StatementCache
+      module ClassMethods
+        def create(connection, block = Proc.new)
+          relation = block.call ::ActiveRecord::StatementCache::Params.new
+
+          binds = ::Rails.version >= '5' ? relation.bound_attributes : relation.bind_values
+          bind_map = ::ActiveRecord::StatementCache::BindMap.new(binds)
+          new relation.arel, bind_map
+        end
+      end
+
+      def initialize(arel, bind_map)
+        @arel = arel
+        @bind_map = bind_map
+        @qualified_query_builders = {}
+      end
+
       # since the StatememtCache is only implemented
       # for basic relations in AR::Base#find, AR::Base#find_by and AR::Association#get_records,
       # we can make some assumptions about the shard source
@@ -17,12 +33,25 @@ module Switchman
 
         bind_values = bind_map.bind(params, current_shard, target_shard)
 
-        sql = query_builder.sql_for(bind_values, connection)
         target_shard.activate(klass.shard_category) do
-          klass.find_by_sql(sql, bind_values)
+          if connection.use_qualified_names?
+            sql = qualified_query_builder(target_shard, klass).sql_for(bind_values, connection)
+            klass.find_by_sql(sql, bind_values)
+          else
+            sql = generic_query_builder(connection).sql_for(bind_values, connection)
+            klass.find_by_sql(sql, bind_values)
+          end
         end
       end
 
+      def generic_query_builder(connection)
+        @query_builder ||= connection.cacheable_query(@arel)
+      end
+
+      def qualified_query_builder(shard, klass)
+        @qualified_query_builders[shard.id] ||= klass.connection.cacheable_query(@arel)
+      end
+
       module BindMap
         # performs id transposition here instead of query_methods.rb
         def bind(values, current_shard, target_shard)

data/lib/switchman/engine.rb

@@ -94,11 +94,10 @@ module Switchman
 
         if ::Rails.version > '4.2'
           require "switchman/active_record/statement_cache"
-          require "switchman/active_record/core"
           ::ActiveRecord::StatementCache.prepend(ActiveRecord::StatementCache)
+          ::ActiveRecord::StatementCache.singleton_class.prepend(ActiveRecord::StatementCache::ClassMethods)
           ::ActiveRecord::StatementCache::BindMap.prepend(ActiveRecord::StatementCache::BindMap)
           ::ActiveRecord::StatementCache::Substitute.send(:attr_accessor, :primary, :sharded)
-          singleton_class.prepend ActiveRecord::Core
 
           ::ActiveRecord::Associations::CollectionAssociation.prepend(ActiveRecord::CollectionAssociation)
         end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.5.6"
+  VERSION = "1.5.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -162,6 +162,7 @@ files:
 - app/models/switchman/shard_internal.rb
 - db/migrate/20130328212039_create_switchman_shards.rb
 - db/migrate/20130328224244_create_default_shard.rb
+- db/shard_1708.sqlite3
 - lib/switchman.rb
 - lib/switchman/action_controller/caching.rb
 - lib/switchman/active_record/abstract_adapter.rb
@@ -172,7 +173,6 @@ files:
 - lib/switchman/active_record/calculations.rb
 - lib/switchman/active_record/connection_handler.rb
 - lib/switchman/active_record/connection_pool.rb
-- lib/switchman/active_record/core.rb
 - lib/switchman/active_record/finder_methods.rb
 - lib/switchman/active_record/log_subscriber.rb
 - lib/switchman/active_record/model_schema.rb
@@ -194,7 +194,6 @@ files:
 - lib/switchman/database_server.rb
 - lib/switchman/default_shard.rb
 - lib/switchman/engine.rb
-- lib/switchman/engine.rb~
 - lib/switchman/environment.rb
 - lib/switchman/errors.rb
 - lib/switchman/r_spec_helper.rb
@@ -202,7 +201,6 @@ files:
 - lib/switchman/schema_cache.rb
 - lib/switchman/shackles.rb
 - lib/switchman/shackles/relation.rb
-- lib/switchman/shard_aware_statement_cache.rb
 - lib/switchman/sharded_instrumenter.rb
 - lib/switchman/test_helper.rb
 - lib/switchman/version.rb
@@ -227,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic

data/lib/switchman/active_record/core.rb

@@ -1,18 +0,0 @@
-require "switchman/shard_aware_statement_cache"
-
-module Switchman
-  module ActiveRecord
-    module Core
-      def initialize_find_by_cache
-        if ::Rails.version < '5'
-          self.find_by_statement_cache = ShardAwareStatementCache.new(shard_category)
-        else
-          # note that this will not work beyond ActiveRecord 5.0.0.beta3 since
-          #  as of beta4 this has been replaced with a hash containing two separate caches:
-          #  one for prepared statements, and one for unprepared ones
-          @find_by_statement_cache = ShardAwareStatementCache.new(shard_category)
-        end
-      end
-    end
-  end
-end

data/lib/switchman/engine.rb~

@@ -1,203 +0,0 @@
-module Switchman
-  class Engine < ::Rails::Engine
-    require 'byebug'
-    debugger
-    isolate_namespace Switchman
-
-    config.autoload_once_paths << File.expand_path(File.join(__FILE__, "../../../app/models"))
-
-    def self.lookup_stores(cache_store_config)
-      result = {}
-      cache_store_config.each do |key, value|
-        next if value.is_a?(String)
-        result[key] = ::ActiveSupport::Cache.lookup_store(value)
-      end
-
-      cache_store_config.each do |key, value|
-        next unless value.is_a?(String)
-        result[key] = result[value]
-      end
-      result
-    end
-
-    initializer 'switchman.initialize_cache', :before => 'initialize_cache' do
-      require "switchman/active_support/cache"
-      ::ActiveSupport::Cache.singleton_class.prepend(ActiveSupport::Cache::ClassMethods)
-
-      # if we haven't already setup our cache map out-of-band, set it up from
-      # config.cache_store now. behaves similarly to Rails' default
-      # initialize_cache initializer, but for each value in the map, rather
-      # than just Rails.cache. if config.cache_store is a flat value, uses it
-      # to fill just the Rails.env entry in the cache map.
-      unless Switchman.config[:cache_map].present?
-        cache_store_config = ::Rails.configuration.cache_store
-        unless cache_store_config.is_a?(Hash)
-          cache_store_config = {::Rails.env => cache_store_config}
-        end
-
-        Switchman.config[:cache_map] = Engine.lookup_stores(cache_store_config)
-      end
-
-      # if the configured cache map (either from before, or as populated from
-      # config.cache_store) didn't have an entry for Rails.env, add one using
-      # lookup_store(nil); matches the behavior of Rails' default
-      # initialize_cache initializer when config.cache_store is nil.
-      unless Switchman.config[:cache_map].has_key?(::Rails.env)
-        value = ::ActiveSupport::Cache.lookup_store(nil)
-        Switchman.config[:cache_map][::Rails.env] = value
-      end
-
-      middlewares = Switchman.config[:cache_map].values.map do |store|
-        store.middleware if store.respond_to?(:middleware)
-      end.compact.uniq
-      middlewares.each do |middleware|
-        config.middleware.insert_before("Rack::Runtime", middleware)
-      end
-
-      # prevent :initialize_cache from trying to (or needing to) set
-      # Rails.cache. once our switchman.extend_ar initializer (below) runs
-      # Rails.cache will be overridden to pull appropriate values from the
-      # cache map, but between now and then, Rails.cache should return the
-      # Rails.env entry in the cache map.
-      ::Rails.cache = Switchman.config[:cache_map][::Rails.env]
-
-      require "switchman/rails"
-      ::Rails.singleton_class.prepend(Rails::ClassMethods)
-    end
-
-    initializer 'switchman.asplode', :after => "active_record.initialize_database" do
-      ::Rails.cache
-    end
-
-      initializer 'switchman.extend_ar', :before => "active_record.initialize_database" do
-      ::ActiveSupport.on_load(:active_record) do
-        require 'byebug'
-        debugger
-        require "switchman/active_record/abstract_adapter"
-        require "switchman/active_record/association"
-        require "switchman/active_record/attribute_methods"
-        require "switchman/active_record/base"
-        require "switchman/active_record/calculations"
-        require "switchman/active_record/connection_handler"
-        require "switchman/active_record/connection_pool"
-        require "switchman/active_record/finder_methods"
-        require "switchman/active_record/log_subscriber"
-        require "switchman/active_record/model_schema"
-        require "switchman/active_record/persistence"
-        require "switchman/active_record/predicate_builder"
-        require "switchman/active_record/query_cache"
-        require "switchman/active_record/query_methods"
-        require "switchman/active_record/reflection"
-        require "switchman/active_record/relation"
-        require "switchman/active_record/spawn_methods"
-        require "switchman/active_record/where_clause_factory"
-        require "switchman/active_record/type_caster"
-        require "switchman/arel"
-        require "switchman/shackles/relation"
-
-        include ActiveRecord::Base
-        include ActiveRecord::AttributeMethods
-        include ActiveRecord::Persistence
-        singleton_class.prepend ActiveRecord::ModelSchema::ClassMethods
-
-        if ::Rails.version > '4.2'
-          require "switchman/active_record/statement_cache"
-          ::ActiveRecord::StatementCache.prepend(ActiveRecord::StatementCache)
-          ::ActiveRecord::StatementCache::BindMap.prepend(ActiveRecord::StatementCache::BindMap)
-          ::ActiveRecord::StatementCache::Substitute.send(:attr_accessor, :primary, :sharded)
-
-          ::ActiveRecord::Associations::CollectionAssociation.prepend(ActiveRecord::CollectionAssociation)
-          ::ActiveRecord::PredicateBuilder.singleton_class.prepend(ActiveRecord::PredicateBuilder)
-        end
-
-        if ::Rails.version > '4.1'
-          prepend(ActiveRecord::AutosaveAssociation)
-        end
-
-        ::ActiveRecord::Associations::Association.prepend(ActiveRecord::Association)
-        ::ActiveRecord::Associations::BelongsToAssociation.prepend(ActiveRecord::BelongsToAssociation)
-        ::ActiveRecord::Associations::CollectionProxy.include(ActiveRecord::CollectionProxy)
-        if ::Rails.version < '5'
-          ::ActiveRecord::Associations::Builder::CollectionAssociation.include(ActiveRecord::Builder::CollectionAssociation)
-        end
-
-        ::ActiveRecord::Associations::Preloader::Association.prepend(ActiveRecord::Preloader::Association)
-        ::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(ActiveRecord::AbstractAdapter)
-        ::ActiveRecord::ConnectionAdapters::ConnectionHandler.prepend(ActiveRecord::ConnectionHandler)
-        ::ActiveRecord::ConnectionAdapters::ConnectionPool.prepend(ActiveRecord::ConnectionPool)
-        ::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(ActiveRecord::QueryCache)
-        # when we call super in Switchman::ActiveRecord::QueryCache#select_all,
-        # we want it to find the definition from
-        # ActiveRecord::ConnectionAdapters::DatabaseStatements, not
-        # ActiveRecord::ConnectionAdapters::QueryCache
-        ::ActiveRecord::ConnectionAdapters::QueryCache.send(:remove_method, :select_all)
-
-        ::ActiveRecord::LogSubscriber.prepend(ActiveRecord::LogSubscriber)
-        ::ActiveRecord::Reflection::AssociationReflection.prepend(ActiveRecord::Reflection::AssociationReflection)
-        ::ActiveRecord::Relation.prepend(ActiveRecord::Calculations)
-        ::ActiveRecord::Relation.include(ActiveRecord::FinderMethods)
-        ::ActiveRecord::Relation.include(ActiveRecord::QueryMethods)
-        ::ActiveRecord::Relation.prepend(ActiveRecord::Relation)
-        ::ActiveRecord::Relation.include(ActiveRecord::SpawnMethods)
-        ::ActiveRecord::Relation.prepend(Shackles::Relation)
-
-        if ::Rails.version >= '5'
-          ::ActiveRecord::Relation::WhereClauseFactory.prepend(ActiveRecord::WhereClauseFactory)
-          ::ActiveRecord::PredicateBuilder::AssociationQueryValue.prepend(ActiveRecord::PredicateBuilder::AssociationQueryValue)
-          ::ActiveRecord::TypeCaster::Map.include(ActiveRecord::TypeCaster::Map)
-          ::ActiveRecord::TypeCaster::Connection.include(ActiveRecord::TypeCaster::Connection)
-        end
-
-        ::Arel::Table.prepend(Arel::Table)
-        ::Arel::Visitors::ToSql.prepend(Arel::Visitors::ToSql)
-        ::Arel::Visitors::PostgreSQL.include(Arel::Visitors::PostgreSQL) if ::Rails.version < '4.2'
-      end
-    end
-
-    def self.foreign_key_check(name, type, options)
-      if name.to_s =~ /_id\z/ && type.to_s == 'integer' && options[:limit].to_i < 8
-        puts "WARNING: All foreign keys need to be 8-byte integers. #{name} looks like a foreign key. If so, please add the option: `:limit => 8`"
-      end
-    end
-
-    initializer 'switchman.extend_connection_adapters', :after => "active_record.initialize_database" do
-      ::ActiveSupport.on_load(:active_record) do
-        ::ActiveRecord::ConnectionAdapters::AbstractAdapter.descendants.each do |klass|
-          klass.prepend(ActiveRecord::AbstractAdapter::ForeignKeyCheck)
-        end
-
-        require 'switchman/active_record/table_definition'
-        ::ActiveRecord::ConnectionAdapters::TableDefinition.prepend(ActiveRecord::TableDefinition)
-
-        if defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-          require "switchman/active_record/postgresql_adapter"
-          ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(ActiveRecord::PostgreSQLAdapter)
-        end
-      end
-    end
-
-    initializer 'switchman.eager_load' do
-      ::ActiveSupport.on_load(:before_eager_load) do
-        # This needs to be loaded before Switchman::Shard, otherwise it won't autoload it correctly
-        require 'active_record/base'
-      end
-    end
-
-    initializer 'switchman.extend_shackles', :before => "switchman.extend_ar" do
-      ::ActiveSupport.on_load(:active_record) do
-        require "switchman/shackles"
-
-        ::Shackles.singleton_class.prepend(Shackles::ClassMethods)
-      end
-    end
-
-    initializer 'switchman.extend_controller', :after => "shackles.extend_ar" do
-      ::ActiveSupport.on_load(:action_controller) do
-        require "switchman/action_controller/caching"
-
-        ::ActionController::Base.include(ActionController::Caching)
-      end
-    end
-
-  end
-end

data/lib/switchman/shard_aware_statement_cache.rb

@@ -1,21 +0,0 @@
-module Switchman
-  class ShardAwareStatementCache
-
-    attr_accessor :__cache, :shard_category
-    private :__cache, :shard_category
-
-    def initialize(shard_category)
-      self.extend Mutex_m
-      self.__cache = {}
-      self.shard_category = shard_category
-    end
-
-    def [](key)
-      __cache[[key, Shard.current(shard_category).id]]
-    end
-
-    def []=(key, value)
-      __cache[[key, Shard.current(shard_category).id]] = value
-    end
-  end
-end