pinot-client 1.15.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f8ec1d9b9dd17c63f38ddf2d30db5e331d0d1decd66a43335dc9488690ebef2
-  data.tar.gz: 518d0d4c6210660a9270166fdd0131c6bc363862e51449c531512bcaf2b37e8f
+  metadata.gz: 22de970391b9faa4d6f889e1891e84e69c2d045b4f22132d5d892a619b85659d
+  data.tar.gz: 64d0af1ca75e2a1ac9b074d8958d1a8b9df4599fdaf1f0570d95a1395f2faeb0
 SHA512:
-  metadata.gz: 550bef73ba7ad87e2712058e97836b5ad10fd3c8489e1649985fbf6ae487afccee0040bb2169e842161aa8dc788257b80aa62143e4fa028b68197f2a0616ea82
-  data.tar.gz: 957ca4aa0a52098aa7bb7158a8a931764bfd1d4d6bb2630c5eae2356d6719dc0909e67801f1d1db50aa14036c323d1bce9070ae8af240f8660b348190d779049
+  metadata.gz: 4654c1ca25d89bea2e4b1723153e079f016b15af06b736f7c3577475c34eb728ba2e19e8889273a6bf2f39742e9fb243460bb64fae7a9fe701cb7c9b8e4ecbd5
+  data.tar.gz: 52c5de1088080bba980bca3914b2e626c57e8d0e965b0127043ded49e3a165fbc6273e1f485e57111260d191086b0e35937ca5d40a950a46d47f9701a3913545

data/lib/pinot/connection.rb

@@ -25,27 +25,22 @@ module Pinot
       @trace = false
     end
 
-    def execute_sql(table, query)
+    def execute_sql(table, query, query_timeout_ms: nil)
       Pinot::Instrumentation.instrument(table: table, query: query) do
         logger.debug "Executing SQL on table=#{table}: #{query}"
         broker = @broker_selector.select_broker(table)
-        @transport.execute(broker, build_request(query))
+        effective_timeout = query_timeout_ms || @query_timeout_ms
+        @transport.execute(broker, build_request(query, timeout_ms: effective_timeout))
       end
-    rescue => e
-      raise "unable to execute SQL on table #{table}: #{e.message}"
     end
 
     def execute_sql_with_timeout(table, query, timeout_ms)
-      logger.debug "Executing SQL with timeout=#{timeout_ms}ms on table=#{table}: #{query}"
-      broker = @broker_selector.select_broker(table)
-      @transport.execute(broker, build_request(query, timeout_ms: timeout_ms))
-    rescue => e
-      raise "unable to execute SQL on table #{table}: #{e.message}"
+      execute_sql(table, query, query_timeout_ms: timeout_ms)
     end
 
-    def execute_sql_with_params(table, query_pattern, params)
+    def execute_sql_with_params(table, query_pattern, params, query_timeout_ms: nil)
       query = format_query(query_pattern, params)
-      execute_sql(table, query)
+      execute_sql(table, query, query_timeout_ms: query_timeout_ms)
     rescue => e
       # Re-raise format errors directly (they already have the right message)
       raise e

data/lib/pinot/connection_factory.rb

@@ -22,7 +22,8 @@ module Pinot
         transport: transport,
         broker_selector: selector,
         use_multistage_engine: config.use_multistage_engine || false,
-        logger: config.logger
+        logger: config.logger,
+        query_timeout_ms: config.query_timeout_ms
       )
 
       selector.init

data/lib/pinot/grpc_transport.rb

@@ -18,7 +18,7 @@ module Pinot
     def execute(broker_address, request)
       stub = build_stub(broker_address)
       grpc_request = build_request(request)
-      call_opts = build_call_opts
+      call_opts = build_call_opts(request)
 
       grpc_response = stub.submit(grpc_request, **call_opts)
       BrokerResponse.from_json(grpc_response.payload)
@@ -55,12 +55,19 @@ module Pinot
     def build_query_options(request)
       parts = ["groupByMode=sql", "responseFormat=sql"]
       parts << "useMultistageEngine=true" if request.use_multistage_engine
+      parts << "timeoutMs=#{request.query_timeout_ms}" if request.query_timeout_ms
       parts.join(";")
     end
 
-    def build_call_opts
+    def build_call_opts(request)
       opts = {}
-      opts[:deadline] = Time.now + @config.timeout if @config.timeout
+      # Per-request timeout takes precedence over config-level timeout
+      timeout_s = if request.query_timeout_ms
+                    request.query_timeout_ms / 1000.0
+                  elsif @config.timeout
+                    @config.timeout
+                  end
+      opts[:deadline] = Time.now + timeout_s if timeout_s
       opts[:metadata] = @config.extra_metadata unless @config.extra_metadata.empty?
       opts
     end

data/lib/pinot/simple_broker_selector.rb

@@ -4,6 +4,8 @@ module Pinot
 
     def initialize(broker_list)
       @broker_list = broker_list.dup.freeze
+      @mutex = Mutex.new
+      @index = 0
     end
 
     def init
@@ -12,7 +14,11 @@ module Pinot
 
     def select_broker(_table)
       raise BrokerNotFoundError, "no pre-configured broker lists" if @broker_list.empty?
-      @broker_list.sample
+      @mutex.synchronize do
+        broker = @broker_list[@index % @broker_list.size]
+        @index += 1
+        broker
+      end
     end
   end
 end

data/lib/pinot/transport.rb

@@ -38,6 +38,16 @@ module Pinot
       end
     end
 
+    def close
+      @reaper.kill rescue nil
+      @pool_mutex.synchronize do
+        @pool.each_value do |entries|
+          entries.each { |entry| entry.http.finish rescue nil }
+        end
+        @pool.clear
+      end
+    end
+
     private
 
     def with_connection(url)

data/lib/pinot/version.rb

@@ -1,3 +1,3 @@
 module Pinot
-  VERSION = "1.15.0"
+  VERSION = "1.18.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pinot-client
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Xiang Fu
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="