ar-octopus 0.8.1 → 0.8.2

data/spec/octopus/sharded_replicated_slave_grouped_spec.rb

@@ -0,0 +1,55 @@
+require "spec_helper"
+
+describe "when the database is both sharded and replicated" do
+
+  it "should pick the shard based on current_shard when you have a sharded model" do
+
+    OctopusHelper.using_environment :sharded_replicated_slave_grouped do
+      Octopus.using(:russia) do
+        Cat.create!(:name => "Thiago1")
+        Cat.create!(:name => "Thiago2")
+      end
+
+      # We must stub here to make it effective (not in the `before(:each)` block)
+      Octopus.stub(:env).and_return("sharded_replicated_slave_grouped")
+
+      Cat.using(:russia).count.should == 2
+      # It distributes queries between two slaves in the slave group
+      Cat.using(shard: :russia, slave_group: :slaves1).count.should == 0
+      Cat.using(shard: :russia, slave_group: :slaves1).count.should == 2
+      Cat.using(shard: :russia, slave_group: :slaves1).count.should == 0
+      # It distributes queries between two slaves in the slave group
+      Cat.using(shard: :russia, slave_group: :slaves2).count.should == 2
+      Cat.using(shard: :russia, slave_group: :slaves2).count.should == 0
+      Cat.using(shard: :russia, slave_group: :slaves2).count.should == 2
+
+      Cat.using(:europe).count.should == 0
+      Cat.using(shard: :europe, slave_group: :slaves1)
+        .count.should == 0
+      Cat.using(shard: :europe, slave_group: :slaves2)
+        .count.should == 2
+    end
+  end
+
+  it "should make queries to master when slave groups are configured for the shard but not selected" do
+    OctopusHelper.using_environment :sharded_replicated_slave_grouped do
+      Octopus.using(:europe) do
+        # All the queries go to :master(`octopus_shard_1`)
+
+        Cat.create!(:name => "Thiago1")
+        Cat.create!(:name => "Thiago2")
+
+        # In `database.yml` and `shards.yml`, we have configured 1 master and 6 slaves for `sharded_replicated_slave_grouped`
+        # So we can ensure Octopus is not distributing queries between them
+        # by asserting 1 + 6 = 7 queries go to :master(`octopus_shard_1`)
+        Cat.count.should == 2
+        Cat.count.should == 2
+        Cat.count.should == 2
+        Cat.count.should == 2
+        Cat.count.should == 2
+        Cat.count.should == 2
+        Cat.count.should == 2
+      end
+    end
+  end
+end

data/spec/support/octopus_helper.rb

@@ -21,6 +21,7 @@ module OctopusHelper
     Thread.current["octopus.current_model"] = nil
     Thread.current["octopus.current_shard"] = nil
     Thread.current["octopus.current_group"] = nil
+    Thread.current["octopus.current_slave_group"] = nil
     Thread.current["octopus.block"] = nil
     Thread.current["octopus.last_current_shard"] = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-octopus
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Thiago Pradi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -164,18 +164,27 @@ files:
 - init.rb
 - lib/ar-octopus.rb
 - lib/octopus.rb
+- lib/octopus/abstract_adapter.rb
 - lib/octopus/association.rb
-- lib/octopus/association_collection.rb
+- lib/octopus/association_shard_tracking.rb
+- lib/octopus/collection_association.rb
+- lib/octopus/collection_proxy.rb
 - lib/octopus/has_and_belongs_to_many_association.rb
+- lib/octopus/load_balancing.rb
+- lib/octopus/load_balancing/round_robin.rb
+- lib/octopus/log_subscriber.rb
 - lib/octopus/migration.rb
 - lib/octopus/model.rb
+- lib/octopus/persistence.rb
 - lib/octopus/proxy.rb
-- lib/octopus/rails3/abstract_adapter.rb
-- lib/octopus/rails3/log_subscriber.rb
-- lib/octopus/rails3/persistence.rb
-- lib/octopus/rails3/singular_association.rb
 - lib/octopus/railtie.rb
+- lib/octopus/relation_proxy.rb
 - lib/octopus/scope_proxy.rb
+- lib/octopus/shard_tracking.rb
+- lib/octopus/shard_tracking/attribute.rb
+- lib/octopus/shard_tracking/dynamic.rb
+- lib/octopus/singular_association.rb
+- lib/octopus/slave_group.rb
 - lib/octopus/version.rb
 - lib/tasks/octopus.rake
 - rails/init.rb
@@ -270,14 +279,18 @@ files:
 - spec/migrations/7_raise_exception_with_invalid_multiple_shard_names.rb
 - spec/migrations/8_raise_exception_with_invalid_group_name.rb
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
-- spec/octopus/association_spec.rb
+- spec/octopus/association_shard_tracking_spec.rb
+- spec/octopus/collection_proxy_spec.rb
 - spec/octopus/log_subscriber_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
+- spec/octopus/relation_proxy_spec.rb
+- spec/octopus/replicated_slave_grouped_spec.rb
 - spec/octopus/replication_spec.rb
 - spec/octopus/scope_proxy_spec.rb
+- spec/octopus/sharded_replicated_slave_grouped_spec.rb
 - spec/octopus/sharded_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record/connection_adapters/modify_config_adapter.rb
@@ -335,14 +348,18 @@ test_files:
 - spec/migrations/7_raise_exception_with_invalid_multiple_shard_names.rb
 - spec/migrations/8_raise_exception_with_invalid_group_name.rb
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
-- spec/octopus/association_spec.rb
+- spec/octopus/association_shard_tracking_spec.rb
+- spec/octopus/collection_proxy_spec.rb
 - spec/octopus/log_subscriber_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
+- spec/octopus/relation_proxy_spec.rb
+- spec/octopus/replicated_slave_grouped_spec.rb
 - spec/octopus/replication_spec.rb
 - spec/octopus/scope_proxy_spec.rb
+- spec/octopus/sharded_replicated_slave_grouped_spec.rb
 - spec/octopus/sharded_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record/connection_adapters/modify_config_adapter.rb

data/lib/octopus/association_collection.rb

@@ -1,49 +0,0 @@
-module Octopus::AssociationCollection
-
-  METHODS = %w[
-    reader
-    writer
-    ids_reader
-    ids_writer
-    create
-    create!
-    build
-    any?
-    count
-    empty?
-    first
-    include?
-    last
-    length
-    load_target
-    many?
-    size
-    select
-    uniq
-  ]
-
-  def self.included(base)
-    base.instance_eval do
-      METHODS.each do |m|
-        alias_method_chain m.to_sym, :octopus
-      end
-    end
-  end
-
-  METHODS.each do |m|
-    m =~ /([^!?]+)([!?])?/
-    method, punctuation = [ $1, $2 ]
-    with = :"#{method}_with_octopus#{punctuation}"
-    without = :"#{method}_without_octopus#{punctuation}"
-    define_method with do |*args, &block|
-      @owner.run_on_shard { send(without, *args, &block) }
-    end
-  end
-
-  def should_wrap_the_connection?
-    @owner.respond_to?(:current_shard) && @owner.current_shard != nil
-  end
-
-end
-
-ActiveRecord::Associations::CollectionAssociation.send(:include, Octopus::AssociationCollection)

data/lib/octopus/rails3/singular_association.rb

@@ -1,34 +0,0 @@
-module Octopus::SingularAssociation
-  def self.included(base)
-    base.instance_eval do
-      alias_method_chain :reader, :octopus
-      alias_method_chain :writer, :octopus
-      alias_method_chain :create, :octopus
-      alias_method_chain :create!, :octopus
-      alias_method_chain :build, :octopus
-    end
-  end
-
-  def reader_with_octopus(*args)
-    owner.run_on_shard { reader_without_octopus(*args) }
-  end
-
-  def writer_with_octopus(*args)
-    owner.run_on_shard { writer_without_octopus(*args) }
-  end
-
-  def create_with_octopus(*args)
-    owner.run_on_shard { create_without_octopus(*args) }
-  end
-
-  def create_with_octopus!(*args)
-    owner.run_on_shard { create_without_octopus!(*args) }
-  end
-
-  def build_with_octopus(*args)
-    owner.run_on_shard { build_without_octopus(*args) }
-  end
-
-end
-
-ActiveRecord::Associations::SingularAssociation.send(:include, Octopus::SingularAssociation)