pinot-client 1.8.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 819824203883477127807cc1a86d8535f7721883dfaec85423c5b333dd453b6e
-  data.tar.gz: dff26b09b035ad4d217a63b2b661677d4b47922760f2f140a6cda942d9383a20
+  metadata.gz: ddb501e91483838437691807ff09f98be16584f5b5e9e25c32982581db9fc226
+  data.tar.gz: 69f4df0c9fae29d42388b5fa6e1f55a1c722f70673c91b5ad43339762ad052fe
 SHA512:
-  metadata.gz: 606903f919bd310a8b1c208206db2c4ac25b5522ee26079435966f95f171573b0800266970ca3643c29528f506cf2a2c392b7161f7f2c3a174c313732a53721e
-  data.tar.gz: bc99e8c6ba493de6a534009e557915f9e72a57298129837750c49d8e1026dc8785822b079c63d05c42842a5b800930c44ac415bdf487e622fe1518f5cbbbf867
+  metadata.gz: 974f22a9db31c53e6a0534400347df98b419a1f6fffc351594bc6ea06456d211cda4ede80390fdf7c9b67a0f0559a6772a8225cc552b2844fb28e33ea11220b6
+  data.tar.gz: 711718da0cb66cd42457c657f58fc29450049094a1f6bf9012557a3b484dc59ca2d66f45bbf9c2c716597779a084fc59ab7fb15730fbac4648ac47823291d9c4

data/lib/pinot/transport.rb

@@ -9,11 +9,14 @@ module Pinot
     MAX_POOL_SIZE = 5
     KEEP_ALIVE_TIMEOUT = 30
 
+    PoolEntry = Struct.new(:http, :checked_in_at)
+
     def initialize(timeout: nil, tls_config: nil)
       @timeout = timeout
       @tls_config = tls_config
       @pool = {}
       @pool_mutex = Mutex.new
+      @reaper = start_reaper
     end
 
     def post(url, body:, headers: {})
@@ -52,20 +55,61 @@ module Pinot
     end
 
     def checkout(key, uri)
-      @pool_mutex.synchronize { @pool[key]&.pop } || new_connection(uri)
+      now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      http = @pool_mutex.synchronize do
+        entries = @pool[key] ||= []
+        fresh = nil
+        while (entry = entries.pop)
+          if now - entry.checked_in_at < KEEP_ALIVE_TIMEOUT
+            fresh = entry.http
+            break
+          else
+            entry.http.finish rescue nil
+          end
+        end
+        fresh
+      end
+      http || new_connection(uri)
     end
 
     def checkin(key, http)
       @pool_mutex.synchronize do
         pool_for_key = @pool[key] ||= []
         if pool_for_key.size < MAX_POOL_SIZE
-          pool_for_key.push(http)
+          pool_for_key.push(PoolEntry.new(http, Process.clock_gettime(Process::CLOCK_MONOTONIC)))
         else
           http.finish rescue nil
         end
       end
     end
 
+    def start_reaper
+      t = Thread.new do
+        loop do
+          sleep KEEP_ALIVE_TIMEOUT / 2.0
+          reap_stale_connections
+        end
+      end
+      t.abort_on_exception = false
+      t
+    end
+
+    def reap_stale_connections
+      now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      @pool_mutex.synchronize do
+        @pool.each_value do |entries|
+          entries.reject! do |entry|
+            if now - entry.checked_in_at >= KEEP_ALIVE_TIMEOUT
+              entry.http.finish rescue nil
+              true
+            else
+              false
+            end
+          end
+        end
+      end
+    end
+
     def new_connection(uri)
       http = Net::HTTP.new(uri.host, uri.port)
       configure_ssl(http, uri)

data/lib/pinot/version.rb

@@ -1,3 +1,3 @@
 module Pinot
-  VERSION = "1.8.0"
+  VERSION = "1.10.0"
 end

data/lib/pinot.rb

@@ -22,9 +22,9 @@ require_relative "pinot/connection"
 require_relative "pinot/prepared_statement"
 require_relative "pinot/connection_factory"
 
+require_relative "pinot/grpc_config"
 begin
   require_relative "pinot/grpc_transport"
-  require_relative "pinot/grpc_config"
 rescue LoadError
   # grpc gem not available; GrpcTransport disabled
 end

metadata

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