tiny-presto 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9450ad107fdacbc74c5bb6701fe14dffeedeea73271c482f9215c34560feea9
-  data.tar.gz: edf1b44fcf2e83f231e7e98f9162e87518397f0b31dd5d6cf8ddc2dc517d62cf
+  metadata.gz: 72dd2cba77859f25d7d3ac35b9f76243036cfa627a375d76a7b50c0f0a146aee
+  data.tar.gz: 61782cf0551ef563b4f71f4a77cfaf2881757a8d51ebd1da2c5f1ecc53839a91
 SHA512:
-  metadata.gz: c8b3d5ad1609dc68e8a5b5149d3381ffb103b0ef9aa6ac286eae9b0ff639b371ffa10ecd2734709e8710dcf43d62344548556f36d66d37bc2247b9d3e9339f70
-  data.tar.gz: 64ab5b8eb78343a27d94097ff4a841b6855b8bb7a90ef6e79aecc87e2438c54e5998df5660ac45c0b65ffd426f21116376c6a4f91f3f0d927bd60a464c061384
+  metadata.gz: 5203bb457596d0c13e03df2164c0225164e3abf571ef55c6b4a3b3f472adf7a769cbeb496ef3387bb09ed90a1bf3c1521cc7c54a1a14d88ffd20a7b3fc00c089
+  data.tar.gz: 672c494c5e5af52289d23fd18521128735b4f9c4575a40389b401e84bf37a79edf0e6859e86028fde8cea489c68afd7ca259d381aa0237faa09142a3970b919d

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.rb

@@ -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 = Presto::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
@@ -74,9 +84,6 @@ module TinyPresto
     rows
   end
 
-  RETRYABLE_ERRORS = [
-    /No nodes available to run query/
-  ]
   # Run the given query with retrying in case of undeterministic error.
   #
   #   TinyPresto.run_with_retry("show schemas")
@@ -86,11 +93,10 @@ module TinyPresto
       return run(sql)
     rescue Presto::Client::PrestoQueryError => e
       # Cluster may be in the initialization phase.
-      if RETRYABLE_ERRORS.any? { |err| e.message =~ err }
-        sleep(1)
-        next
-      end
-      raise
+      raise unless e.message.match?(/^No nodes available to run query/)
+
+      sleep(1000)
+      next
     end
   end
 

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
@@ -17,7 +17,6 @@ module TinyPresto
       Docker::Image.create('fromImage' => @image_name)
       @container = Docker::Container.create(
         'Image' => @image_name,
-        'ExposedPorts' => { '8080/tcp' => {} },
         'HostConfig' => {
           'PortBindings' => {
             '8080/tcp' => [

data/lib/tiny-presto/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TinyPresto
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.7'.freeze
 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 = Presto::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/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.6')
+      expect(TinyPresto::VERSION).to eq('0.0.5')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny-presto
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Kai Sasaki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -95,7 +95,7 @@ homepage: https://github.com/Lewuathe/tiny-presto
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,8 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: For Presto functionality testing
 test_files: