tiny-presto 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c0da1870722311b6290c6eab394e3afbb5783a9010b4a7c746dec95e72bedb0
-  data.tar.gz: caa42bf7f62ae2d0ebf26cd7d9e13f9d3aea6919dbe1c129985a0997b1e4e95f
+  metadata.gz: 22d98c71de7a327595dd05b6a59a8ed1ff747208995eb9ab5c02bc4ef954dade
+  data.tar.gz: 86b59421bc8379e130956108781965da6d51bad55bb274b907ba53ae688c0d4a
 SHA512:
-  metadata.gz: 368cdc53a9e308c9c4f89db14c09fc10c228cd9bdf825620c0f8469b8df82c73d11d9b7990609e76a436ac3fda84f2fb85ce33b0f520cc6e4ea6ce1fcb2d1fc2
-  data.tar.gz: 0f0e25544d7f6d8c9caede435fdc4b860a5e18f55dbd70cc4c25b3e5c42d43663a95476feb85c9778b9c9a0a2c3122b8b302f7f50bee7011f924c9d11dea36e5
+  metadata.gz: 47f6d98e15f9071f31c424fcb63f8521f7b99a09c796bbac4df5447da5ba494101460f56d6a242b213737b9ba57af3fdc2bc2498cb390a961bdc5a2366fe467d
+  data.tar.gz: a1801999ed1897d976e70d90b8728f92b428a91b08a8fd29a703d852728b2f1e4cc895b0ecaeac7dd09f650bc6ebb24f505f3de362e6f942fa48f10e96411920

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

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

data/lib/tiny-presto/cluster.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 require 'docker-api'
 
 module TinyPresto
   # Represents a Presto cluster
   #
   class Cluster
-    def initialize(url, tag = 'latest')
-      @url = url
+    def initialize(tag = 'latest')
       @tag = tag
       @image_name = "prestosql/presto:#{@tag}"
     end

data/lib/tiny-presto/version.rb

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

data/lib/tiny-presto.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tiny-presto/version'
 require 'tiny-presto/cluster'
 
@@ -12,18 +14,15 @@ 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')
       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,6 +31,44 @@ module TinyPresto
     end
   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
+    end
+    ret << ')'
+    ret
+  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 = '(values '
+    records.each_with_index do |record, idx|
+      values_clause << ',' if idx != 0
+      values_clause << print_record(record)
+    end
+    values_clause << ')'
+    query = "CREATE TABLE #{table_name} AS SELECT * FROM #{values_clause} t(#{columns.join(',')})"
+    run_with_retry(query)
+  end
+
   # Run the given SQL.
   #
   #   TinyPresto.run("show schemas")
@@ -42,13 +79,27 @@ module TinyPresto
     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/)
+
+      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
 

data/spec/cluster_spec.rb

@@ -1,19 +1,19 @@
+# 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')
       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...'
+        sleep(3)
       end
       puts 'Cluster is ready'
     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.3')
     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|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny-presto
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kai Sasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -110,8 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: For Presto functionality testing