presto-client 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7db20f4ae1e231e427180f5067f11b081ee3c72d
-  data.tar.gz: 45e90ed802562a7dd1ebeb615223d63950deec75
+  metadata.gz: fc11fc0cab121eb735018084081c77fa034847f6
+  data.tar.gz: 19812b673f76893200f7b691444176a06b995bf7
 SHA512:
-  metadata.gz: 5dd22c3b79f93026c6399fbe2192648f7bf7b98ec2071e5dd283b55251c9366dd29b18418d918a2755bbb222793c2c03e642acbd6f772ca02d991490c3736439
-  data.tar.gz: d4c5c70aabb19e5137d447308eccc597c80dc65d50a9ad0b53aa943d7f87d6b1cba37e4d21dfa042fb1135a0a3207726dcac7678feb0ccd46819c9971486e157
+  metadata.gz: 4494d03f05cf329625eeeaca2762e8ce2bd75a3d1689ad0e7a7714f63d9efb9525f41cf42a18d66e15cdde4a798fb8b97ac55fe028c86b2f307959da8f794855
+  data.tar.gz: 9f069548587f6bb5a8beae83a654afae3ad97f91616be7fda724e5379d42ebde8e38a4574c743e2ef1f224e32cbffc9414a916ec9b1c1affa9757f65532f2b2f

data/ChangeLog

@@ -1,3 +1,38 @@
+2017-05-15 version 0.5.4:
+
+* Support "Content-Type: application/x-msgpack" for more efficient parsing of
+  HTTP response body.
+* Added "enable_x_msgpack: true" option to send Accept header with
+  application/x-msgpack.
+
+
+2017-04-26 version 0.5.3:
+
+* Added support for model version 0.173.
+* Changed the default latest model version to 0.173.
+* Fixed compatibility with the new major version of Farady
+* Require Faraday 0.12 or later
+
+
+2017-02-01 version 0.5.2:
+
+* Relax dependent version of Faraday to be able to use all 0.x versions.
+* Fix build script that was broken due to new major version of rake.
+
+
+2016-11-01 version 0.5.1:
+
+* Assume ConnectorId as a primitive type to be able to decode "connectorId"
+  fields.
+
+
+2016-10-28 version 0.5.0:
+
+* Support multiple model versions
+* Added support for model version 0.153.
+* Changed the default latest model version to 0.513.
+
+
 2016-08-09 version 0.4.17:
 
 * Added support for :ssl option.

data/README.md

@@ -92,3 +92,13 @@ $ bundle exec rake modelgen:latest
 
 See [RDoc](http://www.rubydoc.info/gems/presto-client/) for the full documentation.
 
+## Development
+
+### Releasing a new version
+
+1. Update lib/presto/client/version.rb
+2. Update ChangeLog
+3. git commit -am "vX.Y.Z"
+4. git tag "vX.Y.Z"
+5. git push --tags
+

data/lib/presto/client/query.rb

@@ -30,7 +30,6 @@ module Presto::Client
     end
 
     def self.faraday_client(options)
-
       server = options[:server]
       unless server
         raise ArgumentError, ":server option is required"

data/lib/presto/client/statement_client.rb

@@ -16,6 +16,7 @@
 module Presto::Client
 
   require 'multi_json'
+  require 'msgpack'
   require 'presto/client/models'
   require 'presto/client/errors'
 
@@ -57,8 +58,8 @@ module Presto::Client
       @faraday.headers.merge!(optional_headers)
 
       if next_uri
-        body = faraday_get_with_retry(next_uri)
-        @results = @models::QueryResults.decode(MultiJson.load(body))
+        response = faraday_get_with_retry(next_uri)
+        @results = @models::QueryResults.decode(parse_body(response))
       else
         post_query_request!
       end
@@ -87,6 +88,13 @@ module Presto::Client
       if v = @options[:properties]
         headers[PrestoHeaders::PRESTO_SESSION] = encode_properties(v)
       end
+      if @options[:enable_x_msgpack]
+        # option name is enable_"x"_msgpack because "Accept: application/x-msgpack" header is
+        # not officially supported by Presto. We can use this option only if a proxy server
+        # decodes & encodes response body. Once this option is supported by Presto, option
+        # name should be enable_msgpack, which might be slightly different behavior.
+        headers['Accept'] = 'application/x-msgpack,application/json'
+      end
       headers
     end
 
@@ -110,11 +118,10 @@ module Presto::Client
 
       # TODO error handling
       if response.status != 200
-        raise PrestoHttpError.new(response.status, "Failed to start query: #{response.body}")
+        raise PrestoHttpError.new(response.status, "Failed to start query: #{response.body} (#{response.status})")
       end
 
-      body = response.body
-      @results = load_json(uri, body, @models::QueryResults)
+      @results = decode_model(uri, parse_body(response), @models::QueryResults)
     end
 
     private :post_query_request!
@@ -157,20 +164,19 @@ module Presto::Client
       end
       uri = @results.next_uri
 
-      body = faraday_get_with_retry(uri)
-      @results = load_json(uri, body, @models::QueryResults)
+      response = faraday_get_with_retry(uri)
+      @results = decode_model(uri, parse_body(response), @models::QueryResults)
 
       return true
     end
 
     def query_info
       uri = "/v1/query/#{@results.id}"
-      body = faraday_get_with_retry(uri)
-      load_json(uri, body, @models::QueryInfo)
+      response = faraday_get_with_retry(uri)
+      decode_model(uri, parse_body(response), @models::QueryInfo)
     end
 
-    def load_json(uri, body, body_class)
-      hash = MultiJson.load(body)
+    def decode_model(uri, hash, body_class)
       begin
         body_class.decode(hash)
       rescue => e
@@ -182,7 +188,18 @@ module Presto::Client
       end
     end
 
-    private :load_json
+    private :decode_model
+
+    def parse_body(response)
+      case response.headers['Content-Type']
+      when 'application/x-msgpack'
+        MessagePack.load(response.body)
+      else
+        MultiJson.load(response.body)
+      end
+    end
+
+    private :parse_body
 
     def faraday_get_with_retry(uri, &block)
       start = Time.now
@@ -201,7 +218,7 @@ module Presto::Client
 
         if response
           if response.status == 200 && !response.body.to_s.empty?
-            return response.body
+            return response
           end
 
           if response.status != 503  # retry only if 503 Service Unavailable

data/lib/presto/client/version.rb

@@ -15,6 +15,6 @@
 #
 module Presto
   module Client
-    VERSION = "0.5.3"
+    VERSION = "0.5.4"
   end
 end

data/presto-client.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "faraday", ["~> 0.12"]
   gem.add_dependency "multi_json", ["~> 1.0"]
+  gem.add_dependency "msgpack", [">= 0.7.0"]
 
   gem.add_development_dependency "rake", [">= 0.9.2", "< 11.0"]
   gem.add_development_dependency "rspec", ["~> 2.13.0"]

data/spec/statement_client_spec.rb

@@ -82,6 +82,40 @@ describe Presto::Client::StatementClient do
     retry_p.should be_true
   end
 
+  it "uses 'Accept: application/x-msgpack' if option is set" 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: "),
+              "Accept" => "application/x-msgpack,application/json"
+    }).to_return(body: MessagePack.dump(response_json2), headers: {"Content-Type" => "application/x-msgpack"})
+
+    stub_request(:get, "localhost/v1/next_uri").
+      with(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: "),
+              "Accept" => "application/x-msgpack,application/json"
+    }).to_return(body: lambda{|req|if retry_p; MessagePack.dump(response_json); else; retry_p=true; raise Timeout::Error.new("execution expired"); end }, headers: {"Content-Type" => "application/x-msgpack"})
+
+    faraday = Faraday.new(url: "http://localhost")
+    sc = StatementClient.new(faraday, query, options.merge(http_open_timeout: 1, enable_x_msgpack: "application/x-msgpack"))
+    sc.has_next?.should be_true
+    sc.advance.should be_true
+    retry_p.should be_true
+  end
+
   it "decodes DeleteHandle" do
     dh = Models::DeleteHandle.decode({
       "handle" => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: presto-client
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Presto client library