presto-client 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6de2a573aa133bee0d1d9401b019c1740152625
-  data.tar.gz: f956e6bbf6bdb2692b2da104aaccb67a0fcb01e8
+  metadata.gz: 50ef468b6baf6f10daa58ed8d4913317caed79f4
+  data.tar.gz: 0eff38ddec5f5a4a5b07adae1bff244537f487c7
 SHA512:
-  metadata.gz: 08efdcb4b4da96bfeeb0f52886c8290645233ff58dde635ff8a82a14ce0b13e57879612ca413ea4a5333b7e174519fafe0720d4204a58a357d23fa22b8750d70
-  data.tar.gz: 2fcdfcf3f3ad2f627b6a2577864f61c7d0f2d9c0801d5d5bd2286f95da8a3c3f976f9028b5bf6ea01bedf9f3cc18c1e5bfaac780a14ef08157dca2191a509708
+  metadata.gz: d1b162c629fef338f79cce11b704557266491b434bedef53e3b2d3960e2f79ebfc352e5b1b93d52d520fbe2508985e5dd54fbf2c731292ac11780bb9fb63efc6
+  data.tar.gz: d6dbd80fed2869cab60fc26d232bbdeee8c678b7441e75387d3706bf39aad87f1aef332f40ba519825d0096e3b71732562d27545dac68ddbf765859cbc0408ff

data/lib/presto/client/statement_client.rb

@@ -154,19 +154,24 @@ module Presto::Client
       begin
         begin
           response = @faraday.get(uri)
+        rescue Faraday::Error::TimeoutError, Faraday::Error::ConnectionFailed
+          # temporally error to retry
+          response = nil
         rescue => e
           @exception = e
           raise @exception
         end
 
-        if response.status == 200 && !response.body.to_s.empty?
-          return response.body
-        end
+        if response
+          if response.status == 200 && !response.body.to_s.empty?
+            return response.body
+          end
 
-        if response.status != 503  # retry only if 503 Service Unavailable
-          # deterministic error
-          @exception = PrestoHttpError.new(response.status, "Presto API error at #{uri} returned #{response.status}: #{response.body}")
-          raise @exception
+          if response.status != 503  # retry only if 503 Service Unavailable
+            # deterministic error
+            @exception = PrestoHttpError.new(response.status, "Presto API error at #{uri} returned #{response.status}: #{response.body}")
+            raise @exception
+          end
         end
 
         attempts += 1

data/lib/presto/client/version.rb

@@ -15,6 +15,6 @@
 #
 module Presto
   module Client
-    VERSION = "0.4.6"
+    VERSION = "0.4.7"
   end
 end

data/spec/statement_client_spec.rb

@@ -41,5 +41,39 @@ describe Presto::Client::StatementClient do
     faraday = Faraday.new(url: "http://localhost")
     StatementClient.new(faraday, query, options)
   end
+
+  let :response_json2 do
+    {
+      id: "queryid",
+      nextUri: 'http://localhost/v1/next_uri',
+      stats: {}
+    }
+  end
+
+  it "sets headers" do
+    retry_p = false
+    stub_request(:post, "localhost/v1/statement").
+      with(body: query,
+           headers: {
+              "User-Agent" => "presto-ruby/#{VERSION}",
+              "X-Presto-Catalog" => options[:catalog],
+              "X-Presto-Schema" => options[:schema],
+              "X-Presto-User" => options[:user],
+              "X-Presto-Language" => options[:language],
+              "X-Presto-Time-Zone" => options[:time_zone],
+              "X-Presto-Session" => options[:properties].map {|k,v| "#{k}=#{v}"}.join("\r\nX-Presto-Session: ")
+    }).to_return(body: response_json2.to_json)
+
+    stub_request(:get, "localhost/v1/next_uri").
+      with(headers: {
+              "User-Agent" => "presto-ruby/#{VERSION}",
+    }).to_return(body: lambda{|req|if retry_p; response_json.to_json; else; retry_p=true; raise Timeout::Error.new("execution expired"); end })
+
+    faraday = Faraday.new(url: "http://localhost")
+    sc = StatementClient.new(faraday, query, options.merge(http_open_timeout: 1))
+    sc.has_next?.should be_true
+    sc.advance.should be_true
+    retry_p.should be_true
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: presto-client
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Sadayuki Furuhashi