「MMG」tiepadrino 内容監視用

lib/active_record/turntable.rb

@@ -36,13 +36,16 @@ module ActiveRecord::Turntable
     include Base
   end
 
+  RackupFramework = Rails   if defined?(Rails);
+  RackupFramework = Padrino if defined?(Padrino);
+
   module ClassMethods
     DEFAULT_PATH = File.dirname(File.dirname(__FILE__))
 
     def turntable_config_file
       @@turntable_config_file ||=
-        File.join(defined?(::Rails) ?
-                   ::Rails.root.to_s : DEFAULT_PATH, 'config/turntable.yml')
+        File.join(defined?(ActiveRecord::Turntable::RackupFramework) ?
+                  ActiveRecord::Turntable::RackupFramework.root.to_s : DEFAULT_PATH, 'config/turntable.yml')
     end
 
     def turntable_config_file=(filename)
@@ -55,4 +58,5 @@ def turntable_config
   end
 
   require "active_record/turntable/railtie" if defined?(Rails)
+  require "active_record/turntable/padrinotie" if defined?(Padrino)
 end

lib/active_record/turntable/active_record_ext.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module ActiveRecord::Turntable
   module ActiveRecordExt
     extend ActiveSupport::Concern

lib/active_record/turntable/active_record_ext/abstract_adapter.rb

@@ -36,6 +36,9 @@ def log(sql, name = "SQL", binds = [])
             raise exception
           end
         end
+
+        alias_method_chain :log, :newrelic_instrumentation if method_defined?(:log_with_newrelic_instrumentation)
+
       end
 
       def turntable_shard_name=(name)

lib/active_record/turntable/active_record_ext/log_subscriber.rb

@@ -35,7 +35,15 @@ def sql(event)
             return if 'SCHEMA' == payload[:name]
 
             name    = '%s (%.1fms)' % [payload[:name], event.duration]
-            shard = '[Shard: %s]' % (event.payload[:turntable_shard_name] ? event.payload[:turntable_shard_name] : nil)
+
+            connection = if event.payload[:turntable_shard_name]
+                           '[Shard: %s]' % event.payload[:turntable_shard_name]
+                         elsif event.payload[:connection_name]
+                           '[%s]' % event.payload[:connection_name]
+                         else
+                           '[unknown]'
+                         end
+
             sql     = payload[:sql].squeeze(' ')
             binds   = nil
 
@@ -47,18 +55,17 @@ def sql(event)
 
             if odd?
               name = color(name, ActiveRecord::LogSubscriber::CYAN, true)
-              shard = color(shard, ActiveRecord::LogSubscriber::CYAN, true)
+              connection = color(connection, ActiveRecord::LogSubscriber::CYAN, true)
               sql  = color(sql, nil, true)
             else
               name = color(name, ActiveRecord::LogSubscriber::MAGENTA, true)
-              shard = color(shard, ActiveRecord::LogSubscriber::MAGENTA, true)
+              connection = color(connection, ActiveRecord::LogSubscriber::MAGENTA, true)
             end
 
-            debug "  #{name} #{shard} #{sql}#{binds}"
+            debug "  #{name} #{connection} #{sql}#{binds}"
           end
         end
       end
     end
   end
 end
-

lib/active_record/turntable/algorithm.rb

@@ -3,5 +3,6 @@ module Algorithm
     autoload :Base, "active_record/turntable/algorithm/base"
     autoload :RangeAlgorithm, "active_record/turntable/algorithm/range_algorithm"
     autoload :RangeBsearchAlgorithm, "active_record/turntable/algorithm/range_bsearch_algorithm"
+    autoload :ModuloAlgorithm, "active_record/turntable/algorithm/modulo_algorithm"
   end
 end

lib/active_record/turntable/algorithm/modulo_algorithm.rb

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+module ActiveRecord::Turntable::Algorithm
+  class ModuloAlgorithm < Base
+    def initialize(config)
+      @config = config
+    end
+
+    def calculate(key)
+      @config["shards"][key % @config["shards"].size]["connection"]
+    rescue
+      raise ActiveRecord::Turntable::CannotSpecifyShardError, "cannot specify shard for key:#{key}"
+    end
+  end
+end

lib/active_record/turntable/base.rb

@@ -50,7 +50,7 @@ def recursive_transaction(pools, options, &block)
       end
 
       def force_connect_all_shards!
-        conf = configurations[Rails.env]
+        conf = configurations[ActiveRecord::Turntable::RackupFramework.env]
         shards = conf["shards"]
         shards = shards.merge(conf["seq"]) if conf["seq"]
         shards.each do |name, config|

lib/active_record/turntable/config.rb

@@ -13,7 +13,7 @@ def [](key)
       @config[key]
     end
 
-    def self.load!(config_file, env = (defined?(Rails) ? Rails.env : 'development'))
+    def self.load!(config_file, env = (defined?(ActiveRecord::Turntable::RackupFramework) ? ActiveRecord::Turntable::RackupFramework.env : 'development')) # FIXME
       instance.load!(config_file, env)
     end
 

lib/active_record/turntable/migration.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module ActiveRecord::Turntable::Migration
   extend ActiveSupport::Concern
 
@@ -14,6 +15,7 @@ def announce_with_turntable(message)
     end
     base.class_eval do
       class_inheritable_accessor :target_shards
+      class_inheritable_accessor :target_seqs
     end
     ::ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, SchemaStatementsExt)
   end
@@ -22,6 +24,7 @@ def announce_with_turntable(message)
   included do
     extend ShardDefinition
     class_attribute :target_shards
+    class_attribute :target_seqs
     def announce_with_turntable(message)
       announce_without_turntable("#{message} - #{get_current_shard}")
     end
@@ -36,18 +39,17 @@ def announce_with_turntable(message)
   module ShardDefinition
     def clusters(*cluster_names)
       config = ActiveRecord::Base.turntable_config
-      (self.target_shards ||= []) <<
-        if cluster_names.first == :all
-          config['clusters'].map do |name, cluster_conf|
-            cluster_conf["shards"].map {|shard| shard["connection"]}
-          end
-        else
-          cluster_names.map do |cluster_name|
-            config['clusters'][cluster_name]["shards"].map do |shard|
-              shard["connection"]
-            end
-          end
+      if cluster_names.first == :all
+        config['clusters'].map do |name, cluster_conf|
+          (self.target_shards ||= []) << cluster_conf["shards"].map { |shard| shard["connection"] }
+          (self.target_seqs ||= []) << cluster_conf["seq"]["connection"]
         end
+      else
+        cluster_names.map do |cluster_name|
+          (self.target_shards ||= []) << config['clusters'][cluster_name]["shards"].map { |shard| shard["connection"] }
+          (self.target_seqs ||= []) << config['clusters'][cluster_name]["seq"]["connection"]
+        end
+      end
     end
 
     def shards(*connection_names)
@@ -62,19 +64,23 @@ def get_current_shard
   def migrate_with_turntable(direction)
     config = ActiveRecord::Base.configurations
     @@current_shard = nil
-    shards = (self.class.target_shards||=[]).flatten.uniq.compact
-    if self.class.target_shards.blank?
+    if self.class.target_shards.blank? || self.class.target_seqs.blank?
       return migrate_without_turntable(direction)
     end
 
+    shards = (self.class.target_shards||=[]).flatten.uniq.compact
     shards_conf = shards.map do |shard|
-      config[Rails.env||"development"]["shards"][shard]
+      config[ActiveRecord::Turntable::RackupFramework.env||"development"]["shards"][shard]
     end
-    seqs = config[Rails.env||"development"]["seq"]
-    shards_conf += seqs.values
-    shards_conf << config[Rails.env||"development"]
+
+    seqs = (self.class.target_seqs||=[]).flatten.uniq.compact
+    seqs_conf = config[ActiveRecord::Turntable::RackupFramework.env||"development"]["seq"].select { |key, val| seqs.include?(key) }
+    shards_conf += seqs_conf.values
+
+    # SHOW FULL FIELDS FROM `users` を実行してテーブルの情報を取得するためにデフォルトのデータベースも追加する
+    shards_conf << config[ActiveRecord::Turntable::RackupFramework.env||"development"]
     shards_conf.each_with_index do |conf, idx|
-      @@current_shard = (shards[idx] || seqs.keys[idx - shards.size] || "master")
+      @@current_shard = (shards[idx] || seqs_conf.keys[idx - shards.size] || "master")
       ActiveRecord::Base.establish_connection(conf)
       if !ActiveRecord::Base.connection.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name())
         ActiveRecord::Base.connection.initialize_schema_migrations_table
@@ -85,11 +91,14 @@ def migrate_with_turntable(direction)
 
   module SchemaStatementsExt
     def create_sequence_for(table_name, options = { })
+      options = options.merge(:id => false)
+
       # TODO: pkname should be pulled from table definitions
       pkname = "id"
       sequence_table_name = ActiveRecord::Turntable::Sequencer.sequence_name(table_name, "id")
-      create_table(sequence_table_name, options)
-      execute "ALTER TABLE #{quote_table_name(sequence_table_name)} MODIFY id bigint(20) DEFAULT NULL auto_increment NOT NULL;"
+      create_table(sequence_table_name, options) do |t|
+        t.integer :id, :limit => 8
+      end
       execute "INSERT INTO #{quote_table_name(sequence_table_name)} (`id`) VALUES (0)"
     end
 

lib/active_record/turntable/mixer.rb

@@ -43,7 +43,7 @@ def build_fader(method_name, query, *args, &block)
                            method, query, *args, &block)
       end
     rescue Exception => err
-      logger.warn { "[ActiveRecord::Turntable][BUG] Error on Building Fader: #{binded_query}, on_method: #{method_name}" }
+      logger.warn { "[ActiveRecord::Turntable][BUG] Error on Building Fader: #{binded_query}, on_method: #{method_name}, err: #{err}" }
       raise err
     end
 
@@ -139,8 +139,8 @@ def build_select_fader(tree, method, query, *args, &block)
         return Fader::SpecifiedShard.new(@proxy,
                                          { @proxy.cluster.select_shard(shard_keys.first) => query },
                                          method, query, *args, &block)
-      elsif tree.group_by or tree.order_by or tree.limit.try(:value).to_i > 1
-        raise CannotSpecifyShardError, "cannot specify shard for query: #{binded_query}"
+      elsif @proxy.current_shard.blank? and (tree.group_by or tree.order_by or tree.limit.try(:value).to_i > 1)
+        raise CannotSpecifyShardError, "cannot specify shard for query: #{query.to_sql}"
       elsif shard_keys.present?
         if SQLTree::Node::SelectDeclaration === tree.select.first and
             SQLTree::Node::CountAggregrate === tree.select.first.expression
@@ -168,7 +168,7 @@ def build_select_fader(tree, method, query, *args, &block)
                                                     method, query, *args, &block
                                                     )
         else
-          raise CannotSpecifyShardError, "cannot specify shard for query: #{binded_query}"
+          raise CannotSpecifyShardError, "cannot specify shard for query: #{query.to_sql}"
         end
       end
     end

lib/active_record/turntable/padrinotie.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+module ActiveRecord::Turntable
+  class Padrinotie
+    Padrino::Tasks.files << File.dirname(__FILE__) + "/padrinoties/databases.rb"
+
+    # padrino loading hook
+    Padrino.before_load do
+      ActiveRecord::Base.send(:include, ActiveRecord::Turntable)
+
+      require 'generators/padrino/turntable/install_generators'
+    end
+    # # Swap QueryCache Middleware
+    # initializer "turntable.swap_query_cache_middleware" do |app|
+    #   app.middleware.swap ActiveRecord::QueryCache, ActiveRecord::Turntable::Rack::QueryCache
+    # end
+  end
+end