tiny-presto 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e2bdd215986246b63650c85c8d78eabd47e481fa51a665e0a22264f079e24af
-  data.tar.gz: 3e9d922298a4ff0e9ac6e1d9aaf4993cdad8cc680b5fa1985914d176d2985cdf
+  metadata.gz: 72dd2cba77859f25d7d3ac35b9f76243036cfa627a375d76a7b50c0f0a146aee
+  data.tar.gz: 61782cf0551ef563b4f71f4a77cfaf2881757a8d51ebd1da2c5f1ecc53839a91
 SHA512:
-  metadata.gz: c99b29e972147490ac5fbe3d50b3ce870aff7dd368d77ccbdd73739c36ca7f593718e89b2fc9b56c583d6e8a5b51d90a4a9ae3630f7cf22417cb7c3dfc974390
-  data.tar.gz: 4946f97714fab4f02b9235f5f87c2c615d097d4770fa3762115a7a3c8ce023704c182002773d6253e1b384daf81d48813720ccd0711b90a3df3f4d37f47deb3b
+  metadata.gz: 5203bb457596d0c13e03df2164c0225164e3abf571ef55c6b4a3b3f472adf7a769cbeb496ef3387bb09ed90a1bf3c1521cc7c54a1a14d88ffd20a7b3fc00c089
+  data.tar.gz: 672c494c5e5af52289d23fd18521128735b4f9c4575a40389b401e84bf37a79edf0e6859e86028fde8cea489c68afd7ca259d381aa0237faa09142a3970b919d

data/.rubocop.yml

@@ -1 +1,4 @@
 inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.5

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-01-14 16:36:39 +0900 using RuboCop version 0.52.1.
+# on 2020-02-12 15:52:06 +0900 using RuboCop version 0.52.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -18,15 +18,19 @@ Lint/UselessAssignment:
   Exclude:
     - 'spec/cluster_spec.rb'
 
+# Offense count: 1
+Metrics/AbcSize:
+  Max: 17
+
 # Offense count: 2
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 32
+  Max: 30
 
-# Offense count: 1
+# Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 15
+  Max: 19
 
 # Offense count: 1
 # Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
@@ -35,15 +39,21 @@ Naming/FileName:
   Exclude:
     - 'lib/tiny-presto.rb'
 
-# Offense count: 2
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect.
+Performance/HashEachMethods:
+  Exclude:
+    - 'lib/tiny-presto.rb'
+
+# Offense count: 1
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
     - 'test/**/*'
     - 'lib/tiny-presto.rb'
-    - 'lib/tiny-presto/cluster.rb'
 
-# Offense count: 2
+# Offense count: 5
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:

data/Gemfile

@@ -7,8 +7,8 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gem 'docker-api'
 gem 'presto-client'
 gem 'rake'
-gem 'rubocop'
 gem 'rdoc'
+gem 'rubocop'
 
 group :development, :test do
   gem 'rspec'

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/Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 
 require 'rake/testtask'

data/lib/tiny-presto.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tiny-presto/version'
 require 'tiny-presto/cluster'
 
@@ -12,18 +14,25 @@ module TinyPresto
     attr_reader :cluster, :client
 
     def initialize
-      url = 'localhost'
-      @cluster = Cluster.new(url)
+      @cluster = Cluster.new
       @cluster.run
-      @client = Presto::Client.new(server: "#{url}: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
-        begin
-          @client.run('show schemas')
-          break
-        rescue StandardError => _
-          # Waiting for the cluster is launched
-          sleep(1)
-        end
+        @client.run('show schemas')
+        break
+      rescue StandardError => _
+        # Waiting for the cluster is launched
+        sleep(1)
       end
     end
 
@@ -32,21 +41,78 @@ module TinyPresto
     end
   end
 
+  def self.print_record(record)
+    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.join(',')})"
+  end
+
+  def self.prepare(table_name, table_data)
+    # {'c1': [1, 2, 3], 'c2': ['a', 'b', 'c']}
+    columns = table_data.keys
+    records = []
+    table_data.each do |_, rows|
+      rows.each_with_index do |r, idx|
+        if records[idx].nil?
+          records << [r]
+        else
+          records[idx] << r
+        end
+      end
+    end
+    values_clause = []
+    records.each do |record|
+      values_clause << print_record(record)
+    end
+    query = "CREATE TABLE #{table_name} AS SELECT * FROM (values #{values_clause.join(',')}) t(#{columns.join(',')})"
+    run_with_retry(query)
+  end
+
   # Run the given SQL.
+  #
+  #   TinyPresto.run("show schemas")
+  #
   def self.run(sql)
     presto = TinyPresto.instance
     _, rows = presto.client.run(sql)
     rows
   end
 
+  # Run the given query with retrying in case of undeterministic error.
+  #
+  #   TinyPresto.run_with_retry("show schemas")
+  #
+  def self.run_with_retry(sql, max_retry = 3)
+    max_retry.times do
+      return run(sql)
+    rescue Presto::Client::PrestoQueryError => e
+      # Cluster may be in the initialization phase.
+      raise unless e.message.match?(/^No nodes available to run query/)
+
+      sleep(1000)
+      next
+    end
+  end
+
   # Run the given SQL and verify the result.
+  #
+  #  TinyPresto.verify("show schemas", [["default"], ["information_schema"]])
+  #  # => return true
   def self.verify(sql, expected_result)
-    presto = TinyPresto.instance
-    _, rows = presto.client.run(sql)
+    rows = run_with_retry(sql)
     rows == expected_result
   end
 
   # Make sure to stop the cluster.
+  #
+  #  TinyPresto.ensure_stop
+  #
   def self.ensure_stop
     presto = TinyPresto.instance
     presto.stop

data/lib/tiny-presto/cluster.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
+
 require 'docker-api'
 
 module TinyPresto
   # Represents a Presto cluster
   #
   class Cluster
-    def initialize(url, tag = 'latest')
-      @url = url
+    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,3 +1,5 @@
+# frozen_string_literal: true
+
 module TinyPresto
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.7'.freeze
 end

data/spec/cluster_spec.rb

@@ -1,19 +1,28 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe TinyPresto::Cluster do
   describe 'cluster' do
     before(:all) do
-      @cluster = TinyPresto::Cluster.new('localhost')
+      @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
-        begin
-          @client.run('show schemas')
-          break
-        rescue StandardError => exception
-          puts 'Waiting for cluster ready...'
-          sleep(3)
-        end
+        @client.run('show schemas')
+        break
+      rescue StandardError => exception
+        puts "Waiting for cluster ready... #{exception}"
+        sleep(3)
       end
       puts 'Cluster is ready'
     end
@@ -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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 
 begin

data/spec/tiny_presto_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe TinyPresto do
@@ -19,4 +21,14 @@ RSpec.describe TinyPresto do
       expect(result).to eq(true)
     end
   end
+
+  describe 'prepare' do
+    it 'dataset correctly' do
+      data = { 'c1': [1, 2, 3], 'c2': %w[a b c] }
+      TinyPresto.prepare('new_table', data)
+      expected = [[1, 'a'], [2, 'b'], [3, 'c']]
+      rows = TinyPresto.run_with_retry('select * from new_table')
+      expect(rows).to eq(expected)
+    end
+  end
 end

data/spec/version_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe TinyPresto do
   describe '#version' do
     it 'correct' do
-      expect(TinyPresto::VERSION).to eq('0.0.1')
+      expect(TinyPresto::VERSION).to eq('0.0.5')
     end
   end
 end

data/tiny-presto.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path 'lib/tiny-presto/version', File.dirname(__FILE__)
 
 Gem::Specification.new do |gem|
@@ -9,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) }
@@ -17,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.has_rdoc = false
 
-  gem.required_ruby_version = '>= 2.5.0'
+  gem.required_ruby_version = '>= 2.4.0'
 
   gem.add_dependency 'docker-api', ['~> 1.34.0']
   gem.add_dependency 'faraday', ['~> 0.12']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny-presto
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Kai Sasaki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -93,9 +93,9 @@ files:
 - tiny-presto.gemspec
 homepage: https://github.com/Lewuathe/tiny-presto
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,16 +103,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: For Presto functionality testing
 test_files: