em-pg-client 0.3.1 → 0.3.2

data/.yardopts

@@ -1 +1 @@
-lib/pg/em/client/*.rb  lib/pg/em/*.rb lib/pg/*.rb - BENCHMARKS.md LICENSE HISTORY.md
+lib/pg/em/client/*.rb  lib/pg/em/*.rb lib/pg/*.rb - benchmarks/*.rb BENCHMARKS.md LICENSE HISTORY.md

data/BENCHMARKS.md

@@ -1,9 +1,24 @@
-Benchmarks
-----------
+Benchmarking
+============
 
-I've done some benchmark {file:benchmarks/em_pg.rb tests} to compare fully async and blocking em-pg drivers.
+Environment
+-----------
+
+The machine running tests is Linux CentOS 2.6.18-194.32.1.el5xen #1 SMP with
+Quad Core Xeon X3360 @ 2.83GHz, 4GB RAM.
+
+Postgres server version: 9.0.3
+Postgres pqlib version: 9.3
+
+Fully Asynchronous vs. poor man's async
+---------------------------------------
+
+The following {file:benchmarks/em_pg.rb benchmark} compares fully
+asynchronous implementation (`em-pg-client`) versus blocking em-pg drivers.
+
+The goal of the test is to retrieve (~80000) rows from the same table with
+a lot of text data, in chunks, using parallel connections.
 
-The goal of the test is simply to retrieve (~80000) rows from table with a lot of text data, in chunks, using parallel connections.
 The parallel method uses synchrony for simplicity.
 
 * `single` is (eventmachine-less) job for retrieving a whole data table in
@@ -15,14 +30,6 @@ The parallel method uses synchrony for simplicity.
   that it uses special patched version of library that uses blocking
   PGConnection methods
 
-Environment
------------
-
-The machine used for test is Linux CentOS 2.6.18-194.32.1.el5xen #1 SMP with Quad Core Xeon X3360 @ 2.83GHz, 4GB RAM.
-Postgres version used: 9.0.3.
-
-The results:
-------------
 
 ```
     >> benchmark 1000
@@ -40,9 +47,45 @@ The results:
     blocking 1000/20:    78.790000   3.230000  82.020000 (225.949107)
 ```
 
-As we can see the gain from using asynchronous pg client while
+As we can see the gain from using asynchronous em-pg-client while
 using `parallel` queries is noticeable (up to ~30%).
 
 The `blocking` client however doesn't gain much from parallel execution.
 This was expected because it freezes eventmachine until the whole
 dataset is consumed by the client.
+
+
+Threads vs. Fibers Streaming Benchmark
+--------------------------------------
+
+The following {file:benchmarks/single_row_mode.rb benchmark} compares
+performance of parallel running threads using vanilla PG::Connection driver
+versus EventMachine driven parallel Fibers using PG::EM::Client v0.3.2.
+
+Each thread/fiber retrieves first 5000 rows from the same table with
+a lot of text data in a `single_row_mode`. After 5000 rows is retrieved
+the connection is being reset. The process is repeated after all parallel
+running threads/fibers finish their task.
+
+Both Thread and Fiber versions use the same chunk of code to retrieve rows.
+
+```
+    >> benchmark 400
+                               user     system      total        real
+    threads 400x1:        24.970000   1.090000  26.060000 ( 30.683818)
+    threads 80x5:         24.730000   7.020000  31.750000 ( 51.402710)
+    threads 40x10:        22.880000   7.460000  30.340000 ( 52.548910)
+    threads 20x20:        22.220000   7.130000  29.350000 ( 53.911111)
+    threads 10x40:        22.570000   7.620000  30.190000 ( 54.111841)
+
+    fibers  400x1:        26.040000   1.060000  27.100000 ( 31.619598)
+    fibers  80x5:         28.690000   1.140000  29.830000 ( 33.025573)
+    fibers  40x10:        28.790000   1.280000  30.070000 ( 33.498418)
+    fibers  20x20:        29.100000   1.210000  30.310000 ( 33.289344)
+    fibers  10x40:        29.220000   1.340000  30.560000 ( 33.691188)
+```
+
+```
+    AxB - repeat A times running B parallel threads/fibers.
+```
+

data/HISTORY.md

@@ -1,3 +1,10 @@
+0.3.2
+
+- fix: asynchronous get_result performance
+- fix+specs: query_timeout timer is canceled on connection breakdown
+- comply with pg+specs: asynchronous get_result and get_last_result return nil
+  when connection status is not ok
+
 0.3.1
 
 - support for asynchronous data streaming in single row mode -

data/README.md

@@ -1,4 +1,5 @@
-#em-pg-client
+em-pg-client
+============
 
 The Ruby EventMachine driver interface to the PostgreSQL RDBMS. It is based on
 [ruby-pg](https://bitbucket.org/ged/ruby-pg).
@@ -72,7 +73,7 @@ Features
 * [Sequel Adapter](https://github.com/fl00r/em-pg-sequel) by Peter Yanovich.
 * Works on windows (requires ruby 2.0) ([issue #7][Issue 7]).
 * __New__ - supports asynchronous query data processing in single row mode
-  ([issue #12][Issue 12]).
+  ([issue #12][Issue 12]). See {file:BENCHMARKS.md BENCHMARKING}.
 
 Requirements
 ------------
@@ -95,7 +96,7 @@ Install
 #### Gemfile
 
 ```ruby
-  gem "em-pg-client", "~> 0.3.1"
+  gem "em-pg-client", "~> 0.3.2"
 ```
 
 #### Github
@@ -365,11 +366,10 @@ Bugs/Limitations
 TODO:
 -----
 
-* implement streaming results (Postgres >= 9.2)
+* more convenient streaming API
 * implement EM adapted version of `get_copy_data`, `put_copy_data`,
   `wait_for_notify` and `transaction`
 * ORM (ActiveRecord and maybe Datamapper) support as separate projects
-* present more benchmarks
 
 More Info
 ---------

data/benchmarks/em_pg.rb

@@ -92,5 +92,5 @@ def parallel(repeat=1, chunk_size=2000, concurrency=10)
 end
 
 if $0 == __FILE__
-  benchmark (ARGV.first || 10).to_i
+  benchmark ARGV[0].to_i.nonzero? || 10
 end

data/benchmarks/single_row_mode.rb

@@ -0,0 +1,88 @@
+$:.unshift('./lib')
+require 'pg/em/connection_pool'
+require 'em-synchrony'
+require 'em-synchrony/fiber_iterator'
+require 'pp'
+require 'benchmark'
+
+TABLE_NAME = 'resources'
+LIMIT_ROWS = 5000
+
+include EM::Synchrony
+
+unless PG::EM::Client.single_row_mode?
+  raise 'compile pg against pqlib >= 9.2 to support single row mode'
+end
+
+def benchmark(repeat=40)
+  Benchmark.bm(20) do |b|
+    puts
+    b.report("threads #{repeat/1}x1:")   { threads(repeat, 1) }
+    b.report("threads #{repeat/5}x5:")   { threads(repeat, 5) }
+    b.report("threads #{repeat/10}x10:") { threads(repeat, 10) }
+    b.report("threads #{repeat/20}x20:") { threads(repeat, 20) }
+    b.report("threads #{repeat/40}x40:") { threads(repeat, 40) }
+    puts
+    b.report("fibers  #{repeat/1}x1:")   { fibers(repeat, 1) }
+    b.report("fibers  #{repeat/5}x5:")   { fibers(repeat, 5) }
+    b.report("fibers  #{repeat/10}x10:") { fibers(repeat, 10) }
+    b.report("fibers  #{repeat/20}x20:") { fibers(repeat, 20) }
+    b.report("fibers  #{repeat/40}x40:") { fibers(repeat, 40) }
+  end
+end
+
+def threads(repeat, concurrency)
+  db = Hash.new { |pool, id| pool[id] = PG::Connection.new }
+  (repeat/concurrency).times do
+    (0...concurrency).map do |i|
+      Thread.new do
+        stream_results(db[i])
+      end
+    end.each(&:join)
+  end
+  db.each_value(&:finish).clear
+end
+
+def fibers(repeat, concurrency)
+  EM.synchrony do
+    db = PG::EM::ConnectionPool.new size: concurrency, lazy: true
+    (repeat/concurrency).times do
+      FiberIterator.new((0...concurrency), concurrency).each do
+        db.hold do |pg|
+          stream_results(pg)
+        end
+      end
+    end
+    db.finish
+    EM.stop
+  end
+end
+
+def stream_results(pg)
+  pg.send_query("select * from #{TABLE_NAME}")
+  pg.set_single_row_mode
+  rows = 0
+  last_time = Time.now
+  while result = pg.get_result
+    begin
+      result.check
+      result.each do |tuple|
+        rows += 1
+        if rows >= LIMIT_ROWS
+          pg.reset
+          break
+        end
+      end
+    rescue PG::Error => e
+      pg.get_last_result
+      raise e
+    ensure
+      result.clear
+    end
+  end
+end
+
+if $0 == __FILE__
+  benchmark ARGV[0].to_i.nonzero? || 40
+end
+

data/em-pg-client.gemspec

@@ -1,6 +1,8 @@
 $:.unshift "lib"
 require 'pg/em-version'
 
+files = `git ls-files`.split("\n")
+
 Gem::Specification.new do |s|
   s.name = "em-pg-client"
   s.version = PG::EM::VERSION
@@ -13,12 +15,15 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.description = "PostgreSQL asynchronous EventMachine client, based on pg interface (PG::Connection)"
   s.authors = ["Rafal Michalski"]
-  s.files = `git ls-files`.split("\n") - ['.gitignore']
+  s.files = files - ['.gitignore']
   s.test_files = Dir.glob("spec/**/*")
   s.rdoc_options << "--title" << "em-pg-client" <<
     "--main" << "README.md"
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README.md", "BENCHMARKS.md", "LICENSE", "HISTORY.md"]
+  s.extra_rdoc_files = [
+      files.grep(/^benchmarks\/.*\.rb$/),
+      "README.md", "BENCHMARKS.md", "LICENSE", "HISTORY.md"
+    ].flatten
   s.requirements << "PostgreSQL server"
   s.add_runtime_dependency "pg", ">= 0.17.0"
   s.add_runtime_dependency "eventmachine", "~> 1.0.0"

data/examples/single_row_mode.rb

@@ -4,7 +4,7 @@
 #
 # upside:   it's the same way you would work with PG::Connection
 # downside: it's a little verbose and doesn't support automatic re-connects
-gem 'em-pg-client', '>= 0.3.1'
+gem 'em-pg-client', '>= 0.3.2'
 require 'pg/em/connection_pool'
 require 'em-synchrony'
 require 'em-synchrony/fiber_iterator'
@@ -15,12 +15,6 @@ unless PG::EM::Client.single_row_mode?
   raise 'compile pg against pqlib >= 9.2 to support single row mode'
 end
 
-def tick_sleep
-  f = Fiber.current
-  EM.next_tick { f.resume }
-  Fiber.yield
-end
-
 EM.synchrony do
   EM.add_periodic_timer(0.01) { print ' ' }
 
@@ -41,10 +35,6 @@ EM.synchrony do
               rows += 1
               # process tuple
               print mark
-              if (rows % 10).zero?
-                # let reactor do some work if data is coming too fast
-                tick_sleep
-              end
               # break stream cleanly
               pg.reset if rows > 1000
             end

data/lib/pg/em-version.rb

@@ -1,5 +1,5 @@
 module PG
   module EM
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

data/lib/pg/em.rb

@@ -34,6 +34,8 @@ module PG
     # - {#exec_prepared_defer}
     # - {#describe_prepared_defer}
     # - {#describe_portal_defer}
+    # - {#get_result_defer}
+    # - {#get_last_result_defer}
     #
     # are added to execute queries asynchronously,
     # returning +Deferrable+ object.
@@ -47,6 +49,8 @@ module PG
     # - {#exec_prepared}
     # - {#describe_prepared}
     # - {#describe_portal}
+    # - {#get_result}
+    # - {#get_last_result}
     #
     # and are now auto-detecting if EventMachine is running and
     # performing commands asynchronously (blocking only current fiber) or
@@ -577,8 +581,6 @@ module PG
       alias_method :async_exec_defer,  :exec_defer
       alias_method :exec_params_defer, :exec_defer
 
-      # @!endgroup
-
       # Asynchronously retrieves the next result from a call to
       # #send_query (or another asynchronous command) and immediately
       # returns with a Deferrable.
@@ -595,8 +597,16 @@ module PG
       def get_result_defer(&blk)
         begin
           df = FeaturedDeferrable.new(&blk)
-          check_async_command_aborted!
-          setup_emio_watcher.watch_results(df, nil, true)
+          if status == CONNECTION_OK
+            if is_busy
+              check_async_command_aborted!
+              setup_emio_watcher.watch_results(df, nil, true)
+            else
+              df.succeed blocking_get_result
+            end
+          else
+            df.succeed
+          end
         rescue Error => e
           ::EM.next_tick { async_autoreconnect!(df, e) }
         rescue Exception => e
@@ -605,8 +615,6 @@ module PG
         df
       end
 
-      alias_method :blocking_get_result, :get_result
-
       # Asynchronously retrieves all available results on the current
       # connection (from previously issued asynchronous commands like
       # +send_query()+) and immediately returns with a Deferrable.
@@ -623,8 +631,12 @@ module PG
       def get_last_result_defer(&blk)
         begin
           df = FeaturedDeferrable.new(&blk)
-          check_async_command_aborted!
-          setup_emio_watcher.watch_results(df)
+          if status == CONNECTION_OK
+            check_async_command_aborted!
+            setup_emio_watcher.watch_results(df)
+          else
+            df.succeed
+          end
         rescue Error => e
           ::EM.next_tick { async_autoreconnect!(df, e) }
         rescue Exception => e
@@ -633,6 +645,10 @@ module PG
         df
       end
 
+      # @!endgroup
+
+      alias_method :blocking_get_result, :get_result
+
       def raise_error(klass=Error, message=error_message)
         error = klass.new(message)
         error.instance_variable_set(:@connection, self)
@@ -641,6 +657,15 @@ module PG
 
       private
 
+      def fiber_sync(df, fiber)
+        f = nil
+        df.completion do |res|
+          if f then f.resume res else return res end
+        end
+        f = fiber
+        Fiber.yield
+      end
+
       def check_async_command_aborted!
         if @async_command_aborted
           raise_error ConnectionBad, "previous query expired, need connection reset"
@@ -648,17 +673,10 @@ module PG
       end
 
       def setup_emio_watcher
-        case status
-        when CONNECTION_BAD
-          raise_error ConnectionBad
-        when CONNECTION_OK
-          if @watcher && @watcher.watching?
-            @watcher
-          else
-            @watcher = ::EM.watch(self.socket_io, Watcher, self)
-          end
+        if @watcher && @watcher.watching?
+          @watcher
         else
-          raise_error ConnectionBad, "connection reset pending"
+          @watcher = ::EM.watch(self.socket_io, Watcher, self)
         end
       end
 
@@ -680,7 +698,7 @@ module PG
       #   @return [PG::Result] if block wasn't given
       #   @return [Object] result of the given block
 
-      # @!group Auto-sensing thread or fiber blocking command methods
+      # @!group Auto-sensing fiber-synchronized command methods
 
       # @!method exec(sql, &blk)
       #   Sends SQL query request specified by +sql+ to PostgreSQL.
@@ -730,17 +748,6 @@ module PG
       #   @see PG::EM::Client#describe_portal_defer
       #   @see http://deveiate.org/code/pg/PG/Connection.html#method-i-describe_portal PG::Connection#describe_portal
       #
