presto-client 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fc42f239449eb3fc674874b8b802ad0f87f5b423
-  data.tar.gz: 1411720ef014cec8c8631a0f9f2da93f6761326d
+SHA256:
+  metadata.gz: a3dacca9fb546a0a9d8dc52d68c7fdaad0162dd79eba01a7f191da66b6c70fa5
+  data.tar.gz: 3440572020360608b0dab2ebfc5cf29e8de0482b5e4becbe48c6905078cd7161
 SHA512:
-  metadata.gz: dfdef05c1703da16c66318cb3f00825b0fa9a07052f5823d80fafa32d5a28a8be531eb551abc020696ed024cd6cb4c57db647fa390408a0bc9d07ba2cd7e20b4
-  data.tar.gz: 5586ca553fbab38be1c0ec61d2cc7c1a7532377c5482b538a86dd05b1869441c865d10693964acea05d8c56337a07a638d9d70ed62ae0c8cc0b7ef840426ec73
+  metadata.gz: d6776d64325948b52a4c7b99ba6b57022a1828ca1a225ba524f1d801cdfe70aa5362d936f8d430f6ffc349498ce84f0489b140f694c9510737f4890c5a3553e1
+  data.tar.gz: 841ddd0e1d0470a7451486fdb2809fc33b3d71ae620ed8d88d8d8a00ce6df998e1720692f4f67d61e1883e6be4695cac204c45434d0be80dfc295ef3fea34e7a

data/.travis.yml

@@ -1,10 +1,8 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.7
-  - 2.2.3
-  - 2.3.1
-  - 2.4.0
+  - 2.3.8
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
 
 script: "bundle exec rake spec"
 

data/{ChangeLog → ChangeLog.md}

@@ -1,41 +1,47 @@
-2019-08-09 version 0.6.1
-
+presto-client-ruby
+====
+## 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)]
+- Merge pull request [#60](https://github.com/treasure-data/presto-client-ruby/issues/60) from treasure-data/fix_test [[01fa867](https://github.com/treasure-data/presto-client-ruby/commit/01fa867)]
+- Merge pull request [#59](https://github.com/treasure-data/presto-client-ruby/issues/59) from treasure-data/update_readme [[50b2e2a](https://github.com/treasure-data/presto-client-ruby/commit/50b2e2a)]
+- Update test target ruby versions [[2b65462](https://github.com/treasure-data/presto-client-ruby/commit/2b65462)]
+- Update description of model_version [[750232e](https://github.com/treasure-data/presto-client-ruby/commit/750232e)]
+- Remove old ruby versions [[28b1abb](https://github.com/treasure-data/presto-client-ruby/commit/28b1abb)]
+- Enable fail_on_error [[9c1112a](https://github.com/treasure-data/presto-client-ruby/commit/9c1112a)]
+- Fix tests which is only effective when presto version is less than 313 [[695966e](https://github.com/treasure-data/presto-client-ruby/commit/695966e)]
+- Implement `StatementClient#query_id` [[2b692ca](https://github.com/treasure-data/presto-client-ruby/commit/2b692ca)]
+- url encode properties ([#57](https://github.com/treasure-data/presto-client-ruby/issues/57)) [[8450627](https://github.com/treasure-data/presto-client-ruby/commit/8450627)]
+
+
+## 0.6.1
 * Fix WriterTarget 316 model class name
 
-2019-07-23 version 0.6.0
-
+## 0.6.0
 * Support presto 316 model class
 
-
-2019-01-30 version 0.5.14
-
+## 0.5.14
 * Added `Query#current_results_headers` that returns HTTP response headers
 
-2018-12-10 version 0.5.13
-
+## 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
-
+## 0.5.12
 * Upgrade to Presto 0.205 model
 
-2018-06-27 version 0.5.11
-
+## 0.5.11
 * Support multiple session properties
 * Check invalid JSON data response
 
-2018-03-22 version 0.5.10
-
+## 0.5.10
 * Added client_info, client_tags, and http_headers options.
 
-2018-03-02 version 0.5.9
-
+## version 0.5.9
 * Added error_name field at PrestoQueryError
 
-2017-11-13 version 0.5.8
-
+## 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
@@ -43,138 +49,98 @@
 * Fixed `undefined local variable 'body'` error that was possibly happening
   when Presto returned an unexpected data structure.
 
-2017-08-28 version 0.5.7
+## 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:
+## 0.5.6:
 * Added missing inner class models for version 0.178
 
-2017-06-28 version 0.5.5:
+## 0.5.5:
 * Added support for model version 0.178
 
-2017-05-15 version 0.5.4:
-
+## 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:
-
+## 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:
-
+## 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:
-
+## 0.5.1:
 * Assume ConnectorId as a primitive type to be able to decode "connectorId"
   fields.
 
-
-2016-10-28 version 0.5.0:
-
+## 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:
-
+## 0.4.17:
 * Added support for :ssl option.
 
-
-2016-08-03 version 0.4.16:
-
+## 0.4.16:
 * Upgraded Presto model version to 0.151
 
-
-2016-08-03 version 0.4.15:
-
+## 0.4.15:
 * decode method of model classes validate Hash type
 
-
-2016-08-02 version 0.4.14:
-
+## 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:
-
+## 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:
-
+## 0.4.5:
 * Upgraded Presto model version to 0.99
 
-
-2014-11-20 version 0.4.3:
-
+## 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:
-
+## 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
+## 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:
-
+## 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:
-
+## 0.3.3:
 * Added :time_zone and :language options added by Presto 0.66
 
-
-2014-04-01 version 0.3.2:
-
+## 0.3.2:
 * Fixed a problem that client skips the last chunk if result is large
 
-
-2014-01-30 version 0.3.1:
-
+## 0.3.1:
 * Added http_debug option
 * Disabled HTTP debug logging by default
 
-
-2014-01-22 version 0.3.0:
-
+## 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:
-
+## 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:
-
+## 0.1.0:
 * First release

data/README.md

@@ -101,7 +101,7 @@ $ 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.
-* **model_version** set the presto version to which a job is submitted. Supported versions are 0.205, 0.178, 0.173, 0.153 and 0.149. Default is 0.205.
+* **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.
 

data/Rakefile

@@ -6,9 +6,7 @@ require 'rake/clean'
 
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.fail_on_error = false
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => [:spec, :build]
 

data/lib/presto/client/faraday_client.rb

@@ -15,6 +15,8 @@
 #
 module Presto::Client
 
+  require 'cgi'
+
   module PrestoHeaders
     PRESTO_USER = "X-Presto-User"
     PRESTO_SOURCE = "X-Presto-Source"
@@ -155,6 +157,7 @@ module Presto::Client
       if field_value =~ HTTP11_CTL_CHARSET_REGEXP
         raise Faraday::ClientError, "Value of properties can't include HTTP/1.1 control characters"
       end
+      field_value = CGI.escape(field_value)
       "#{token}=#{field_value}"
     end
   end

data/lib/presto/client/statement_client.rb

@@ -117,6 +117,10 @@ module Presto::Client
       @results_headers
     end
 
+    def query_id
+      @results.id
+    end
+
     def has_next?
       !!@results.next_uri
     end

data/lib/presto/client/version.rb

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

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) }

data/release.rb

@@ -0,0 +1,58 @@
+#!/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)")
+# 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"
+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/statement_client_spec.rb

@@ -112,24 +112,32 @@ 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
-
-  it "validates models" do
-    lambda do
-      Models::DeleteHandle.decode({
-        "handle" => "invalid"
+  # 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" => {}
+        }
       })
-    end.should raise_error(TypeError, /String to Hash/)
+      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"
+        })
+      end.should raise_error(TypeError, /String to Hash/)
+    end
   end
 
   it "receives headers of POST" do
@@ -148,6 +156,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
       {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: presto-client
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -123,7 +123,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- ChangeLog
+- ChangeLog.md
 - Gemfile
 - README.md
 - Rakefile
@@ -148,13 +148,14 @@ files:
 - modelgen/models.rb
 - modelgen/presto_models.rb
 - presto-client.gemspec
+- release.rb
 - spec/client_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
 - spec/statement_client_spec.rb
 homepage: https://github.com/treasure-data/presto-client-ruby
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Presto client library