rb_snowflake_client 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc9cf812a682100ea6d9ac3a84156aa202342fa66e335e2c972ef50adc4234b8
-  data.tar.gz: 549c76f63232f130dcc0f810335023612e7c198d51b6cae2911e3582027157b5
+  metadata.gz: d3fe7c88a471538362f7f852e9e0f0e1cc65413cecc9f308b21781325d4f8e99
+  data.tar.gz: 251bdb1fdb3b86919e2aac8714899fd69711813196d1109a6eb8d22e49f150ac
 SHA512:
-  metadata.gz: 70a7c21d0ddcc12c64281363177c7f31e1f9b88a089fb04ae36700d2140828c0bfee4d0acb557ce823a867875b34d89d426e63ad4e6ad9d3a7646111d030f3e1
-  data.tar.gz: a4652f0539d923f71bffcffab0bcf212742cc8d174756d41b231869c8def8330449f5eba6dbae9aa99293208efbde57e894c76e34bbac9404b27b152492137ec
+  metadata.gz: dd65b3d146f72a8109f4f7654658e911accc108451dbc15f42dd083e01e7db3499231029fd9e911fcfa76f2bc938f0329fed07ee9fad10523d56f1fb894137e0
+  data.tar.gz: 4368e68ca241e0563e6c2d2e408315dc0ef7648b66340d7ac137d4504f90f358ddb3d6145adbe1cdda0ed03c75ebd64a5d1d51e589be79c991654fa0608b38da

data/.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
           SNOWFLAKE_URI: ${{ secrets.SNOWFLAKE_URI }}
           SNOWFLAKE_ORGANIZATION: ${{ secrets.SNOWFLAKE_ORGANIZATION }}
           SNOWFLAKE_ACCOUNT: ${{ secrets.SNOWFLAKE_ACCOUNT }}
-          SNOWFLAKE_DEFAULT_WAREHOUSE: $${{ secrets.SNOWFLAKE_DEFAULT_WAREHOUSE }}
+          SNOWFLAKE_DEFAULT_WAREHOUSE: ${{ secrets.SNOWFLAKE_DEFAULT_WAREHOUSE }}
           SNOWFLAKE_USER: ${{ secrets.SNOWFLAKE_USER }}
           SNOWFLAKE_PASSWORD: ${{ secrets.SNOWFLAKE_PASSWORD }}
           SNOWFLAKE_PRIVATE_KEY: ${{ secrets.SNOWFLAKE_CLIENT_TEST_PRIVATE_KEY }}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rb_snowflake_client (1.1.3)
+    rb_snowflake_client (1.1.5)
       concurrent-ruby (>= 1.2)
       connection_pool (>= 2.4)
       dotenv (>= 2.8)

data/lib/ruby_snowflake/client/threaded_in_memory_strategy.rb

@@ -9,31 +9,31 @@ module RubySnowflake
         result[0] = statement_json_body["data"]
 
         thread_pool = Concurrent::FixedThreadPool.new(num_threads)
-        futures = []
-        partitions.each_with_index do |partition, index|
-          next if index == 0 # already have the first partition
-          futures << Concurrent::Future.execute(executor: thread_pool) do
-            [index, retreive_proc.call(index)]
+        partitions
+          .each_with_index.map do |partition, index|
+            next if index == 0 # already have the first partition
+            [index, Concurrent::Future.execute(executor: thread_pool) { retreive_proc.call(index) }]
           end
-        end
-        futures.each do |future|
-          if future.rejected?
-            if future.reason.is_a? RubySnowflake::Error
-              raise future.reason
-            else
-              raise ConnectionStarvedError.new(
-                      "A partition request timed out. This is usually do to using the client in" \
-                      "multiple threads. The client uses a connection thread pool and if too many" \
-                      "requests are all done in threads at the same time, threads can get starved" \
-                      "of access to connections. The solution for this is to either increase the " \
-                      "max_connections parameter on the client or create a new client instance" \
-                      "with it's own connection pool to snowflake per thread. Rejection reason: #{future.reason.message}"
-                    )
+          .each do |entry|
+            next if entry.nil? # 0th index
+
+            index, future = entry
+            if future.rejected?
+              if future.reason.is_a? RubySnowflake::Error
+                raise future.reason
+              else
+                raise ConnectionStarvedError.new(
+                        "A partition request timed out. This is usually do to using the client in" \
+                        "multiple threads. The client uses a connection thread pool and if too many" \
+                        "requests are all done in threads at the same time, threads can get starved" \
+                        "of access to connections. The solution for this is to either increase the " \
+                        "max_connections parameter on the client or create a new client instance" \
+                        "with it's own connection pool to snowflake per thread. Rejection reason: #{future.reason.message}"
+                      )
+              end
             end
+            result[index] = future.value
           end
-          index, partition_data = future.value
-          result[index] = partition_data
-        end
         result
       end
     end

data/lib/ruby_snowflake/client.rb

@@ -28,8 +28,19 @@ module RubySnowflake
 
     def initialize(details)
       @sentry_context = details
+      @details = details
+    end
+
+    def message
+      if @details == {}
+        super
+      else
+        @details.to_s
+      end
+
     end
   end
+
   class BadResponseError < Error ; end
   class ConnectionError < Error ; end
   class ConnectionStarvedError < Error ; end
@@ -249,9 +260,10 @@ module RubySnowflake
           loop do
             sleep POLLING_INTERVAL
 
-            if Time.now.to_i - query_start_time > @query_timeout
+            elapsed_time = Time.now.to_i - query_start_time
+            if elapsed_time > @query_timeout
               cancelled = attempt_to_cancel_and_silence_errors(connection, statement_handle)
-              raise QueryTimeoutError.new("Query timed out. Query cancelled? #{cancelled} Query: #{query}")
+              raise QueryTimeoutError.new("Query timed out. Query cancelled? #{cancelled}; Duration: #{elapsed_time}; Query: '#{query}'")
             end
 
             poll_response = request_with_auth_and_headers(connection, Net::HTTP::Get,

data/lib/ruby_snowflake/version.rb

@@ -1,3 +1,3 @@
 module RubySnowflake
-  VERSION = "1.1.3"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb_snowflake_client
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Rinsed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-09 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby