presto-client 0.5.14 → 0.6.4

data/presto-client.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Presto client library}
   gem.summary       = %q{Presto client library}
   gem.homepage      = "https://github.com/treasure-data/presto-client-ruby"
-  gem.license       = "Apache 2.0"
+  gem.license       = "Apache-2.0"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -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

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+
+PREFIX = 'https://github.com/treasure-data/presto-client-ruby'
+RELEASE_NOTES_FILE = "ChangeLog.md"
+
+last_tag = `git describe --tags --abbrev=0`.chomp
+last_version = last_tag.sub("v", "")
+puts "last version: #{last_version}"
+
+print "next version? "
+next_version = STDIN.gets.chomp
+
+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)")
+
+new_release_notes = []
+new_release_notes <<= "\#\# #{next_version}\n"
+new_release_notes <<= logs.split(/\n/)
+  .reject{|line| line.include?("#{last_version} release notes")}
+  .map{|x|
+    rev = x[0..6]
+    "- #{x[8..-1]} [[#{rev}](#{PREFIX}/commit/#{rev})]\n"
+  }
+
+release_notes = []
+notes = File.readlines(RELEASE_NOTES_FILE)
+
+release_notes <<= notes[0..1]
+release_notes <<= new_release_notes
+release_notes <<= "\n"
+release_notes <<= notes[2..-1]
+
+TMP_RELEASE_NOTES_FILE = "#{RELEASE_NOTES_FILE}.tmp"
+File.delete(TMP_RELEASE_NOTES_FILE) if File.exists?(TMP_RELEASE_NOTES_FILE)
+File.write("#{TMP_RELEASE_NOTES_FILE}", release_notes.join)
+system("cat #{TMP_RELEASE_NOTES_FILE} | vim - -c ':f #{TMP_RELEASE_NOTES_FILE}' -c ':9'")
+
+abort("The release note file is not saved. Aborted") unless File.exists?(TMP_RELEASE_NOTES_FILE)
+
+def run(cmd)
+  puts cmd
+  system cmd
+end
+
+FileUtils.cp(TMP_RELEASE_NOTES_FILE, RELEASE_NOTES_FILE)
+File.delete(TMP_RELEASE_NOTES_FILE)
+
+# run "git commit #{RELEASE_NOTES_FILE} -m \"Add #{next_version} release notes\""
+# run "git tag v#{next_version}"
+# run "git push"
+# run "git push --tags"

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('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/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('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.5.14
+  version: 0.6.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2021-03-19 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
@@ -137,6 +154,8 @@ files:
 - lib/presto/client/model_versions/0.173.rb
 - lib/presto/client/model_versions/0.178.rb
 - lib/presto/client/model_versions/0.205.rb
+- lib/presto/client/model_versions/303.rb
+- lib/presto/client/model_versions/316.rb
 - lib/presto/client/models.rb
 - lib/presto/client/query.rb
 - lib/presto/client/statement_client.rb
@@ -146,13 +165,18 @@ files:
 - modelgen/models.rb
 - modelgen/presto_models.rb
 - presto-client.gemspec
+- release.rb
+- spec/basic_query_spec.rb
 - spec/client_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: []
@@ -169,13 +193,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+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/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