pinot-client 1.23.0 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0752e62700790e556388c588d9a305049a5935fc4da0afdefeecab830a9dde0c
-  data.tar.gz: 4f5b1e86e84817febf245ec13498ec300ac68688c691eda58a2f4aafa79d219c
+  metadata.gz: b893ea9b2cefc1aca8cf86940399d36be6e071e88adc8023affb660d94ad8ce7
+  data.tar.gz: 539a393551125f7169975b0e641f4d1b60fd0cc6390fc1c9c10b4f86c4036db0
 SHA512:
-  metadata.gz: 684b1e6b39e4e1f5f84bed527de2b50f056d101b81ba7621549454d81cc08f49dd044ce2d3dfa5cbb8084075339c0b4c45a89f32c7cf185f1aa73e6c9e40ec95
-  data.tar.gz: 4ea1edf2abac766c358f0e99ed073a05e500d19fb77101475c96f6b82fa4d308a0025565bc1d8d55103da7c7af470654343f9b2b5b57366838e257853e493223
+  metadata.gz: 13d9d34e4a86ac6d62b15db000f4220e28cd5498e78cfdb42b2c9edcfac5645c68332a43048d96bc16089381fc4ea9c3d0ce429a95480c481766d1ebd9dfd6ca
+  data.tar.gz: 679bde8940819c309cbc351712cf2c4d4f3cfa1601e81ae023e5bf03a944404bd907b1f0a6fa44c2d5925909f3b8ce6533adf2a91cfea5aa284be7ab86afc9cf

data/lib/pinot/transport.rb

@@ -171,6 +171,7 @@ module Pinot
 
     # HTTP status codes that map to specific error classes and are safe to retry
     HTTP_ERROR_MAP = {
+      "408" => QueryTimeoutError,
       "429" => RateLimitError,
       "503" => BrokerUnavailableError,
       "504" => BrokerUnavailableError
@@ -178,6 +179,10 @@ module Pinot
 
     RETRYABLE_HTTP_ERRORS = [RateLimitError, BrokerUnavailableError].freeze
 
+    # Pinot exception errorCode values that indicate query timeout.
+    # 250 = ExecutionTimeoutError (server-side), 400 = BrokerTimeoutError.
+    TIMEOUT_ERROR_CODES = [250, 400].freeze
+
     def initialize(http_client:, extra_headers: {}, timeout_ms: nil, logger: nil,
                    max_retries: 0, retry_interval_ms: 200)
       @http_client = http_client
@@ -216,18 +221,24 @@ module Pinot
           raise TransportError, "http exception with HTTP status code #{resp.code}"
         end
 
-        begin
+        broker_response = begin
           BrokerResponse.from_json(resp.body)
         rescue JSON::ParserError => e
           raise e.message
         end
+
+        if (timeout_ex = broker_response.exceptions.find { |ex| TIMEOUT_ERROR_CODES.include?(ex.error_code) })
+          raise QueryTimeoutError, timeout_ex.message
+        end
+
+        broker_response
       rescue *RETRYABLE_HTTP_ERRORS, *RETRYABLE_ERRORS => e
         if attempts < max_attempts
           sleep_ms = (@retry_interval_ms || 200) * (2 ** (attempts - 1))
           sleep(sleep_ms / 1000.0)
           retry
         end
-        raise
+        raise Net::ReadTimeout === e || Net::WriteTimeout === e ? QueryTimeoutError.new(e.message) : e
       end
     end
 

data/lib/pinot/version.rb

@@ -1,3 +1,3 @@
 module Pinot
-  VERSION = "1.23.0"
+  VERSION = "1.24.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pinot-client
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.24.0
 platform: ruby
 authors:
 - Xiang Fu