google-cloud-spanner 2.18.0 → 2.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37f9332aedaf9d53b1eb13596dafa4b3571393449b85ce5e63750b5c57381e3f
-  data.tar.gz: b137394c7819e4795a98727e626772ece2404ef40bc7ef84153014768ddbfb89
+  metadata.gz: 86e6ca163f96c37fa118d05ecf481289318c707f1de83ffb401c20b40afacb69
+  data.tar.gz: 12cbaad3945956e2da31862d23d0ef66658539fc30daee432879650d2ab3d028
 SHA512:
-  metadata.gz: 0ea41265627415904e066549390d59ad72a2be577c3b6f7ac67d8a47197e4f2df4a79f9c2c14735bcd383989b2f3bfa602fe68e3ebde1d7cc055252d8644f36f
-  data.tar.gz: 2cc9bf3bbe521e85c72ad2dd255eedf09225c0bbcc67bc4c319a4036aa7beac01c18f73a0fb6ff1fd203b96b15ff2b3bcbb82f2f8ddfd0f2aa72e1d2f31f03e9
+  metadata.gz: b866a7a87beb50165b5b1593a4e92a1e0a4684f7a5e7210647aae4ecbe05fcf9f61b1309b00d37deb94e592bc98e541ea1f1104e411a32f6ed9bc4bbde1ee624
+  data.tar.gz: d8c40babae83b334f95e15ea242f7b1271ecf510cd19722619e759b2a3082df04400b1fc3e78f572a0708ecca76ee68a71192fab92a425d1c27f3c8d58a58aca

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 2.18.1 (2023-09-19)
+
+#### Bug Fixes
+
+* Use hash to track the sessions in use ([#60](https://github.com/googleapis/ruby-spanner/issues/60)) 
+
 ### 2.18.0 (2023-09-05)
 
 #### Features

data/lib/google/cloud/spanner/pool.rb

@@ -29,7 +29,11 @@ module Google
       # {Google::Cloud::Spanner::Session} instances.
       #
       class Pool
+        # @return [Array<Session>] A stack of `Session` objects.
         attr_accessor :sessions_available
+
+        # @return [Hash{String => Session}] A hash with session_id as keys,
+        # and `Session` objects as values.
         attr_accessor :sessions_in_use
 
         def initialize client, min: 10, max: 100, keepalive: 1800,
@@ -65,10 +69,10 @@ module Google
 
               # Use LIFO to ensure sessions are used from backend caches, which
               # will reduce the read / write latencies on user requests.
-              read_session = sessions_available.pop # LIFO
-              if read_session
-                sessions_in_use << read_session
-                return read_session
+              session = sessions_available.pop # LIFO
+              if session
+                sessions_in_use[session.session_id] = session
+                return session
               end
 
               if can_allocate_more_sessions?
@@ -85,7 +89,7 @@ module Google
           if action == :new
             session = new_session!
             @mutex.synchronize do
-              sessions_in_use << session
+              sessions_in_use[session.session_id] = session
             end
             return session
           end
@@ -95,12 +99,12 @@ module Google
 
         def checkin_session session
           @mutex.synchronize do
-            unless sessions_in_use.include? session
+            unless sessions_in_use.key? session.session_id
               raise ArgumentError, "Cannot checkin session"
             end
 
             sessions_available.push session
-            sessions_in_use.delete_if { |s| s.session_id == session.session_id }
+            sessions_in_use.delete session.session_id
 
             @resource.signal
           end
@@ -163,7 +167,7 @@ module Google
           create_keepalive_task!
           # init session stack
           @sessions_available = @client.batch_create_new_sessions @min
-          @sessions_in_use = []
+          @sessions_in_use = {}
         end
 
         def shutdown
@@ -176,9 +180,9 @@ module Google
           # Delete all sessions
           @mutex.synchronize do
             sessions_available.each { |s| future { s.release! } }
-            sessions_in_use.each { |s| future { s.release! } }
+            sessions_in_use.each_value { |s| future { s.release! } }
             @sessions_available = []
-            @sessions_in_use = []
+            @sessions_in_use = {}
           end
           # shutdown existing thread pool
           @thread_pool.shutdown

data/lib/google/cloud/spanner/transaction.rb

@@ -640,20 +640,12 @@ module Google
 
           request_options = build_request_options request_options
           safe_execute do |seqno|
-            batch_update_results = nil
-            begin
-              response = session.batch_update tx_selector, seqno,
-                                              request_options: request_options,
-                                              call_options: call_options, &block
-              batch_update_results = BatchUpdateResults.new response
-              row_counts = batch_update_results.row_counts
-              @grpc ||= batch_update_results.transaction
-              return row_counts
-            rescue Google::Cloud::Spanner::BatchUpdateError
-              @grpc ||= batch_update_results.transaction
-              # Re-raise after extracting transaction
-              raise
-            end
+            response = session.batch_update tx_selector, seqno,
+                                            request_options: request_options,
+                                            call_options: call_options, &block
+            batch_update_results = BatchUpdateResults.new response
+            @grpc ||= batch_update_results.transaction
+            batch_update_results.row_counts
           end
         end
 

data/lib/google/cloud/spanner/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Spanner
-      VERSION = "2.18.0".freeze
+      VERSION = "2.18.1".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-spanner
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.18.1
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core