xbar 0.4.1 → 0.4.2

data/lib/xbar/model.rb

@@ -49,16 +49,11 @@ module XBar::Model
     if new_record? || connection_proxy.in_block_scope?
       if XBar.debug
         type = new_record? ? "New" : "Existing"
-        puts "#{type} model callback, current_shard=#{connection_proxy.current_shard}, " +
-          "block_scope=#{connection_proxy.in_block_scope?}"
       end
       self.current_shard = connection_proxy.current_shard
     else
       if XBar.debug
         type = new_record? ? "New" : "Existing"
-        puts "#{type} model callback, current_shard=#{connection_proxy.current_shard} " +
-          "last_current_shard=#{connection_proxy.last_current_shard}, " +
-          "block_scope=#{connection_proxy.in_block_scope?}"
       end
       self.current_shard = connection_proxy.last_current_shard
     end
@@ -78,7 +73,6 @@ module XBar::Model
     end
 
     def connection_proxy
-      puts "Model allocating new connection proxy"  unless Thread.current[:connection_proxy]
       Thread.current[:connection_proxy] ||= XBar::Proxy.new
     end
 
@@ -86,10 +80,7 @@ module XBar::Model
       if should_use_normal_connection?
         connection_without_xbar
       else
-        #puts "Model connection with octopus" if XBar.debug
-        #if (connection_proxy.current_model.nil?) || (self !=  ActiveRecord::Base)
-          connection_proxy.current_model = self  
-        #end
+        connection_proxy.current_model = self  
         connection_proxy
       end
     end

data/lib/xbar/proxy.rb

@@ -17,27 +17,30 @@ class XBar::Proxy
   # Setters for these are written by hand below.
   attr_reader :current_model, :current_shard
   
-  attr_reader :shard_list
+  attr_reader :shard_list, :adapters
 
   attr_accessor :slave_read_allowed
  
   def initialize
-    puts "Initializing new proxy."
+    if XBar.debug
+      puts "Proxy##{ BLUE_TEXT}{initialize}#{RESET_COLORS}: Initializing new proxy."
+    end
+    @reset = false
+    @pause = false
     register
     reset_shards
     clean_proxy
+    @adapters = XBar::Mapper.adapters
+    @mylock = Mutex.new
+    @pause_lock = Mutex.new
+    @pause_cv = ConditionVariable.new
+    @paused = false
   end
-  
-  def reset_proxy
-    @current_shard = :master
-    puts ">>> reset_proxy: #{current_shard}" if XBar.debug
-    clear_block_scope
-    reset_shards
-  end
-  
+
+  # Called from migration.
   def clean_proxy
     if XBar.debug
-      puts "Proxy##{BLUE_TEXT}clean_proxy=#{RESET_COLORS}: " +
+      puts "Proxy##{BLUE_TEXT}clean_proxy:#{RESET_COLORS}: " +
         "current shard = #{@current_shard}"
     end
     @current_shard = :master
@@ -45,12 +48,11 @@ class XBar::Proxy
   end
    
   def current_shard=(shard_name)
-    # shard name might actually be a list of shard names in the 
-    # case of migration.  Make it an array in all cases to check it.
+    check_for_reset
+    # The shard hard name might actually be a list of shard names in
+    # the case of migration.  Make it an array in all cases to check it.
     Array(shard_name).each do |s|
       if !@shard_list.member? s
-        puts "<<< #{@shard_list.keys} >>>"
-        puts "<<< #{XBar::Mapper.shards.keys} >>>"
         raise "Nonexistent Shard Name: #{s}"
       end
     end
@@ -61,21 +63,6 @@ class XBar::Proxy
     @current_shard = shard_name
   end
 
-  def select_shard
-    if current_shard.kind_of? Array
-      shard = current_shard.first
-      if current_shard.size != 1
-        puts "WARNING: selecting only first shard from array"
-      end
-    else
-      shard = current_shard
-    end
-    unless @shard_list[shard] 
-       puts "Shard not found: current_shard = #{shard}, @shard_list = #{@shard_list.keys}"     
-    end
-    @shard_list[shard]
-  end
-
   def current_model=(model)
     # The way that this function is used internally, kind_of?(ActiveRecord::Base)
     # is always false -- we're always passing the class.cur
