update tests to reflect changed close_mutator semantics

jonastemplestein · Sep 2, 2009 · a4d4767 · a4d4767
1 parent bdc5823
commit a4d4767
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/lib/active_record/connection_adapters/hypertable_adapter.rb b/lib/active_record/connection_adapters/hypertable_adapter.rb
@@ -598,7 +598,11 @@ def open_mutator(table_name, flags=0, flush_interval=0)
         @connection.open_mutator(table_name, flags, flush_interval)
       end
 
-      def close_mutator(mutator, flush=1)
+      # Flush is always called in a mutator's destructor due to recent
+      # no_log_sync changes.  Adding an explicit flush here just adds
+      # one round trip for an extra flush call, so change the default to
+      # flush=0.  Consider removing this argument and always sending 0.
+      def close_mutator(mutator, flush=0)
         @connection.close_mutator(mutator, flush)
       end
 

diff --git a/lib/hypertable/thrift_client.rb b/lib/hypertable/thrift_client.rb
@@ -41,7 +41,7 @@ def with_mutator(table, flags=0, flush_interval=0)
       begin
         yield mutator
       ensure
-        close_mutator(mutator, 1)
+        close_mutator(mutator, 0)
       end
     end
 

diff --git a/test/thrift_client_test.rb b/test/thrift_client_test.rb
@@ -220,7 +220,7 @@ class ThriftClientTest < Test::Unit::TestCase
 
     should "insert a cell using set_cell" do
       Hypertable.with_thrift_client("localhost", 38080) do |client|
-        mutator = client.open_mutator('thrift_test')
+        mutator = client.open_mutator('thrift_test', 0, 0)
         cell1 = Hypertable::ThriftGen::Cell.new
         cell1.row_key = 'k1'
         cell1.column_family = 'col'
@@ -270,7 +270,7 @@ class ThriftClientTest < Test::Unit::TestCase
 
     should "insert cells using set_cells" do
       Hypertable.with_thrift_client("localhost", 38080) do |client|
-        mutator = client.open_mutator('thrift_test')
+        mutator = client.open_mutator('thrift_test', 0, 0)
         cell1 = Hypertable::ThriftGen::Cell.new
         cell1.row_key = 'k1'
         cell1.column_family = 'col'