presto-client 0.6.2 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3dacca9fb546a0a9d8dc52d68c7fdaad0162dd79eba01a7f191da66b6c70fa5
-  data.tar.gz: 3440572020360608b0dab2ebfc5cf29e8de0482b5e4becbe48c6905078cd7161
+  metadata.gz: cb8d9b811cc73d3512f5944e4979ca5ee5f20d94b7f9e02b3a2344b78844ee86
+  data.tar.gz: 37779cf08f92eb6d208767bf1cd8886764d26196b1438705d1f87b08bb227c9d
 SHA512:
-  metadata.gz: d6776d64325948b52a4c7b99ba6b57022a1828ca1a225ba524f1d801cdfe70aa5362d936f8d430f6ffc349498ce84f0489b140f694c9510737f4890c5a3553e1
-  data.tar.gz: 841ddd0e1d0470a7451486fdb2809fc33b3d71ae620ed8d88d8d8a00ce6df998e1720692f4f67d61e1883e6be4695cac204c45434d0be80dfc295ef3fea34e7a
+  metadata.gz: a4580bf4bc791612986c9f0b6f361bcc06d3211a775c80c86962c6edfeadae6b06d19df30a12b9b32017e0859f93ca06a334d185a0cf6a1b7ebf2361b53c2960
+  data.tar.gz: 3f87d41d12c34e6e902fa48f3153d1981f0851fc26437d23bab857c1052d76a8ee9b04f9db7b755781923bed338f0d7c4935a2fe94cadaf6f59bc9b5d1ba1bdb

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @treasure-data/mpp

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+# Purpose
+
+Briefly describe the purpose of the pull request.
+
+# Overview
+
+Describe the list of work you have done in this pull request.
+
+Example:
+- Add something
+- Remove other things
+
+# Checklist
+
+- [ ] Code compiles correctly
+- [ ] Created tests which fail without the change (if possible)
+- [ ] All tests passing
+- [ ] Extended the README / documentation, if necessary

data/.travis.yml

@@ -1,12 +1,14 @@
 rvm:
-  - 2.3.8
-  - 2.4.9
   - 2.5.7
   - 2.6.5
+  - 2.7.0
 
 script: "bundle exec rake spec"
 
 sudo: false
 
+services:
+  - docker
+
 notifications:
   webhooks: http://td-beda.herokuapp.com/travisci_callback

data/ChangeLog.md

@@ -1,5 +1,26 @@
 presto-client-ruby
 ====
