pinot-client 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb872f6cbcc1f34f16a68006eac8acea39229bdc9bd90f9f44a3369ed9c9fb59
-  data.tar.gz: b86cde24abaa6343f9984b3106830e9f00e25656050a4f577629942c3e0067c2
+  metadata.gz: 2ea9db0f69b7fb8d963190553d6a92201f4d63d5d6a07a975f862d00e43aa30a
+  data.tar.gz: c3b968737e6b7650c57bb79ef42153eb6870df22521939f885e5332fe4a2b7eb
 SHA512:
-  metadata.gz: afc088a4df6eaa77e6141fa051d7f2e1f3afa1aa8d75555ed2291dfc84fe159a9538ad86621d452bc510066576a331d6e23135aa93529f672bf912ba46ed5b0c
-  data.tar.gz: b34bcb378ab7a6bca383545b79e090273ed0b67d4e5356699461b02bbbaaafd7e7580073e492bbb7f43cf988c77ba500e361e1954c53a990aab5be6d785cae4b
+  metadata.gz: b5809f8a9245ff2b13cd6a487499aff37ad9f879d4c5537570f61b1c34da6fe702817bb3ced5d6c812f8b38b9283bafb1bb3a16f2ae1f9279436e9cf86f274ae
+  data.tar.gz: 78c2573048ced129a60d9186092acba394456304cc343f1fca56cce1fa0bc8e3417c8748b3bd50a97f6dcd5f05f32caaf2c0f2a12e153e5685876e06aa033f31

data/lib/pinot/config.rb

@@ -22,7 +22,7 @@ module Pinot
   class ClientConfig
     attr_accessor :broker_list, :http_timeout, :query_timeout_ms, :extra_http_header,
                   :use_multistage_engine, :controller_config, :logger, :tls_config,
-                  :grpc_config, :zookeeper_config
+                  :grpc_config, :zookeeper_config, :query_timeout_ms
 
     def initialize(
       broker_list: [],
@@ -34,7 +34,8 @@ module Pinot
       logger: nil,
       tls_config: nil,
       grpc_config: nil,
-      zookeeper_config: nil
+      zookeeper_config: nil,
+      query_timeout_ms: nil
     )
       @broker_list = broker_list
       @http_timeout = http_timeout
@@ -46,6 +47,7 @@ module Pinot
       @tls_config = tls_config
       @grpc_config = grpc_config
       @zookeeper_config = zookeeper_config
+      @query_timeout_ms = query_timeout_ms
     end
 
     def validate!

data/lib/pinot/connection.rb

@@ -2,12 +2,15 @@ require "bigdecimal"
 
 module Pinot
   class Connection
-    def initialize(transport:, broker_selector:, use_multistage_engine: false, logger: nil)
+    attr_accessor :query_timeout_ms
+
+    def initialize(transport:, broker_selector:, use_multistage_engine: false, logger: nil, query_timeout_ms: nil)
       @transport = transport
       @broker_selector = broker_selector
       @use_multistage_engine = use_multistage_engine
       @trace = false
       @logger = logger
+      @query_timeout_ms = query_timeout_ms
     end
 
     def use_multistage_engine=(val)
@@ -32,6 +35,14 @@ module Pinot
       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}"
+    end
+
     def execute_sql_with_params(table, query_pattern, params)
       query = format_query(query_pattern, params)
       execute_sql(table, query)
@@ -95,8 +106,8 @@ module Pinot
       @logger || Pinot::Logging.logger
     end
 
-    def build_request(query)
-      Request.new("sql", query, @trace, @use_multistage_engine)
+    def build_request(query, timeout_ms: @query_timeout_ms)
+      Request.new("sql", query, @trace, @use_multistage_engine, timeout_ms)
     end
   end
 end

data/lib/pinot/connection_factory.rb

@@ -63,7 +63,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/request.rb

@@ -1,3 +1,3 @@
 module Pinot
-  Request = Struct.new(:query_format, :query, :trace, :use_multistage_engine)
+  Request = Struct.new(:query_format, :query, :trace, :use_multistage_engine, :query_timeout_ms)
 end

data/lib/pinot/transport.rb

@@ -170,6 +170,7 @@ module Pinot
         if @timeout_ms && @timeout_ms > 0
           parts << "timeoutMs=#{@timeout_ms}"
         end
+        parts << "timeoutMs=#{request.query_timeout_ms}" if request.query_timeout_ms
       end
       parts.join(";")
     end

data/lib/pinot/version.rb

@@ -1,3 +1,3 @@
 module Pinot
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

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