@@ -104,7 +91,7 @@ class XBar::Proxy
   end
   
   def should_clean_table_name?
-    adapters.size > 1
+    @adapters.size > 1
   end
   
   def verify_connection
@@ -112,6 +99,8 @@ class XBar::Proxy
   end
 
   def run_queries_on_shard(shard_name, use_scope = true)
+    check_for_reset
+    check_for_pause
     older_shard = current_shard 
     enter_block_scope if use_scope
     self.current_shard = shard_name
@@ -142,6 +131,8 @@ class XBar::Proxy
   end
 
   def transaction(options = {}, &block)
+    check_for_reset
+    check_for_pause
     select_shard.transaction(options, &block)
   end
 
@@ -153,6 +144,11 @@ class XBar::Proxy
     select_shard.quote_table_name(table_name)
   end
 
+  def clear_cache!
+    check_for_reset    
+    select_shard.run_queries(:clear_cache!)
+  end
+  
   def method_missing(method, *args, &block)
     if XBar.debug
       puts("\nProxy##{BLUE_TEXT}method_missing#{RESET_COLORS}: " + 
@@ -160,7 +156,6 @@ class XBar::Proxy
         "current_shard=#{current_shard}, " +
         "in_block_scope=#{in_block_scope?}")
     end
-
     if method.to_s =~ /insert|select|execute/ && !in_block_scope? # should clean connection
       shard = @last_current_shard = current_shard
       clean_proxy
@@ -175,7 +170,9 @@ class XBar::Proxy
   end
 
   def connection_pool
-    cp = shards[current_shard].first 
+    # Or we could make a case for selecting master replica from
+    # the master shard, rather than the current shard. XXX.
+    cp = select_shard.master
     cp.automatic_reconnect = true if XBar.rails31?
     cp
   end
@@ -220,6 +217,61 @@ class XBar::Proxy
     end
   end
 
+  def request_pause
+    @pause_lock.synchronize do
+      @pause = true
+    end
+  end
+
+  def paused?
+    @pause
+  end
+
+  def check_for_pause
+    if @pause && (open_transactions == 0)
+      @pause_lock.synchronize do
+        @pause = true
+        @pause_cv.wait(@pause_lock)
+        @pause = false
+      end
+   end
+  end
+
+  def unpause
+    @pause_cv.signal
+  end
+
+  def request_reset(opts = {})
+    @mylock.synchronize do
+      @reset = true
+      if opts[:hard_reset]
+        @hard_reset = true
+      end
+    end
+  end
+
+  def reset_complete?
+    @mylock.synchronize do
+      @reset == false
+    end
+  end
+
+  def do_reset
+    reset_shards
+    @adapters = adapters
+    @mylock.synchronize do
+      @reset = false
+      clean_proxy if @hard_reset
+      @hard_reset = false
+    end
+  end
+
+  def check_for_reset
+    if @reset && (open_transactions == 0)
+      do_reset
+    end
+  end
+
   private
   
   def reset_shards
@@ -234,7 +286,26 @@ class XBar::Proxy
       slaves = replicas[1..-1] # cdr, could be empty array
       @shard_list[shard_name] = XBar::Shard.new(self, shard_name, master, slaves)
     end
+  end
+
+  def open_transactions
+    # The shards as known to the mapper have already changed.
+    @shard_list.values.inject(0) {|sum, shard| sum = shard.open_transactions}
+  end
 
+  def select_shard
+    if current_shard.kind_of? Array
+      shard = current_shard.first
+      if current_shard.size != 1
+        puts "WARNING: selecting only first shard from array"
+      end
+    else
+      shard = current_shard
+    end
+    unless @shard_list[shard] 
+       puts "Shard not found: current_shard = #{shard}, @shard_list = #{@shard_list.keys}"     
+    end
+    @shard_list[shard]
   end
 
   def insert_some_sql(conn, data)

data/lib/xbar/shard.rb

@@ -58,6 +58,22 @@ module XBar
       master.connection.quote_table_name(table_name)
     end
         
+    def open_transactions
+      tr_count = 0
+      @master.connections.inject(0) {|s, c| s + c.open_transactions}
+      @master.connections.each do |c|
+        val = c.instance_variable_get(:@_current_transaction_records) # nil or array
+        tr_count += val.size if val
+      end
+      @slaves.each do |s|
+        s.connections.each do |c|
+          val = c.instance_variable_get(:@_current_transaction_records) # nil or array
+          tr_count += val.size if val
+        end
+      end
+      tr_count
+    end
+
     private
 
     def prepare_connection_pool(pool)
@@ -96,6 +112,6 @@ module XBar
       end
       run_queries_on_replica(replica, method, *args, &block) # return sql
     end
-    
+
   end
 end

data/lib/xbar/version.rb

@@ -1,3 +1,3 @@
 module XBar
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/run

@@ -1,7 +1,5 @@
 #!/bin/bash
-#RUBY=/usr/local/rvm/rubies/ruby-1.9.3-p0/bin/ruby
-RDEBUG=/usr/local/rvm/gems/ruby-1.9.3-p0@edge/bin/rdebug
-RSPEC=/usr/local/rvm/gems/ruby-1.9.3-p0@edge/bin/rspec
+
 SPEC_DIR="spec/xbar"
 
 export BUNDLE_GEMFILE=/Volumes/Opt/projects/xbar/gemfiles/rails32.gemfile
@@ -11,9 +9,14 @@ LINE=$2
 
 if [ -n "$SPEC"  ]
 then
-  TEST="$SPEC_DIR/${SPEC}_spec.rb"
+    if [ "$SPEC" = "all" ]
+    then
+	TEST="all"
+    else
+      TEST="$SPEC_DIR/${SPEC}_spec.rb"
+    fi
 else
-  echo "run.sh spec [line]"
+  echo "run.sh spec [line] | all"
   exit 1
 fi
 
@@ -22,6 +25,11 @@ then
   TEST="${TEST}:${LINE}"
 fi
 