+## 0.6.6
+* Added error_type and error_location field at PrestoQueryError
+
+## 0.6.5
+- Add gzip option ([#68](https://github.com/treasure-data/presto-client-ruby/issues/68)) [[1f43629](https://github.com/treasure-data/presto-client-ruby/commit/1f43629)]
+- Bump tiny-presto to 0.0.7 to use docker image in GitHub Container Registry ([#69](https://github.com/treasure-data/presto-client-ruby/issues/69)) [[57b5045](https://github.com/treasure-data/presto-client-ruby/commit/57b5045)]
+
+## 0.6.4
+- Merge pull request [#67](https://github.com/treasure-data/presto-client-ruby/issues/67) from takezoe/update-readme-follow-redirect-option [[6da5025](https://github.com/treasure-data/presto-client-ruby/commit/6da5025)]
+- Update README.md to describe follow_redirect option [[83f8a05](https://github.com/treasure-data/presto-client-ruby/commit/83f8a05)]
+- Merge pull request [#66](https://github.com/treasure-data/presto-client-ruby/issues/66) from takezoe/follow-redirect-option [[9f1b297](https://github.com/treasure-data/presto-client-ruby/commit/9f1b297)]
+- Update lib/presto/client/faraday_client.rb [[64c0b81](https://github.com/treasure-data/presto-client-ruby/commit/64c0b81)]
+- Add follow_redirect option [[a103660](https://github.com/treasure-data/presto-client-ruby/commit/a103660)]
+- Create CODEOWNERS [[c8c3251](https://github.com/treasure-data/presto-client-ruby/commit/c8c3251)]
+
+## 0.6.3
+- Merge pull request [#56](https://github.com/treasure-data/presto-client-ruby/issues/56) from miniway/more_recent_statementclient [[423ff42](https://github.com/treasure-data/presto-client-ruby/commit/423ff42)]
+- Make more similar to recent java StatementClient [[94f5193](https://github.com/treasure-data/presto-client-ruby/commit/94f5193)]
+- Test with presto docker container ([#62](https://github.com/treasure-data/presto-client-ruby/issues/62)) [[fe8af11](https://github.com/treasure-data/presto-client-ruby/commit/fe8af11)]
+- Add pull request template [[7b286cc](https://github.com/treasure-data/presto-client-ruby/commit/7b286cc)]
+
 ## 0.6.2
 - Release 0.6.2 [[68f5b27](https://github.com/treasure-data/presto-client-ruby/commit/68f5b27)]
 - Merge pull request [#61](https://github.com/treasure-data/presto-client-ruby/issues/61) from treasure-data/implement_query_id [[6f3f236](https://github.com/treasure-data/presto-client-ruby/commit/6f3f236)]

data/Gemfile

@@ -1,2 +1,6 @@
 source 'https://rubygems.org/'
 gemspec
+
+group :development, :test do
+  gem 'tiny-presto', '~> 0.0.7'
+end

data/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,6 +1,6 @@
 # Presto client library for Ruby
 
-[![Build Status](https://travis-ci.org/treasure-data/presto-client-ruby.svg?branch=master)](https://travis-ci.org/treasure-data/presto-client-ruby)
+[![Build Status](https://travis-ci.org/treasure-data/presto-client-ruby.svg?branch=master)](https://travis-ci.org/treasure-data/presto-client-ruby) [![Gem](https://img.shields.io/gem/v/presto-client)](https://rubygems.org/gems/presto-client) [![Gem](https://img.shields.io/gem/dt/presto-client)](https://rubygems.org/gems/presto-client) [![GitHub](https://img.shields.io/github/license/treasure-data/presto-client-ruby)]()
 
 Presto is a distributed SQL query engine for big data:
 https://prestosql.io/
@@ -27,7 +27,7 @@ client = Presto::Client.new(
     "raptor.reader_stream_buffer_size": "32MB"
   },
   http_proxy: "proxy.example.com:8080",
-  http_debug: true,
+  http_debug: true
 )
 
 # run a query and get results as an array of arrays:
@@ -101,6 +101,8 @@ $ bundle exec rake modelgen:latest
 * **http_debug** enables debug message to STDOUT for each HTTP requests.
 * **http_open_timeout** sets timeout in seconds to open new HTTP connection.
 * **http_timeout** sets timeout in seconds to read data from a server.
+* **gzip** enables gzip compression.
+* **follow_redirect** enables HTTP redirection support.
 * **model_version** set the presto version to which a job is submitted. Supported versions are 316, 303, 0.205, 0.178, 0.173, 0.153 and 0.149. Default is 316.
 
 See [RDoc](http://www.rubydoc.info/gems/presto-client/) for the full documentation.
@@ -109,8 +111,21 @@ See [RDoc](http://www.rubydoc.info/gems/presto-client/) for the full documentati
 
 ### 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
+1. First update `lib/presto/client/version.rb` to the next version.
+2. Run the following command which will update `ChangeLog.md` file automatically.
+```
+$ ruby release.rb
+```
+
+3. Create tag
+```
+$ git commit -am "vX.Y.Z"
+$ git tag "vX.Y.Z"
+% git push --tags
+```
+
+4. Push package
+```
+$ gem build presto-client.gemspec
+$ gem push presto-client-X.Y.Z.gem
+```

data/lib/presto/client/errors.rb

@@ -30,15 +30,17 @@ module Presto::Client
   end
 
   class PrestoQueryError < PrestoError
-    def initialize(message, query_id, error_code, error_name, failure_info)
+    def initialize(message, query_id, error_code, error_name, error_type, error_location, failure_info)
       super(message)
       @query_id = query_id
       @error_code = error_code
       @error_name = error_name
+      @error_type = error_type
+      @error_location = error_location
       @failure_info = failure_info
     end
 
-    attr_reader :error_code, :error_name, :failure_info
+    attr_reader :error_code, :error_name, :error_type, :error_location, :failure_info
   end
 
   class PrestoQueryTimeoutError < PrestoError

data/lib/presto/client/faraday_client.rb

@@ -60,7 +60,12 @@ module Presto::Client
       if options[:user] && options[:password]
         faraday.basic_auth(options[:user], options[:password])
       end
-
+      if options[:follow_redirect]
+        faraday.use FaradayMiddleware::FollowRedirects
+      end
+      if options[:gzip]
+        faraday.use FaradayMiddleware::Gzip
+      end
       faraday.response :logger if options[:http_debug]
       faraday.adapter Faraday.default_adapter
     end

data/lib/presto/client/query.rb

@@ -16,6 +16,7 @@
 module Presto::Client
 
   require 'faraday'
+  require 'faraday_middleware'
   require 'presto/client/models'
   require 'presto/client/errors'
   require 'presto/client/faraday_client'
@@ -130,15 +131,12 @@ module Presto::Client
     end
 
     def raise_if_failed
-      if @api.closed?
+      if @api.client_aborted?
         raise PrestoClientError, "Query aborted by user"
-      elsif @api.exception?
-        # query is gone
-        raise @api.exception
       elsif @api.query_failed?
         results = @api.current_results
         error = results.error
-        raise PrestoQueryError.new("Query #{results.id} failed: #{error.message}", results.id, error.error_code, error.error_name, error.failure_info)
+        raise PrestoQueryError.new("Query #{results.id} failed: #{error.message}", results.id, error.error_code, error.error_name, error.error_type, error.error_location, error.failure_info)
       end
     end
   end

data/lib/presto/client/statement_client.rb

@@ -31,8 +31,7 @@ module Presto::Client
 
       @options = options
       @query = query
-      @closed = false
-      @exception = nil
+      @state = :running
       @retry_timeout = options[:retry_timeout] || 120
       if model_version = @options[:model_version]
         @models = ModelVersions.const_get("V#{model_version.gsub(".", "_")}")
@@ -76,7 +75,7 @@ module Presto::Client
 
       # TODO error handling
       if response.status != 200
-        raise PrestoHttpError.new(response.status, "Failed to start query: #{response.body} (#{response.status})")
+        exception! PrestoHttpError.new(response.status, "Failed to start query: #{response.body} (#{response.status})")
       end
 
       @results_headers = response.headers
@@ -91,14 +90,20 @@ module Presto::Client
       !!@options[:debug]
     end
 
-    def closed?
-      @closed
+    def running?
+      @state == :running
     end
 
-    attr_reader :exception
+    def client_aborted?
+      @state == :client_aborted
+    end
+
+    def client_error?
+      @state == :client_error
+    end
 
-    def exception?
-      @exception
+    def finished?
+      @state == :finished
     end
 
     def query_failed?
@@ -106,7 +111,7 @@ module Presto::Client
     end
 
     def query_succeeded?
-      @results.error == nil && !@exception && !@closed
+      @results.error == nil && finished?
     end
 
     def current_results
@@ -125,12 +130,21 @@ module Presto::Client
       !!@results.next_uri
     end
 
+    def exception!(e)
+      @state = :client_error
+      raise e
+    end
+
     def advance
-      if closed? || !has_next?
+      return false unless running?
+
+      unless has_next?
+        @state = :finished
         return false
       end
 
       uri = @results.next_uri
+
       response = faraday_get_with_retry(uri)
       @results_headers = response.headers
       @results = decode_model(uri, parse_body(response), @models::QueryResults)
@@ -154,8 +168,7 @@ module Presto::Client
         if body.size > 1024 + 3
           body = "#{body[0, 1024]}..."
         end
-        @exception = PrestoHttpError.new(500, "Presto API returned unexpected structure at #{uri}. Expected #{body_class} but got #{body}: #{e}")
-        raise @exception
+        exception! PrestoHttpError.new(500, "Presto API returned unexpected structure at #{uri}. Expected #{body_class} but got #{body}: #{e}")
       end
     end
 
@@ -170,8 +183,7 @@ module Presto::Client
           JSON.parse(response.body, opts = JSON_OPTIONS)
         end
       rescue => e
-        @exception = PrestoHttpError.new(500, "Presto API returned unexpected data format. #{e}")
-        raise @exception
+        exception! PrestoHttpError.new(500, "Presto API returned unexpected data format. #{e}")
       end
     end
 
@@ -188,8 +200,7 @@ module Presto::Client
           # temporally error to retry
           response = nil
         rescue => e
-          @exception = e
-          raise @exception
+          exception! e
         end
 
         if response
@@ -199,8 +210,7 @@ module Presto::Client
 
           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
+            exception! PrestoHttpError.new(response.status, "Presto API error at #{uri} returned #{response.status}: #{response.body}")
           end
         end
 
@@ -208,18 +218,14 @@ module Presto::Client
 
         attempts += 1
         sleep attempts * 0.1
-      end while (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start) < @retry_timeout && !@closed
+      end while (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start) < @retry_timeout && !client_aborted?
 
-      @exception = PrestoHttpError.new(408, "Presto API error due to timeout")
-      raise @exception
+      exception! PrestoHttpError.new(408, "Presto API error due to timeout")
     end
 
     def raise_if_timeout!
       if @started_at
-        if @results && @results.next_uri == nil
-          # query is already done
-          return
-        end
+        return if finished?
 
         elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - @started_at
 
@@ -238,9 +244,9 @@ module Presto::Client
 
     def raise_timeout_error!
       if query_id = @results && @results.id
-        raise PrestoQueryTimeoutError, "Query #{query_id} timed out"
+        exception! PrestoQueryTimeoutError.new("Query #{query_id} timed out")
       else
-        raise PrestoQueryTimeoutError, "Query timed out"
+        exception! PrestoQueryTimeoutError.new("Query timed out")
       end
     end
 
@@ -253,7 +259,9 @@ module Presto::Client
     end
 
     def close
-      return if @closed
+      return unless running?
+
+      @state = :client_aborted
 
       begin
         if uri = @results.next_uri
@@ -264,7 +272,6 @@ module Presto::Client
       rescue => e
       end
 
-      @closed = true
       nil
     end
   end

data/lib/presto/client/version.rb

@@ -15,6 +15,6 @@
 #
 module Presto
   module Client
-    VERSION = "0.6.2"
+    VERSION = "0.6.6"
   end
 end

data/presto-client.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 1.9.1"
 
   gem.add_dependency "faraday", ["~> 0.12"]
+  gem.add_dependency "faraday_middleware", ["~> 0.12.2"]
     gem.add_dependency "msgpack", [">= 0.7.0"]
 
   gem.add_development_dependency "rake", [">= 0.9.2", "< 11.0"]

data/release.rb

@@ -17,8 +17,6 @@ abort("Can't use empty version string") if next_version.empty?
 logs = `git log #{last_tag}..HEAD --pretty=format:'%h %s'`
 # Add links to GitHub issues
 logs = logs.gsub(/\#([0-9]+)/, "[#\\1](#{PREFIX}/issues/\\1)")
-# Add links to JIRA tickets (e.g,. MPP-xxxx, PLT-xxxx)
-logs = logs.gsub(/^([A-Z]{2,}+-[0-9]+):/, '[\1](https://treasure-data.atlassian.net/browse/\1):')
 
 new_release_notes = []
 new_release_notes <<= "\#\# #{next_version}\n"

data/spec/basic_query_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe Presto::Client::Client do
+  before(:all) do
+    WebMock.disable!
+    @cluster = TinyPresto::Cluster.new('ghcr.io/trinodb/presto', '316')
+    @container = @cluster.run
+    @client = Presto::Client.new(server: 'localhost:8080', catalog: 'memory', user: 'test-user', schema: 'default')
+    loop do
+      begin
+        @client.run('show schemas')
+        break
+      rescue StandardError => exception
+        puts "Waiting for cluster ready... #{exception}"
+        sleep(3)
+      end
+    end
+    puts 'Cluster is ready'
+  end
+
+  after(:all) do
+    @cluster.stop
+    WebMock.enable!
+  end
+
+  it 'show schemas' do
+    columns, rows = run_with_retry(@client, 'show schemas')
+    expect(columns.length).to be(1)
+    expect(rows.length).to be(2)
+  end
+
+  it 'ctas' do
+    expected = [[1, 'a'], [2, 'b']]
+    run_with_retry(@client, "create table ctas1 as select * from (values (1, 'a'), (2, 'b')) t(c1, c2)")
+    columns, rows = run_with_retry(@client, 'select * from ctas1')
+    expect(columns.map(&:name)).to match_array(%w[c1 c2])
+    expect(rows).to eq(expected)
+  end
+
+  it 'next_uri' do
+    @client.query('show schemas') do |q|
+      expect(q.next_uri).to start_with('http://localhost:8080/v1/statement/')
+    end
+  end
+
+  it 'advance' do
+    @client.query('show schemas') do |q|
+      expect(q.advance).to be(true)
+    end
+  end
+
+  it 'current query result' do
+    @client.query('show schemas') do |q|
+      expect(q.current_results.info_uri).to start_with('http://localhost:8080/ui/query.html')
+    end
+  end
+
+  it 'statement stats' do
+    @client.query('show schemas') do |q|
+      stats = q.current_results.stats
+      # Immediate subsequent request should get queued result
+      expect(stats.queued).to be(true)
+      expect(stats.scheduled).to be(false)
+    end
+  end
+
+  it 'partial cancel' do
+    @client.query('show schemas') do |q|
+      q.cancel
+      expect { q.query_info }.to raise_error(Presto::Client::PrestoHttpError, /Error 410 Gone/)
+    end
+  end
+
+  it 'row chunk' do
+    expected_schemas = %w[default information_schema]
+    @client.query('show schemas') do |q|
+      q.each_row do |r|
+        expect(expected_schemas).to include(r[0])
+      end
+    end
+  end
+end

data/spec/gzip_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Presto::Client::Client do
+  before(:all) do
+    @spec_path = File.dirname(__FILE__)
+    WebMock.disable!
+    @cluster = TinyPresto::Cluster.new('ghcr.io/trinodb/presto', '316')
+    @container = @cluster.run
+    @client = Presto::Client.new(server: 'localhost:8080', catalog: 'tpch', user: 'test-user', schema: 'tiny', gzip: true, http_debug: true)
+    loop do
+      begin
+        # Make sure to all workers are available.
+        @client.run('select 1234')
+        break
+      rescue StandardError => exception
+        puts "Waiting for cluster ready... #{exception}"
+        sleep(5)
+      end
+    end
+    puts 'Cluster is ready'
+  end
+
+  after(:all) do
+    @cluster.stop
+    WebMock.enable!
+  end
+
+  it 'tpch q01 with gzip option' do
+    $stdout = StringIO.new
+    begin
+      q = File.read("#{@spec_path}/tpch/q01.sql")
+      columns, rows = run_with_retry(@client, q)
+      expect(columns.length).to be(10)
+      expect(rows.length).to be(4)
+      expect($stdout.string).to include ('content-encoding: "gzip"')
+    ensure
+      $stdout = STDOUT
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -16,3 +16,27 @@ require 'webmock/rspec'
 
 require 'presto-client'
 include Presto::Client
+
+require 'tiny-presto'
+
+MAX_RETRY_COUNT = 5
+RETRYABLE_ERRORS = [
+  /No nodes available to run query/
+]
+
+def run_with_retry(client, sql)
+  i = 0
+  while i < MAX_RETRY_COUNT
+    begin
+      columns, rows = @client.run(sql)
+      return columns, rows
+    rescue Presto::Client::PrestoQueryError => e
+      if RETRYABLE_ERRORS.any? { |error| e.message =~ error }
+        sleep(i)
+        i += 1
+        next
+      end
+      raise "Fail to run query: #{e}"
+    end
+  end
+end

data/spec/statement_client_spec.rb

@@ -10,6 +10,7 @@ describe Presto::Client::StatementClient do
       time_zone: "US/Pacific",
       language: "ja_JP",
       debug: true,
+      follow_redirect: true
     }
   end
 
@@ -138,6 +139,27 @@ describe Presto::Client::StatementClient do
         })
       end.should raise_error(TypeError, /String to Hash/)
     end
+  else
+    it "decodes DeleteTarget" do
+      dh = Models::DeleteTarget.decode({
+        "handle" => {
+          "catalogName" => "c1",
+          "connectorHandle" => {}
+        }
+      })
+      dh.handle.should be_a_kind_of Models::TableHandle
+      dh.handle.catalog_name.should == "c1"
+      dh.handle.connector_handle.should == {}
+    end
+
+    it "validates models" do
+      lambda do
+        Models::DeleteTarget.decode({
+          "catalogName" => "c1",
+          "handle" => "invalid"
+        })
+      end.should raise_error(TypeError, /String to Hash/)
+    end
   end
 
   it "receives headers of POST" do
@@ -208,6 +230,19 @@ describe Presto::Client::StatementClient do
         statement_client.query_info
       end.should raise_error(PrestoHttpError, /Presto API returned unexpected data format./)
     end
+
+    it "is redirected if server returned 301" do
+      stub_request(:get, "http://localhost/v1/query/#{response_json2[:id]}").
+        with(headers: headers).
+        to_return(status: 301, headers: {"Location" => "http://localhost/v1/query/redirected"})
+      
+      stub_request(:get, "http://localhost/v1/query/redirected").
+        with(headers: headers).
+        to_return(body: {"queryId" => "queryid"}.to_json)
+
+      query_info = statement_client.query_info
+      query_info.query_id.should == "queryid"
+    end
   end
 
   describe "Killing a query" do
@@ -588,11 +623,13 @@ describe Presto::Client::StatementClient do
         to_return(body: early_running_response.to_json)
       client.advance
 
-      sleep 1
       stub_request(:get, "localhost/v1/next_uri").
         with(headers: headers).
         to_return(body: done_response.to_json)
-      client.advance
+      client.advance # set finished
+
+      sleep 1
+      client.advance # set finished
     end
 
   end

data/spec/tpch/q01.sql

@@ -0,0 +1,21 @@
+SELECT
+  l.returnflag,
+  l.linestatus,
+  sum(l.quantity)                                       AS sum_qty,
+  sum(l.extendedprice)                                  AS sum_base_price,
+  sum(l.extendedprice * (1 - l.discount))               AS sum_disc_price,
+  sum(l.extendedprice * (1 - l.discount) * (1 + l.tax)) AS sum_charge,
+  avg(l.quantity)                                       AS avg_qty,
+  avg(l.extendedprice)                                  AS avg_price,
+  avg(l.discount)                                       AS avg_disc,
+  count(*)                                              AS count_order
+FROM
+  "tpch"."tiny"."lineitem" AS l
+WHERE
+  l.shipdate <= DATE '1998-12-01' - INTERVAL '90' DAY
+GROUP BY
+  l.returnflag,
+  l.linestatus
+ORDER BY
+  l.returnflag,
+  l.linestatus

data/spec/tpch/q02.sql

@@ -0,0 +1,43 @@
+SELECT
+  s.acctbal,
+  s.name,
+  n.name,
+  p.partkey,
+  p.mfgr,
+  s.address,
+  s.phone,
+  s.comment
+FROM
+  "tpch"."tiny"."part" p,
+  "tpch"."tiny"."supplier" s,
+  "tpch"."tiny"."partsupp" ps,
+  "tpch"."tiny"."nation" n,
+  "tpch"."tiny"."region" r
+WHERE
+  p.partkey = ps.partkey
+  AND s.suppkey = ps.suppkey
+  AND p.size = 15
+  AND p.type like '%BRASS'
+  AND s.nationkey = n.nationkey
+  AND n.regionkey = r.regionkey
+  AND r.name = 'EUROPE'
+  AND ps.supplycost = (
+    SELECT
+      min(ps.supplycost)
+    FROM
+      "tpch"."tiny"."partsupp" ps,
+      "tpch"."tiny"."supplier" s,
+      "tpch"."tiny"."nation" n,
+      "tpch"."tiny"."region" r
+    WHERE
+      p.partkey = ps.partkey
+      AND s.suppkey = ps.suppkey
+      AND s.nationkey = n.nationkey
+      AND n.regionkey = r.regionkey
+      AND r.name = 'EUROPE'
+  )
+ORDER BY
+  s.acctbal desc,
+  n.name,
+  s.name,
+  p.partkey

data/spec/tpch_query_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Presto::Client::Client do
+  before(:all) do
+    @spec_path = File.dirname(__FILE__)
+    WebMock.disable!
+    @cluster = TinyPresto::Cluster.new('ghcr.io/trinodb/presto', '316')
+    @container = @cluster.run
+    @client = Presto::Client.new(server: 'localhost:8080', catalog: 'tpch', user: 'test-user', schema: 'tiny')
+    loop do
+      begin
+        # Make sure to all workers are available.
+        @client.run('select 1234')
+        break
+      rescue StandardError => exception
+        puts "Waiting for cluster ready... #{exception}"
+        sleep(5)
+      end
+    end
+    puts 'Cluster is ready'
+  end
+
+  after(:all) do
+    @cluster.stop
+    WebMock.enable!
+  end
+
+  it 'q01' do
+    q = File.read("#{@spec_path}/tpch/q01.sql")
+    columns, rows = run_with_retry(@client, q)
+    expect(columns.length).to be(10)
+    expect(rows.length).to be(4)
+  end
+
+  it 'q02' do
+    q = File.read("#{@spec_path}/tpch/q02.sql")
+    columns, rows = run_with_retry(@client, q)
+    expect(columns.length).to be(8)
+    expect(rows.length).to be(4)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: presto-client
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.6
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -121,10 +135,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".travis.yml"
 - ChangeLog.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/presto-client.rb
@@ -149,10 +166,15 @@ files:
 - modelgen/presto_models.rb
 - presto-client.gemspec
 - release.rb
+- spec/basic_query_spec.rb
 - spec/client_spec.rb
+- spec/gzip_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
 - spec/statement_client_spec.rb
+- spec/tpch/q01.sql
+- spec/tpch/q02.sql
+- spec/tpch_query_spec.rb
 homepage: https://github.com/treasure-data/presto-client-ruby
 licenses:
 - Apache-2.0
@@ -172,13 +194,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Presto client library
 test_files:
+- spec/basic_query_spec.rb
 - spec/client_spec.rb
+- spec/gzip_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
 - spec/statement_client_spec.rb
+- spec/tpch/q01.sql
+- spec/tpch/q02.sql
+- spec/tpch_query_spec.rb