presto-client 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab5325ef43e73961c5e9736fe204f2a081e178c7
-  data.tar.gz: 6a168ca482d78e69760c032ebf2f92af37b1b18b
+  metadata.gz: 5c323f1555c8b8911022378e1b6b5c3ab32ea198
+  data.tar.gz: dad8f48273aa312ff3c89809698f6bf4955d54b1
 SHA512:
-  metadata.gz: 44eae00fff8f16da24337bb6b740b6e77e4212c8a28e62506146f15f0d2a2719f8703c81b3bccf6c932f3235cbf51e9a442686e835830db5bf57e4dcdf8d77b7
-  data.tar.gz: 79f2fd6d22e241de0ba42977eee74b669d90ccc419dd2d64bd593b723626735b419739bdab3da23f2c994f9fdd1cd3761f6167da123486b24d4f15692c35dd11
+  metadata.gz: 7ef2fa5dd5e59a1d5a68f064bf3af0cabbae98b72ab9c64764297491c60de03f5ce7a7f00b527f5763b8eb92bdf2f5ffe2a9c01c4dc57a1da17b0f6c773d6368
+  data.tar.gz: fe6c1fc26dff277531c8334b6feaf299b66f4cebdfc9b752ceda5e26c5edd3a4b95888c0b4292f22d526a364f61c1f1bcfb18f55c28e82b78e1bae32d9f2c35e

data/ChangeLog

@@ -1,3 +1,8 @@
+2017-08-28 version 0.5.7
+* Support a password option with HTTP basic auth
+* Changed retry timeout from hard coded 2h to configurable default 2min
+* Fix too deep nested json failure
+
 2017-07-03 version 0.5.6:
 * Added missing inner class models for version 0.178
 

data/README.md

@@ -19,6 +19,7 @@ client = Presto::Client.new(
   catalog: "native",
   schema: "default",
   user: "frsyuki",
+  password: "********",
   time_zone: "US/Pacific",
   language: "English",
   properties: {
@@ -81,6 +82,7 @@ $ bundle exec rake modelgen:latest
 * **schema** sets default schema name of Presto. You need to use qualified name like `FROM myschema.table1` to use non-default schemas.
 * **source** sets source name to connect to a Presto. This name is shown on Presto web interface.
 * **user** sets user name to connect to a Presto.
+* **password** sets a password to connect to Presto using basic auth.
 * **time_zone** sets time zone of queries. Time zone affects some functions such as `format_datetime`.
 * **language** sets language of queries. Language affects some functions such as `format_datetime`.
 * **properties** set session properties. Session properties affect internal behavior such as `hive.force_local_scheduling: true`, `raptor.reader_stream_buffer_size: "32MB"`, etc.

data/lib/presto/client/query.rb

@@ -37,6 +37,10 @@ module Presto::Client
 
       ssl = faraday_ssl_options(options)
 
+      if options[:password] && !ssl
+        raise ArgumentError, "Protocol must be https when passing a password"
+      end
+
       url = "#{ssl ? "https" : "http"}://#{server}"
       proxy = options[:http_proxy] || options[:proxy]  # :proxy is obsoleted
 
@@ -45,6 +49,11 @@ module Presto::Client
 
       faraday = Faraday.new(faraday_options) do |faraday|
         #faraday.request :url_encoded
+
+        if options[:user] && options[:password]
+          faraday.basic_auth(options[:user], options[:password])
+        end
+
         faraday.response :logger if options[:http_debug]
         faraday.adapter Faraday.default_adapter
       end

data/lib/presto/client/statement_client.rb

@@ -15,7 +15,7 @@
 #
 module Presto::Client
 
-  require 'multi_json'
+  require 'json'
   require 'msgpack'
   require 'presto/client/models'
   require 'presto/client/errors'
@@ -40,6 +40,11 @@ module Presto::Client
       "User-Agent" => "presto-ruby/#{VERSION}",
     }
 
+    # Presto can return too deep nested JSON
+    JSON_OPTIONS = {
+        :max_nesting => false
+    }
+
     def initialize(faraday, query, options, next_uri=nil)
       @faraday = faraday
       @faraday.headers.merge!(HEADERS)
@@ -48,7 +53,7 @@ module Presto::Client
       @query = query
       @closed = false
       @exception = nil
-
+      @retry_timeout = options[:retry_timeout] || 120
       if model_version = @options[:model_version]
         @models = ModelVersions.const_get("V#{model_version.gsub(".", "_")}")
       else
@@ -195,7 +200,7 @@ module Presto::Client
       when 'application/x-msgpack'
         MessagePack.load(response.body)
       else
-        MultiJson.load(response.body)
+        JSON.parse(response.body, opts = JSON_OPTIONS)
       end
     end
 
@@ -230,7 +235,7 @@ module Presto::Client
 
         attempts += 1
         sleep attempts * 0.1
-      end while (Time.now - start) < 2*60*60 && !@closed
+      end while (Time.now - start) < @retry_timeout && !@closed
 
       @exception = PrestoHttpError.new(408, "Presto API error due to timeout")
       raise @exception

data/lib/presto/client/version.rb

@@ -15,6 +15,6 @@
 #
 module Presto
   module Client
-    VERSION = "0.5.6"
+    VERSION = "0.5.7"
   end
 end

data/presto-client.gemspec

@@ -20,12 +20,11 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 1.9.1"
 
   gem.add_dependency "faraday", ["~> 0.12"]
-  gem.add_dependency "multi_json", ["~> 1.0"]
-  gem.add_dependency "msgpack", [">= 0.7.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"]
-  gem.add_development_dependency "webmock", ["~> 1.16.1"]
+  gem.add_development_dependency "webmock", ["~> 2.0.0"]
   gem.add_development_dependency "addressable", ["~> 2.4.0"] # 2.5.0 doesn't support Ruby 1.9.3
   gem.add_development_dependency "simplecov", ["~> 0.10.0"]
 end

data/spec/statement_client_spec.rb

@@ -136,6 +136,38 @@ describe Presto::Client::StatementClient do
     end.should raise_error(TypeError, /String to Hash/)
   end
 
+  describe 'HTTP basic auth' do
+    let(:password) { 'abcd' }
+
+    it "adds basic auth headers when ssl is enabled and a password is given" do
+      stub_request(:post, "https://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: ")
+            },
+            basic_auth: [options[:user], password]
+      ).to_return(body: response_json.to_json)
+
+      faraday = Query.__send__(:faraday_client, options.merge(ssl: { verify: true }, password: password))
+      StatementClient.new(faraday, query, options)
+    end
+
+    it "forbids using basic auth when ssl is disabled" do
+      lambda do
+        Query.__send__(:faraday_client, {
+          server: 'localhost',
+          password: 'abcd'
+        })
+      end.should raise_error(ArgumentError)
+    end
+  end
+
   describe "ssl" do
     it "is disabled by default" do
       f = Query.__send__(:faraday_client, {
@@ -230,5 +262,35 @@ describe Presto::Client::StatementClient do
       StatementClient.new(faraday, query, options.merge(model_version: "0.111"))
     end.should raise_error(NameError)
   end
+
+
+  let :nested_json do
+    nested_stats = {createTime: Time.now}
+    # JSON max nesting default value is 100
+    for i in 0..100 do
+      nested_stats = {stats: nested_stats}
+    end
+    {
+        id: "queryid",
+        stats: nested_stats
+    }
+  end
+
+  it "parse nested json properly" do
+    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: nested_json.to_json(:max_nesting => false))
+
+    faraday = Faraday.new(url: "http://localhost")
+    StatementClient.new(faraday, query, options)
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: presto-client
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.1
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Presto client library