presto-client 0.6.0 → 0.6.5

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
 
@@ -112,24 +113,53 @@ describe Presto::Client::StatementClient do
     retry_p.should be_true
   end
 
-  it "decodes DeleteHandle" do
-    dh = Models::DeleteHandle.decode({
-      "handle" => {
-        "connectorId" => "c1",
-        "connectorHandle" => {}
-      }
-    })
-    dh.handle.should be_a_kind_of Models::TableHandle
-    dh.handle.connector_id.should == "c1"
-    dh.handle.connector_handle.should == {}
-  end
+  # presto version could be "V0_ddd" or "Vddd"
+  /\APresto::Client::ModelVersions::V(\w+)/ =~ Presto::Client::Models.to_s
+
+  # https://github.com/prestosql/presto/commit/80a2c5113d47e3390bf6dc041486a1c9dfc04592
+  # renamed DeleteHandle to DeleteTarget, then DeleteHandle exists when presto version
+  # is less than 313.
+  if $1[0, 2] == "0_" || $1.to_i < 314
+    it "decodes DeleteHandle" do
+      dh = Models::DeleteHandle.decode({
+        "handle" => {
+          "connectorId" => "c1",
+          "connectorHandle" => {}
+        }
+      })
+      dh.handle.should be_a_kind_of Models::TableHandle
+      dh.handle.connector_id.should == "c1"
+      dh.handle.connector_handle.should == {}
+    end
 
-  it "validates models" do
-    lambda do
-      Models::DeleteHandle.decode({
-        "handle" => "invalid"
+    it "validates models" do
+      lambda do
+        Models::DeleteHandle.decode({
+          "handle" => "invalid"
+        })
+      end.should raise_error(TypeError, /String to Hash/)
+    end
+  else
+    it "decodes DeleteTarget" do
+      dh = Models::DeleteTarget.decode({
+        "handle" => {
+          "catalogName" => "c1",
+          "connectorHandle" => {}
+        }
       })
-    end.should raise_error(TypeError, /String to Hash/)
+      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
@@ -148,6 +178,22 @@ describe Presto::Client::StatementClient do
     q.current_results_headers["X-Test-Header"].should == "123"
   end
 
+  describe "#query_id" do
+    it "returns query_id" do
+      stub_request(:post, "localhost/v1/statement").
+        with(body: query).to_return(body: response_json2.to_json, headers: {"X-Test-Header" => "123"})
+
+     stub_request(:get, "localhost/v1/next_uri").
+        to_return(body: response_json.to_json, headers: {"X-Test-Header" => "123"})
+
+      sc = StatementClient.new(faraday, query, options.merge(http_open_timeout: 1))
+      sc.query_id.should == "queryid"
+      sc.has_next?.should be_true
+      sc.advance.should be_true
+      sc.query_id.should == "queryid"
+    end
+  end
+
   describe '#query_info' do
     let :headers do
       {
@@ -184,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
@@ -564,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.0
+  version: 0.6.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2021-04-01 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
+- ChangeLog.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/presto-client.rb
@@ -148,13 +165,19 @@ files:
 - modelgen/models.rb
 - 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
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -171,13 +194,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+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

data/ChangeLog

@@ -1,176 +0,0 @@
-2019-07-23 version 0.6.0
-
-* Support presto 316 model class
-
-
-2019-01-30 version 0.5.14
-
-* Added `Query#current_results_headers` that returns HTTP response headers
-
-2018-12-10 version 0.5.13
-
-* Added `query_timeout` and `plan_timeout` options with default disabled
-* Changed timer to use CLOCK_MONOTONIC to avoid unexpected behavior when
-  system clock is updated
-
-2018-08-07 version 0.5.12
-
-* Upgrade to Presto 0.205 model
-
-2018-06-27 version 0.5.11
-
-* Support multiple session properties
-* Check invalid JSON data response
-
-2018-03-22 version 0.5.10
-
-* Added client_info, client_tags, and http_headers options.
-
-2018-03-02 version 0.5.9
-
-* Added error_name field at PrestoQueryError
-
-2017-11-13 version 0.5.8
-
-* Added `Client#kill(query_id)` method.
-* Added additional checking of internal exceptions so that client doesn't
-  silently return in case when Presto query is killed and Presto returns a
-  valid `200 OK` response with `result_uri: null`.
-* Fixed `undefined local variable 'body'` error that was possibly happening
-  when Presto returned an unexpected data structure.
-
-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
-
-2017-06-28 version 0.5.5:
-* Added support for model version 0.178
-
-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.
-
-
-2016-08-03 version 0.4.16:
-
-* Upgraded Presto model version to 0.151
-
-
-2016-08-03 version 0.4.15:
-
-* decode method of model classes validate Hash type
-
-
-2016-08-02 version 0.4.14:
-
-* Added support for resuming fetching query results by using new `Query.resume(next_uri, options)` method (@tetrakai++)
-
-
-2016-08-02 version 0.4.13:
-
-* Added support for :http_proxy option to use a HTTP proxy server
-* Added support for hashed Client response using `run_with_names` (thanks to MoovWeb for allowing me to contribute)
-* Upgraded Presto model version to 0.134
-
-2015-04-01 version 0.4.5:
-
-* Upgraded Presto model version to 0.99
-
-
-2014-11-20 version 0.4.3:
-
-* Updated gem dependency to accept faraday ~> 0.9.x as well as ~> 0.8.8
-
-
-2014-10-15 version 0.4.2:
-
-* Added support for :properties option to set session properties introduced
-since Presto 0.78
-
-
-2014-06-12 version 0.4.1:
-
-* Added EquiJoinClause model class
-* Added StageId#query_id and #id methods
-* Added TaskId#query_id, #stage_id and #id methods
-
-
-2014-06-10 version 0.4.0:
-
-* Added Query#current_results, #advance and #query_info for advanced users
-* Generate model classes from Presto source code to include complete classes
-
-
-2014-05-06 version 0.3.3:
-
-* Added :time_zone and :language options added by Presto 0.66
-
-
-2014-04-01 version 0.3.2:
-
-* Fixed a problem that client skips the last chunk if result is large
-
-
-2014-01-30 version 0.3.1:
-
-* Added http_debug option
-* Disabled HTTP debug logging by default
-
-
-2014-01-22 version 0.3.0:
-
-* Added http_timeout option
-* Added http_open_timeout option
-* Changed Query.start API to start(query, options) to http options
-
-
-2014-01-22 version 0.2.0:
-
-* Added Query#cancel
-* Added Query#close
-* Added Client#run
-* Changed required_ruby_version from 1.9.3 to 1.9.1
-
-
-2014-01-07 version 0.1.0:
-
-* First release