-echo $TEST
+if [ "$SPEC" == "all" ]
+then
+    bundle exec ruby -S rspec -fd -b -c ./spec/xbar/*_spec.rb
+else
+    bundle exec ruby -S rspec -fd -b -c ${TEST}
+fi
+
 
-bundle exec ${RUBY} ${RSPEC} -fd -b -c ${TEST}

data/spec/console.rb

@@ -4,7 +4,6 @@
 
 require 'rspec'
 require 'spec_helper'
-require 'support/database_models'
 
 module XBar
   def self.directory

data/spec/spec_helper.rb

@@ -5,15 +5,18 @@ require "active_record"
 require "action_controller"
 require "xbar"
 require "support/xbar_helper"
-require "support/database_models"
 
 MIGRATIONS_ROOT = File.expand_path(File.join(File.dirname(__FILE__),  'migrations'))
 
-XBar.directory = File.expand_path("../../spec", __FILE__)
+XBar.directory = File.expand_path(File.dirname(__FILE__))
+
+# Must be after setting the XBar directory.
+require "support/database_models"
 
 RSpec.configure do |config|
   
   config.before(:each) do
+    # XBar.directory = File.expand_path(File.dirname(__FILE__))
     XBar.stub!(:directory).and_return(File.dirname(__FILE__))
   end
   

data/spec/xbar/association_spec.rb

@@ -337,6 +337,7 @@ describe XBar::Association do
         role = @new_brazil_programmer.projects.create(:name => "New VB App :-/")
         @new_brazil_programmer.projects.find(:first).should == role
         @new_brazil_programmer.projects.destroy_all
+        sleep(0.5) # Replication delay sometimes causes a spurious failure
         @new_brazil_programmer.projects.find(:first).should be_nil
       end
 

data/spec/xbar/mapper_spec.rb

@@ -16,7 +16,7 @@ describe XBar::Mapper do
     end
 
      it "should return all environments" do
-      XBar::Mapper.environments.should == ["test", "development", "staging"]
+      XBar::Mapper.environments.should == ["test", "development", "staging", "local_test"]
     end
 
     it "should work with thinking sphinx" do
@@ -259,16 +259,14 @@ describe XBar::Mapper do
       end
       
     end
-    
-
   end
-  
 end
 
 describe "when you specify a bogus application environment" do
   before(:each) do
     set_xbar_env("acme", "bogus")
     @proxy = Thread.current[:connection_proxy]
+    @proxy.check_for_reset
   end
 
   it "should initialize the list of shards" do

data/spec/xbar/model_spec.rb

@@ -79,14 +79,12 @@ describe XBar::Model do
     end
 
     it "should allow creating more than one user" do
-      XBar.debug = true
       User.using(:canada).create([{ :name => 'America User 1' }, { :name => 'America User 2' }])
       User.create!(:name => "Thiago")
       User.using(:canada).find_by_name("America User 1").should_not be_nil
       User.using(:canada).find_by_name("America User 2")#.should_not be_nil
       User.using(:master).find_by_name("Thiago").should_not be_nil
       User.all.size.should == 1 # fail -- America User 2 is being created on master!!!
-      XBar.debug = false
     end
 
     it "should work when you have a SQLite3 shard" do
@@ -340,7 +338,7 @@ describe XBar::Model do
   describe "when using a environment with a single adapter" do
     before (:each) do
       set_xbar_env('single_adapter', 'test')
-      @proxy = XBar::Proxy.new
+      @proxy = Thread.current[:connection_proxy] || XBar::Proxy.new
     end
        
     it 'should_clean_table_name? should return false' do
@@ -361,8 +359,9 @@ describe XBar::Model do
   end
 
   describe "when you have joins/include" do
-   
+
     before(:each) do
+      set_xbar_env('default', 'test')
       
       @client1 = Client.using(:brazil).create(:name => "Thiago")
 
@@ -381,7 +380,8 @@ describe XBar::Model do
     end
 
     it "should work with the rails 2.x syntax" do
-      items = Item.using(:canada).find(:all, :joins => :client, :conditions => { :clients => { :id => @client2.id } })
+      items = Item.using(:canada).find(:all, :joins => :client,
+        :conditions => { :clients => { :id => @client2.id } })
       items.should == [@item1, @item2]
     end
 
@@ -393,7 +393,8 @@ describe XBar::Model do
     end
 
     it "should work for include also, rails 2.x syntax" do
-      items = Item.using(:canada).find(:all, :include => :client, :conditions => { :clients => { :id => @client2.id } })
+      items = Item.using(:canada).find(:all, :include => :client,
+        :conditions => { :clients => { :id => @client2.id } })
       items.should == [@item1, @item2]
     end
 
@@ -405,13 +406,15 @@ describe XBar::Model do
     end
 
     it "should work for multiple includes, with rails 2.x syntax" do
-      parts = Part.using(:canada).find(:all, :include => {:item => :client}, :conditions => {:clients => { :id => @client2.id}})
+      parts = Part.using(:canada).find(:all, :include => {:item => :client},
+        :conditions => {:clients => { :id => @client2.id}})
       parts.should == [@part1, @part2, @part3]
       parts.first.item.client.should == @client2
     end
 
     it "should work for multiple join, with rails 2.x syntax" do
-      parts = Part.using(:canada).find(:all, :joins => {:item => :client}, :conditions => {:clients => { :id => @client2.id}})
+      parts = Part.using(:canada).find(:all, :joins => {:item => :client},
+        :conditions => {:clients => { :id => @client2.id}})
       parts.should == [@part1, @part2, @part3]
       parts.first.item.client.should == @client2
     end