pinot-client 1.16.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfa501b22e0b1a69addd7cb33728772fb9717f60fd3986c3fd98c31ba0f3d2a9
-  data.tar.gz: 4e20a3f3c908b5da5afd357dcff60139334929ee086fc58ac044732c5c73205b
+  metadata.gz: bdea2c828052e0f38c39017c3a87b160f0022c18bcbfc2df13161a9147c6794a
+  data.tar.gz: af9ac6c3e45d38cc91ed4b7ef20ec53cee56fbe853187ceefa92a1b79920d7ac
 SHA512:
-  metadata.gz: bb715615d2af17557a6ea45b97c14b8a00079841c28259708b66431f837290cfaa31ae3b863d13bfaf416d78c568f2f8bfe1d2758eded1e6e6081e84203abdd8
-  data.tar.gz: 738c06c6e6c5629a675fe793ccec5ea919dadae5b39c4da39cc6eefcdac88ec9962a8929f6fd016e16367003aa309f8c595450c736e721e55a27dbf3f792d91e
+  metadata.gz: '0648832d123002c54acc059f439a49396405514b1addfbf88802e45182305060f7a0d274ac5fd3999cf041b35326833361eadabf3738f944030926cae76b9806'
+  data.tar.gz: b3bd1ed17cb209626da077dee9892e050292148ccef4af39e787ef1ca7f65ec40feace8e20d39b23be7027d1d28f2f3d71ba826eba885daa76e463ef72b5401b

data/lib/pinot/connection.rb

@@ -32,8 +32,6 @@ module Pinot
         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)

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.16.0"
+  VERSION = "1.19.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pinot-client
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.19.0
 platform: ruby
 authors:
 - Xiang Fu
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: A Ruby client for Apache Pinot, mirroring the Go client API
 email:
 executables: []
@@ -115,7 +143,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:
   - - ">="