tiny-presto 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22d98c71de7a327595dd05b6a59a8ed1ff747208995eb9ab5c02bc4ef954dade
-  data.tar.gz: 86b59421bc8379e130956108781965da6d51bad55bb274b907ba53ae688c0d4a
+  metadata.gz: 6dba27ee16b81873773d523431e07970d9f7b9aa4ec806309d0a72351761c4dc
+  data.tar.gz: bf1cc0cfaa83f1ece6923ee1d5564b333fd4a7b781e8b17509e136b0fe6d4486
 SHA512:
-  metadata.gz: 47f6d98e15f9071f31c424fcb63f8521f7b99a09c796bbac4df5447da5ba494101460f56d6a242b213737b9ba57af3fdc2bc2498cb390a961bdc5a2366fe467d
-  data.tar.gz: a1801999ed1897d976e70d90b8728f92b428a91b08a8fd29a703d852728b2f1e4cc895b0ecaeac7dd09f650bc6ebb24f505f3de362e6f942fa48f10e96411920
+  metadata.gz: 7dcadf67d4e8d0034e88d4c97f2c5c8958e19490323a5ad5de763b1ed496c7d98d4f493e94e3f060d69f00b8fa4fd25655c8e07f27b4f42fd5f546cfc607b651
+  data.tar.gz: a2ea14dd12b1d01c431aaf7ef4bad86caaee988ee3a6bd0f87848b4d15cbfee632466a9922f3d0a79e23e55638a60a0f86d5f8b27aa10d239db9b2f1bb37df8a

data/Gemfile

@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 gem 'docker-api'
-gem 'presto-client'
+gem 'trino-client'
 gem 'rake'
 gem 'rdoc'
 gem 'rubocop'

data/Gemfile.lock

@@ -7,18 +7,17 @@ GEM
       excon (>= 0.47.0)
       multi_json
     excon (0.71.1)
-    faraday (0.17.3)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
-    msgpack (1.3.1)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    msgpack (1.4.2)
     multi_json (1.14.1)
     multipart-post (2.1.1)
     parallel (1.17.0)
     parser (2.5.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
-    presto-client (0.6.1)
-      faraday (~> 0.12)
-      msgpack (>= 0.7.0)
     rainbow (3.0.0)
     rake (13.0.1)
     rdoc (6.2.1)
@@ -43,6 +42,10 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
+    trino-client (1.0.0)
+      faraday (~> 0.12)
+      faraday_middleware (~> 0.12.2)
+      msgpack (>= 0.7.0)
     unicode-display_width (1.4.0)
 
 PLATFORMS
@@ -50,11 +53,11 @@ PLATFORMS
 
 DEPENDENCIES
   docker-api
-  presto-client
   rake
   rdoc
   rspec
   rubocop
+  trino-client
 
 BUNDLED WITH
-   2.0.2
+   2.2.22

data/README.md

@@ -1,6 +1,8 @@
 # tiny-presto [![Actions Status](https://github.com/Lewuathe/tiny-presto/workflows/test/badge.svg)](https://github.com/Lewuathe/tiny-presto/actions) ![Gem](https://img.shields.io/gem/v/tiny-presto) ![Gem](https://img.shields.io/gem/dt/tiny-presto)
 
-Tiny [Presto](https://prestosql.io/) cluster to check the compatibility of query result by using the specific Presto version.
+Tiny [Trino](https://trino.io/) cluster to check the compatibility of query result by using the specific Trino version.
+
+**NOTE: The brand name of [Presto was migrated to Trino](https://trino.io/blog/2020/12/27/announcing-trino.html). Although the internal docker image used in tiny-presto was also migrated to [Trino](https://hub.docker.com/r/trinodb/trino), we keep the package name `tiny-presto` to avoid the installation trouble.**
 
 # Install
 

data/lib/tiny-presto/cluster.rb

@@ -6,9 +6,9 @@ module TinyPresto
   # Represents a Presto cluster
   #
   class Cluster
-    def initialize(tag = 'latest')
+    def initialize(image = 'trinodb/trino', tag = 'latest')
       @tag = tag
-      @image_name = "prestosql/presto:#{@tag}"
+      @image_name = "#{image}:#{@tag}"
     end
 
     # Launch Presto cluster running on Docker container

data/lib/tiny-presto/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TinyPresto
-  VERSION = '0.0.4'
+  VERSION = '0.0.8'.freeze
 end

data/lib/tiny-presto.rb

@@ -4,7 +4,7 @@ require 'tiny-presto/version'
 require 'tiny-presto/cluster'
 
 require 'singleton'
-require 'presto-client'
+require 'trino-client'
 
 module TinyPresto
   # Singleton object representing a Presto cluster running in the local machine.
@@ -16,7 +16,17 @@ module TinyPresto
     def initialize
       @cluster = Cluster.new
       @cluster.run
-      @client = Presto::Client.new(server: 'localhost:8080', catalog: 'memory', user: 'tiny-user', schema: 'default')
+      @client = Trino::Client.new(
+        server: 'localhost:8080',
+        catalog: 'memory',
+        user: 'tiny-user',
+        schema: 'default',
+        # TODO: Remove after presto-client-ruby supports Trino
+        http_headers: {
+          'X-Trino-User' => 'tiny-user',
+          'X-Trino-Catalog' => 'memory',
+          'X-Trino-Schema' => 'default'
+        })
       loop do
         @client.run('show schemas')
         break
@@ -32,18 +42,15 @@ module TinyPresto
   end
 
   def self.print_record(record)
-    ret = '('
-    record.each_with_index do |v, idx|
-      ret << ',' if idx != 0
-      ret << if v.is_a? Numeric
-               v.to_s
-             else
-               # Non numeric value is interpreted as string
-               "'#{v}'"
-             end
+    ret = record.map do |v|
+      if v.is_a? Numeric
+        v.to_s
+      else
+        # Non numeric value is interpreted as string
+        "'#{v}'"
+      end
     end
-    ret << ')'
-    ret
+    "(#{ret.join(',')})"
   end
 
   def self.prepare(table_name, table_data)
@@ -59,13 +66,11 @@ module TinyPresto
         end
       end
     end
-    values_clause = '(values '
-    records.each_with_index do |record, idx|
-      values_clause << ',' if idx != 0
+    values_clause = []
+    records.each do |record|
       values_clause << print_record(record)
     end
-    values_clause << ')'
-    query = "CREATE TABLE #{table_name} AS SELECT * FROM #{values_clause} t(#{columns.join(',')})"
+    query = "CREATE TABLE #{table_name} AS SELECT * FROM (values #{values_clause.join(',')}) t(#{columns.join(',')})"
     run_with_retry(query)
   end
 
@@ -86,10 +91,11 @@ module TinyPresto
   def self.run_with_retry(sql, max_retry = 3)
     max_retry.times do
       return run(sql)
-    rescue Presto::Client::PrestoQueryError => e
+    rescue Trino::Client::TrinoQueryError => e
       # Cluster may be in the initialization phase.
       raise unless e.message.match?(/^No nodes available to run query/)
 
+      sleep(1000)
       next
     end
   end

data/spec/cluster_spec.rb

@@ -7,12 +7,21 @@ RSpec.describe TinyPresto::Cluster do
     before(:all) do
       @cluster = TinyPresto::Cluster.new
       @container = @cluster.run
-      @client = Presto::Client.new(server: 'localhost:8080', catalog: 'memory', user: 'tiny-user', schema: 'default')
+      @client = Trino::Client.new(
+        server: 'localhost:8080',
+        catalog: 'memory',
+        user: 'tiny-user',
+        schema: 'default',
+        # TODO: Remove after presto-client-ruby supports Trino
+        http_headers: {
+          'X-Trino-User' => 'tiny-user',
+          'X-Trino-Catalog' => 'memory'
+        })
       loop do
         @client.run('show schemas')
         break
       rescue StandardError => exception
-        puts 'Waiting for cluster ready...'
+        puts "Waiting for cluster ready... #{exception}"
         sleep(3)
       end
       puts 'Cluster is ready'
@@ -32,8 +41,8 @@ RSpec.describe TinyPresto::Cluster do
     end
 
     it 'run CTAS query' do
-      @client.run("create table ctas1 as select * from (values (1, 'a'), (2, 'b')) t(c1, c2)")
-      columns, rows = @client.run('select * from ctas1')
+      @client.run("create table default.ctas1 as select * from (values (1, 'a'), (2, 'b')) t(c1, c2)")
+      columns, rows = @client.run('select * from default.ctas1')
       expect(columns.map(&:name)).to match_array(%w[c1 c2])
     end
   end

data/spec/spec_helper.rb

@@ -11,4 +11,4 @@ rescue Bundler::BundlerError => e
 end
 
 require 'tiny-presto'
-require 'presto-client'
+require 'trino-client'

data/spec/version_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe TinyPresto do
   describe '#version' do
     it 'correct' do
-      expect(TinyPresto::VERSION).to eq('0.0.3')
+      expect(TinyPresto::VERSION).to eq('0.0.8')
     end
   end
 end

data/tiny-presto.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = 'Wrapper for Lightweight Presto Cluster'
   gem.summary       = 'For Presto functionality testing'
   gem.homepage      = 'https://github.com/Lewuathe/tiny-presto'
-  gem.license       = 'Apache 2.0'
+  gem.license       = 'Apache-2.0'
 
   gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.4.0'
 
   gem.add_dependency 'docker-api', ['~> 1.34.0']
-  gem.add_dependency 'faraday', ['~> 0.12']
+  gem.add_dependency 'trino-client'
 
   gem.add_development_dependency 'rake', ['~> 13.0.0']
   gem.add_development_dependency 'rspec', ['~> 3.9.0']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny-presto
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - Kai Sasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.34.0
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: trino-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ files:
 - tiny-presto.gemspec
 homepage: https://github.com/Lewuathe/tiny-presto
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -110,7 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: For Presto functionality testing