-      # @!method get_result(&blk)
-      #   Retrieves the next result from a call to #send_query (or another
-      #   asynchronous command). If no more results are available returns
-      #   +nil+ and the block (if given) is never called.
-      #
-      #   @macro auto_synchrony_api
-      #   @return [nil] if no more results
-      #
-      #   @see #get_result_defer
-      #   @see http://deveiate.org/code/pg/PG/Connection.html#method-i-get_result PG::Connection#get_result
-      #
       # @!method get_last_result
       #   Retrieves all available results on the current connection
       #   (from previously issued asynchronous commands like +send_query()+)
@@ -759,24 +766,15 @@ module PG
         prepare           prepare_defer
         describe_prepared describe_prepared_defer
         describe_portal   describe_portal_defer
-        get_result        get_result_defer
         get_last_result   get_last_result_defer
         ).each_slice(2) do |name, defer_name|
 
         class_eval <<-EOD, __FILE__, __LINE__
           def #{name}(*args, &blk)
             if ::EM.reactor_running? && !(f = Fiber.current).equal?(ROOT_FIBER)
-              result = fiber = nil
-              #{defer_name}(*args) do |res|
-                f = nil
-                if fiber
-                  fiber.resume(res)
-                else
-                  result = res
-                end
+              if (result = fiber_sync #{defer_name}(*args), f).is_a?(::Exception)
+                raise result
               end
-              result = Fiber.yield if (fiber = f)
-              raise result if result.is_a?(::Exception)
               if block_given? && result
                 begin
                   yield result
@@ -797,6 +795,34 @@ module PG
       alias_method :async_query, :exec
       alias_method :async_exec,  :exec
 
+      # Retrieves the next result from a call to #send_query (or another
+      # asynchronous command). If no more results are available returns
+      # +nil+ and the block (if given) is never called.
+      #
+      # @macro auto_synchrony_api
+      # @return [nil] if no more results
+      #
+      # @see #get_result_defer
+      # @see http://deveiate.org/code/pg/PG/Connection.html#method-i-get_result PG::Connection#get_result
+      def get_result
+        if is_busy && ::EM.reactor_running? && !(f = Fiber.current).equal?(ROOT_FIBER)
+          if (result = fiber_sync get_result_defer, f).is_a?(::Exception)
+            raise result
+          end
+          if block_given? && result
+            begin
+              yield result
+            ensure
+              result.clear
+            end
+          else
+            result
+          end
+        else
+          super
+        end
+      end
+
       # @!endgroup
 
 

data/lib/pg/em/client/watcher.rb

@@ -27,23 +27,12 @@ module PG
           @deferrable = deferrable
           @send_proc = send_proc
           cancel_timer
-          if @client.is_busy
-            if @client.status == PG::CONNECTION_OK
-              self.notify_readable = true
-              if (timeout = @client.query_timeout) > 0
-                @notify_timestamp = Time.now
-                setup_timer timeout
-              end
-            else
-              @deferrable.protect do
-                @client.raise_error ConnectionBad
-              end
-            end
-          else
-            self.notify_readable = true
-            fetch_results
+          self.notify_readable = true
+          if (timeout = @client.query_timeout) > 0
+            @notify_timestamp = Time.now
+            setup_timer timeout
           end
-          self
+          fetch_results
         end
 
         def setup_timer(timeout, adjustment = 0)
@@ -68,11 +57,18 @@ module PG
           end
         end
 
+        def notify_readable
+          @client.consume_input
+        rescue Exception => e
+          handle_error(e)
+        else
+          fetch_results
+        end
+
         # Carefully extract results without
         # blocking the EventMachine reactor.
         def fetch_results
           result = false
-          @client.consume_input
           until @client.is_busy
             single_result = @client.blocking_get_result
             if one_result_mode?
@@ -88,18 +84,7 @@ module PG
             @last_result = single_result
           end
         rescue Exception => e
-          self.notify_readable = false
-          cancel_timer
-          send_proc = @send_proc
-          @send_proc = nil
-          df = @deferrable
-          # prevent unbind error on auto re-connect
-          @deferrable = false
-          if e.is_a?(PG::Error)
-            @client.async_autoreconnect!(df, e, &send_proc)
-          else
-            df.fail(e)
-          end
+          handle_error(e)
         else
           if result == false
             @notify_timestamp = Time.now if @timer
@@ -111,14 +96,31 @@ module PG
           end
         end
 
-        alias_method :notify_readable, :fetch_results
-
         def unbind
           @is_connected = false
           @deferrable.protect do
+            cancel_timer
             @client.raise_error ConnectionBad, "connection reset"
           end if @deferrable
         end
+
+        private
+
+        def handle_error(e)
+          self.notify_readable = false
+          cancel_timer
+          send_proc = @send_proc
+          @send_proc = nil
+          df = @deferrable
+          # prevent unbind error on auto re-connect
+          @deferrable = false
+          if e.is_a?(PG::Error)
+            @client.async_autoreconnect!(df, e, &send_proc)
+          else
+            df.fail(e)
+          end
+        end
+
       end
 
     end

data/spec/em_client_autoreconnect.rb

@@ -332,30 +332,40 @@ describe 'pg-em with autoreconnect disabled' do
   end
 
   it "should fail to get last result asynchronously after server restart" do
+    check_get_last_result = proc do
+      @client.get_last_result_defer do |result|
+        result.should be_nil
+        @client.reset_defer do |conn|
+          conn.should be @client
+          @client.status.should be PG::CONNECTION_OK
+          EM.stop
+        end.should be_a_kind_of ::EM::DefaultDeferrable
+      end
+    end
     system($pgserver_cmd_stop).should be_true
     system($pgserver_cmd_start).should be_true
     begin
       @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
     rescue PG::UnableToSend
-    end
-    @client.get_last_result_defer do |ex|
-      ex.should be_an_instance_of PG::ConnectionBad
       @client.status.should be PG::CONNECTION_BAD
+      @client.get_last_result_defer do |ex|
+        ex.should be_nil
+        @client.status.should be PG::CONNECTION_BAD
+        check_get_last_result.call
+      end.should be_a_kind_of EM::DefaultDeferrable
+    else
       @client.get_last_result_defer do |ex|
         ex.should be_an_instance_of PG::ConnectionBad
-        @client.reset_defer do |conn|
-          conn.should be @client
-          @client.status.should be PG::CONNECTION_OK
-          EM.stop
-        end.should be_a_kind_of ::EM::DefaultDeferrable
-      end
-    end.should be_a_kind_of EM::DefaultDeferrable
+        @client.status.should be PG::CONNECTION_BAD
+        check_get_last_result.call
+      end.should be_a_kind_of EM::DefaultDeferrable
+    end
   end
 
   it "should fail to get each result asynchronously after server restart" do
-    check_get_result = proc do
-      @client.get_result_defer do |ex|
-        ex.should be_an_instance_of PG::ConnectionBad
+    check_get_result = proc do |expected_class|
+      @client.get_result_defer do |result|
+        result.should be_an_instance_of expected_class
         @client.status.should be PG::CONNECTION_BAD
         @client.reset_defer do |conn|
           conn.should be @client
@@ -370,9 +380,9 @@ describe 'pg-em with autoreconnect disabled' do
       @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
     rescue PG::UnableToSend
       @client.get_result_defer do |result|
-        result.should be_an_instance_of PG::ConnectionBad
+        result.should be_nil
         @client.status.should be PG::CONNECTION_BAD
-        check_get_result.call
+        check_get_result.call NilClass
       end
     else
       @client.get_result_defer do |result|
@@ -381,7 +391,7 @@ describe 'pg-em with autoreconnect disabled' do
           result.check
         end.to raise_error PG::Error
         @client.status.should be PG::CONNECTION_OK
-        check_get_result.call
+        check_get_result.call PG::ConnectionBad
       end
     end
   end

data/spec/em_client_common.rb

@@ -359,4 +359,44 @@ shared_context 'em-pg common after' do
     end.should be_a_kind_of ::EM::DefaultDeferrable
   end
 
+  it "should raise connection reset on connection breakdown" do
+    client = described_class.new query_timeout: 0.1
+    client.send_query('SELECT pg_sleep(10)')
+    client.get_last_result_defer do |ex|
+      ex.should be_an_instance_of PG::ConnectionBad
+      ex.message.should match /connection reset/
+      EM.add_timer(0.2) do
+        client.async_command_aborted.should be_false
+        EM.stop
+      end
+    end
+    # simulate connection breakdown
+    client.finish
+  end
+
+  it "should return nil result after async reset began" do
+    checkpoint = 0
+    @client.send_query('SELECT 1')
+    @client.reset_defer do |conn|
+      conn.should be @client
+      EM.next_tick do
+        checkpoint.should eq 2
+        @client.send_query('SELECT 1')
+        @client.get_last_result_defer do |result|
+          result.should be_an_instance_of PG::Result
+          result.getvalue(0,0).should eq '1'
+          EM.stop
+        end
+      end
+    end
+    @client.get_result_defer do |result|
+      result.should be_nil
+      checkpoint += 1
+    end
+    @client.get_last_result_defer do |result|
+      result.should be_nil
+      checkpoint += 1
+    end
+  end
+
 end

data/spec/em_synchrony_client.rb

@@ -338,6 +338,11 @@ describe PG::EM::Client do
 
   describe 'PG::EM::Client#transaction' do
 
+    before(:all) do
+      @client.query_timeout = 0
+      @client.query_timeout.should eq 0
+    end
+
     it "should raise ArgumentError when there is no block" do
       expect do
         @client.transaction

data/spec/em_synchrony_client_autoreconnect.rb

@@ -213,14 +213,15 @@ describe 'em-synchrony-pg with autoreconnect disabled' do
     begin
       @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
     rescue PG::UnableToSend
+      @client.status.should be PG::CONNECTION_BAD
+      @client.get_last_result.should be_nil
+    else
+      expect do
+        @client.get_last_result
+      end.to raise_error PG::ConnectionBad
     end
-    expect do
-      @client.get_last_result
-    end.to raise_error PG::ConnectionBad
     @client.status.should be PG::CONNECTION_BAD
-    expect do
-      @client.get_last_result
-    end.to raise_error PG::ConnectionBad
+    @client.get_last_result.should be_nil
     @client.reset
     @client.status.should be PG::CONNECTION_OK
     @client.get_last_result.should be_nil
@@ -233,10 +234,8 @@ describe 'em-synchrony-pg with autoreconnect disabled' do
     begin
       @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
     rescue PG::UnableToSend
-      expect do
-        @client.get_result
-      end.to raise_error PG::ConnectionBad
       @client.status.should be PG::CONNECTION_BAD
+      @client.get_result.should be_nil
     else
       result = @client.get_result
       result.should be_an_instance_of PG::Result
@@ -244,10 +243,12 @@ describe 'em-synchrony-pg with autoreconnect disabled' do
         result.check
       end.to raise_error PG::Error
       @client.status.should be PG::CONNECTION_OK
+      expect do
+        @client.get_result
+      end.to raise_error PG::ConnectionBad
     end
-    expect do
-      @client.get_result
-    end.to raise_error PG::ConnectionBad
+    @client.status.should be PG::CONNECTION_BAD
+    @client.get_result.should be_nil
     @client.status.should be PG::CONNECTION_BAD
     @client.reset
     @client.status.should be PG::CONNECTION_OK

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-pg-client
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -112,6 +112,8 @@ email: rafal@yeondir.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- benchmarks/em_pg.rb
+- benchmarks/single_row_mode.rb
 - README.md
 - BENCHMARKS.md
 - LICENSE
@@ -127,6 +129,7 @@ files:
 - README.md
 - Rakefile
 - benchmarks/em_pg.rb
+- benchmarks/single_row_mode.rb
 - em-pg-client.gemspec
 - examples/single_row_mode.rb
 - lib/em-pg-client.rb