rb_snowflake_client 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06290ff3078af3cd8d969ae39a9a29fc1272c4b3ff722e49d4d5bdc28a78724f'
-  data.tar.gz: 7b04238f59bbb34ce3f72db9fd1edb9551adfff299b42b2cc3fb72397c211bec
+  metadata.gz: e9d6598913d1c47b930ed9b3db3b4aae621ea9089055cecaa2ec897140154fbb
+  data.tar.gz: a2735059fd007bced307b285bae356222bafbd59bc1aa950dd9edf5556c35e7b
 SHA512:
-  metadata.gz: 52e50c1a4b0f89503c9972fba9a410dcdbd3d5428e6d9c2cd6f25d3d6fb2dc637d300f3dc260ae61cb4fe7105d203e39f3bc8d1435bfed5773d298113171c8d1
-  data.tar.gz: a962f2c4e87ce35347bb5320092ac7f6fa14a0ee00f18b821b0b2703ca95ab69a4027b7441d3150b2a2ebe26cbe93be253bfd6c04ed9245a14ca490da1d28111
+  metadata.gz: 170075bb5b7af8c816f2e069001f83e3e46968b5af56796da5e41f738b16ae946978058da7b26fed3b9fb9516bebdf0fec8ef96f341dcca58fa813d03c2bddc6
+  data.tar.gz: 2829982c8d29a4fb7a154e683028e395631cdfc2131b2b9e6ffc08eabe8d65ac967e7f48f5278441320dae54dae001a4e5d456512619e255f0d52453d6d63ecc

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    rb_snowflake_client (1.1.4)
+    rb_snowflake_client (1.2.0)
+      bigdecimal (>= 3.0)
       concurrent-ruby (>= 1.2)
       connection_pool (>= 2.4)
       dotenv (>= 2.8)
+      json (>= 2.1.0)
       jwt (>= 2.7)
-      oj (>= 3.16)
       retryable (>= 3.0)
 
 GEM
@@ -19,11 +20,10 @@ GEM
     connection_pool (2.4.1)
     diff-lcs (1.5.1)
     dotenv (3.1.2)
+    json (2.9.1)
     jwt (2.8.2)
       base64
     method_source (1.1.0)
-    oj (3.16.4)
-      bigdecimal (>= 3.0)
     parallel (1.25.1)
     pry (0.14.2)
       coderay (~> 1.1)

data/lib/ruby_snowflake/client.rb

@@ -2,12 +2,12 @@
 
 require "base64"
 require "benchmark"
+require "bigdecimal"
 require "concurrent"
 require "connection_pool"
 require "json"
 require "logger"
 require "net/http"
-require "oj"
 require "retryable"
 require "securerandom"
 require "uri"
@@ -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
@@ -57,7 +68,7 @@ module RubySnowflake
     # how long to wait to allow a query to complete, in seconds
     DEFAULT_QUERY_TIMEOUT = 600 # 10 minutes
 
-    OJ_OPTIONS = { :bigdecimal_load => :bigdecimal }.freeze
+    JSON_PARSE_OPTIONS = { decimal_class: BigDecimal }.freeze
     VALID_RESPONSE_CODES = %w(200 202).freeze
     POLLING_RESPONSE_CODE = "202"
     POLLING_INTERVAL = 2 # seconds
@@ -155,7 +166,7 @@ module RubySnowflake
           connection,
           Net::HTTP::Post,
           "/api/v2/statements?requestId=#{SecureRandom.uuid}&async=#{@_enable_polling_queries}",
-          Oj.dump(request_body)
+          request_body.to_json
         )
       end
       retrieve_result_set(query_start_time, query, response, streaming)
@@ -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,
@@ -278,12 +290,12 @@ module RubySnowflake
       end
 
       def retrieve_result_set(query_start_time, query, response, streaming)
-        json_body = Oj.load(response.body, OJ_OPTIONS)
+        json_body = JSON.parse(response.body, JSON_PARSE_OPTIONS)
         statement_handle = json_body["statementHandle"]
 
         if response.code == POLLING_RESPONSE_CODE
           result_response = poll_for_completion_or_timeout(query_start_time, query, statement_handle)
-          json_body = Oj.load(result_response.body, OJ_OPTIONS)
+          json_body = JSON.parse(result_response.body, JSON_PARSE_OPTIONS)
         end
 
         num_threads = number_of_threads_to_use(json_body["resultSetMetaData"]["partitionInfo"].size)
@@ -309,7 +321,7 @@ module RubySnowflake
         end
 
         partition_json = {}
-        bm = Benchmark.measure { partition_json = Oj.load(partition_response.body, OJ_OPTIONS) }
+        bm = Benchmark.measure { partition_json = JSON.parse(partition_response.body, JSON_PARSE_OPTIONS) }
         logger.debug { "JSON parsing took: #{bm.real}" }
         partition_data = partition_json["data"]
 

data/lib/ruby_snowflake/version.rb

@@ -1,3 +1,3 @@
 module RubySnowflake
-  VERSION = "1.1.4"
+  VERSION = "1.2.0"
 end

data/rb_snowflake_client.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |s|
   end
 
   s.require_paths = ["lib"]
+  s.add_dependency "bigdecimal", ">= 3.0"
   s.add_dependency "concurrent-ruby", ">= 1.2"
   s.add_dependency "connection_pool", ">= 2.4"
   s.add_dependency "dotenv", ">= 2.8"
+  s.add_dependency "json", ">= 2.1.0"
   s.add_dependency "jwt", ">= 2.7"
-  s.add_dependency "oj", ">= 3.16"
   s.add_dependency "retryable", ">= 3.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rb_snowflake_client
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Rinsed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-05 00:00:00.000000000 Z
+date: 2025-01-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -53,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: jwt
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement