methodmissing-mysqlplus_adapter 1.0.2 → 1.0.3

data/README.textile

@@ -14,6 +14,8 @@ Grab mysqlplus  ....
 
 ... then update config/database.yml
 
+<pre>
+<code>
   production:
     adapter:  mysqlplus
     database: myapp_production
@@ -21,6 +23,8 @@ Grab mysqlplus  ....
     password:  
     host: localhost
     pool: 10
+</code>
+</pre>
 
 h2. Why Bother ?
 
@@ -30,7 +34,11 @@ The ever popular "mysql ruby":http://www.tmtm.org/en/mysql/ruby/ do *not* schedu
 
 Rails since release 2.2 support connection pooling and Thread safety ( at the framework level mind you, plugins, gems and user code aside ) through :
 
+<pre>
+<code>
   config.threadsafe!
+</code>
+</pre>
 
 This configuration hook removes the global Dispatcher lock and yields one connection from the pool per request / response cycle. 
 
@@ -40,6 +48,8 @@ h2. Configuration Options
 
 An additional connection specification element, *warmup* is available that attempts to establish the pooled connections in advance.This may be useful for high traffic environments where it makes sense to setup connections when bouncing the App and not let initial incoming requests be hogged with Mysql connection overheads.
 
+<pre>
+<code>
   production:
     adapter:  mysqlplus
     database: myapp_production
@@ -48,22 +58,34 @@ An additional connection specification element, *warmup* is available that attem
     host: localhost
     pool: 10  
     warmup: true
+</code>
+</pre>
 
 h3. Deferrable Results
 
 Deferred results simulate lazy loading in a background Thread, through another Mysql connection, other than the one the current Thread has acquired.This type of workflow assumes a decent Connection Pool size of 5 to 10 connections.
 
+<pre>
+<code>
   # Immediate yield control back to the current Thread as the query is pushed to the background.
   # Yields an instance of ActiveRecord::Deferrable::Result
   #
   Post.find( :first, :defer => true )
+</code>
+</pre>
 
 A deferred result blocks when any method's invoked on the result set right away.
 
+<pre>
+<code>
   Post.find( :first, :defer => true ).title
+</code>
+</pre>
 
 This concept is quite useful in an MVC context, allowing the controller to fetch results, defer fetching them to the background and reference them in the view, allowing an undefined period / time slice during which rendering, template setup etc. may occur. 
 
+<pre>
+<code>
   class PostsController
    
     def index
@@ -73,17 +95,37 @@ This concept is quite useful in an MVC context, allowing the controller to fetch
     end
 
   end
+</code>
+</pre>
 
 Since ActiveRecord 2.1 preloading favors multiple efficient queries to cumbersome and mostly slow JOINs.Those secondary queries can easily be pushed down different connections.
 
+<pre>
+<code>
   # Use 3 connections from the pool : 1 x Post, 1 x Comment and 1 x Vote 
   #
   Post.find(:all, :limit => 10, :include => [:comments, :votes], :defer => true )
+</code>
+</pre>
 
 h2. Garbage Collection
 
 There's some experimental GC patches "available":http://github.com/oldmoe/mysqlplus/tree/with_async_validation - the mysql ruby gem forces GC every 20 queries, that's a guaranteed GC cycle every 5th request for a request with a 4 query overhead.This adapter will automatically detect the presence of those patches and disable the forced GC runs.
 
+<pre>
+<code>
+methodmissing:mysqlplus lourens$ ruby test/gc_benchmark.rb
+Rehearsal ----------------------------------------------
+With GC      0.440000   0.020000   0.460000 (  0.741424)
+Without GC   0.040000   0.030000   0.070000 (  0.327787)
+------------------------------------- total: 0.530000sec
+
+                 user     system      total        real
+With GC      0.430000   0.030000   0.460000 (  0.725934)
+Without GC   0.040000   0.010000   0.050000 (  0.311233)
+</code>
+</pre>
+
 h2. Stability
 
 In (pre)-production use at a handful of sites and the test suite is designed to run against the existing ActiveRecord suite.
@@ -92,6 +134,4 @@ h2. TODO
 
 * Experiment with turning off query_with_result for certain queries.
 
-* Deferred inserts / updates - *dangerous* INSERT DELAYED for Innodb
-
-* 1.9 compatibility testing
+* Deferred inserts / updates - *dangerous* INSERT DELAYED for Innodb

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
+:patch: 3
 :major: 1
 :minor: 0

data/lib/active_record/connection_adapters/mysqlplus_adapter/deferrable/macro.rb

@@ -7,6 +7,7 @@ module ActiveRecord
         def install!
           ActiveRecord::Base.send :extend, SingletonMethods      
           ar_eigenclass::VALID_FIND_OPTIONS << :defer
+          ActiveRecord::Calculations::CALCULATIONS_OPTIONS << :defer
           alias_deferred :find, :find_by_sql, :preload_associations, :find_every
         end
 

data/lib/active_record/connection_adapters/mysqlplus_adapter/deferrable/result.rb

@@ -19,7 +19,7 @@ module ActiveRecord
           begin
             deferrable.call 
           rescue => exception
-            exception  
+            exception 
           ensure
             ::ActiveRecord::Base.connection_pool.release_connection            
           end

data/test/connection_pool_test.rb

@@ -0,0 +1,20 @@
+require "#{File.dirname(__FILE__)}/helper"
+
+Mysqlplus::Test.prepare!
+
+class ConnectionPoolTest < ActiveSupport::TestCase
+  
+  def teardown
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection( Mysqlplus::Test::CONNECTION_SPEC )
+    super
+  end  
+  
+  test "should not establish connections in a lazy manner when warmed up" do
+    ActiveRecord::Base.connection_pool.expects(:checkout_new_connection).never
+    5.times do
+      ActiveRecord::Base.connection_pool.checkout
+    end
+  end
+  
+end  

data/test/deferrable/macro_test.rb

@@ -10,18 +10,18 @@ class MacroTest < ActiveSupport::TestCase
     super
   end
 
-  def test_should_be_able_to_find_records_in_a_background_thread
+  test "should be able to find records in a background thread" do
     ActiveRecord::Base.connection_pool.expects(:release_connection).twice 
     assert_equal MysqlUser.find(:first, :defer => true), MysqlUser.find(:first) 
     assert_instance_of MysqlUser, MysqlUser.find(:first, :defer => true)
   end
 
-  def test_should_be_able_to_find_records_by_sql_background_thread
+  test "should be able to find records by sql background thread" do
     ActiveRecord::Base.connection_pool.expects(:release_connection).once    
     assert_equal MysqlUser.find_by_sql("SELECT * FROM mysql.user WHERE User = 'root'", true), MysqlUser.find(:all, :conditions => ['user.User = ?', 'root'])
   end
 
-  def test_should_be_able_to_preload_related_records_on_multiple_connections
+  test "should be able to preload related records on multiple connections" do
     ActiveRecord::Base.connection_pool.expects(:release_connection).twice
     assert_instance_of MysqlUser, MysqlUser.find( :first, :defer => true, :include => :mysql_user_info)
     sleep(0.5)
@@ -29,4 +29,4 @@ class MacroTest < ActiveSupport::TestCase
     
 end
 
-Thread.list.each{|t| t.join unless t == Thread.main }
+Thread.list.each{|t| t.join unless t == Thread.main }

data/test/deferrable/result_test.rb

@@ -0,0 +1,35 @@
+require "#{File.dirname(__FILE__)}/../helper"
+
+Mysqlplus::Test.prepare!
+
+class ResultTest < ActiveSupport::TestCase
+  
+  def teardown
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection( Mysqlplus::Test::CONNECTION_SPEC )
+    super
+  end
+  
+  test "should be able to raise exceptions from the background Thread" do
+    assert_raises( StandardError ) do
+      ActiveRecord::Deferrable::Result.new do
+        raise StandardError
+      end.to_s
+    end  
+  end 
+  
+  test "should release the checked out connection for the background Thread at all times" do
+    ActiveRecord::Base.connection_pool.expects(:release_connection).once
+    ActiveRecord::Deferrable::Result.new do
+      raise StandardError
+    end
+  end
+  
+  test "should only block when an immediate result is required" do
+    ActiveRecord::Deferrable::Result.any_instance.expects(:validate!).never
+    ActiveRecord::Deferrable::Result.new do
+      sleep(5)
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: methodmissing-mysqlplus_adapter
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - "Lourens Naud\xC3\xA9"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-09 00:00:00 -08:00
+date: 2009-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -32,11 +32,13 @@ files:
 - lib/active_record/connection_adapters/mysqlplus_adapter/deferrable/macro.rb
 - lib/active_record/connection_adapters/mysqlplus_adapter/deferrable/result.rb
 - lib/active_record/connection_adapters/mysqlplus_adapter.rb
+- test/connection_pool_test.rb
 - test/connections
 - test/connections/mysqlplus
 - test/connections/mysqlplus/connection.rb
 - test/deferrable
 - test/deferrable/macro_test.rb
+- test/deferrable/result_test.rb
 - test/helper.rb
 - test/models
 - test/models/mysql_user.rb