trino-client 1.0.1 → 2.0.0

data/modelgen/trino_models.rb

@@ -1,4 +1,3 @@
-
 module TrinoModels
   require 'find'
   require 'stringio'
@@ -15,7 +14,7 @@ module TrinoModels
     alias_method :map?, :map
 
     def name
-      @name ||= key.gsub(/[A-Z]/) {|f| "_#{f.downcase}" }
+      @name ||= key.gsub(/[A-Z]/) { |f| "_#{f.downcase}" }
     end
   end
 
@@ -23,7 +22,7 @@ module TrinoModels
   end
 
   class ModelAnalyzer
-    def initialize(source_path, options={})
+    def initialize(source_path, options = {})
       @source_path = source_path
       @ignore_types = PRIMITIVE_TYPES + ARRAY_PRIMITIVE_TYPES + (options[:skip_models] || [])
       @path_mapping = options[:path_mapping] || {}
@@ -36,11 +35,11 @@ module TrinoModels
     attr_reader :skipped_models
 
     def models
-      @models.values.sort_by {|model| model.name }
+      @models.values.sort_by { |model| model.name }
     end
 
     def analyze(root_models)
-      root_models.each {|model_name|
+      root_models.each { |model_name|
         analyze_model(model_name)
       }
     end
@@ -54,7 +53,7 @@ module TrinoModels
     def analyze_fields(model_name, creator_block, generic: nil)
       model_name = "#{model_name}_#{generic}" if generic
       extra = @extra_fields[model_name] || []
-      fields = creator_block.scan(PROPERTY_PATTERN).concat(extra).map do |key,nullable,type|
+      fields = creator_block.scan(PROPERTY_PATTERN).concat(extra).map do |key, nullable, type|
         map = false
         array = false
         nullable = !!nullable
@@ -84,10 +83,10 @@ module TrinoModels
         end
         base_type = @name_mapping[[model_name, base_type]] || base_type
         map_value_base_type = @name_mapping[[model_name, map_value_base_type]] || map_value_base_type
-        
+
         if generic
           base_type = generic if base_type == 'T'
-          map_value_base_type = generic if map_value_base_type == 'T'  
+          map_value_base_type = generic if map_value_base_type == 'T'
         end
         if m = GENERIC_PATTERN.match(base_type)
           base_type_alias = "#{m[1]}_#{m[2]}"
@@ -103,10 +102,10 @@ module TrinoModels
         analyze_model(field.map_value_base_type, model_name) if field.map_value_base_type
       end
 
-      return fields
+      fields
     end
 
-    def analyze_model(model_name, parent_model=  nil, generic: nil)
+    def analyze_model(model_name, parent_model = nil, generic: nil)
       return if @models[model_name] || @ignore_types.include?(model_name)
 
       if m = GENERIC_PATTERN.match(model_name)
@@ -123,7 +122,7 @@ module TrinoModels
         raise ModelAnalysisError, "Can't find JsonCreator of a model class #{model_name} of #{parent_model} at #{path}"
       end
 
-      body = m[0] 
+      body = m[0]
       # check inner class first
       while true
         offset = m.end(0)
@@ -146,12 +145,12 @@ module TrinoModels
 
       @source_files ||= Find.find(@source_path).to_a
       pattern = /\/#{model_name}.java$/
-      matched = @source_files.find_all {|path| path =~ pattern && !path.include?('/test/') && !path.include?('/verifier/')}
+      matched = @source_files.find_all { |path| path =~ pattern && !path.include?('/test/') && !path.include?('/verifier/') }
       if matched.empty?
         raise ModelAnalysisError, "Model class #{model_name} is not found"
       end
       if matched.size == 1
-        return matched.first
+        matched.first
       else
         raise ModelAnalysisError, "Model class #{model_name} of #{parent_model} found multiple match #{matched}"
       end
@@ -159,7 +158,7 @@ module TrinoModels
   end
 
   class ModelFormatter
-    def initialize(options={})
+    def initialize(options = {})
       @indent = options[:indent] || '  '
       @base_indent_count = options[:base_indent_count] || 0
       @struct_class = options[:struct_class] || 'Struct'
@@ -182,7 +181,7 @@ module TrinoModels
         @model = model
 
         puts_with_indent 0, "class << #{model.name} ="
-        puts_with_indent 2, "#{@struct_class}.new(#{model.fields.map {|f| ":#{f.name}" }.join(', ')})"
+        puts_with_indent 2, "#{@struct_class}.new(#{model.fields.map { |f| ":#{f.name}" }.join(', ')})"
         format_decode
         puts_with_indent 0, "end"
         line
@@ -220,7 +219,7 @@ module TrinoModels
           expr = "hash[\"#{field.key}\"]"
         else
           expr = ""
-          expr << "hash[\"#{field.key}\"] && " #if field.nullable?
+          expr << "hash[\"#{field.key}\"] && " # if field.nullable?
 
           if field.map?
             key_expr = convert_expression(field.base_type, field.base_type, "k")
@@ -238,8 +237,8 @@ module TrinoModels
           end
         end
 
-        #comment = "# #{field.base_type}#{field.array? ? '[]' : ''} #{field.key}"
-        #puts_with_indent 3, "#{expr},  #{comment}"
+        # comment = "# #{field.base_type}#{field.array? ? '[]' : ''} #{field.key}"
+        # puts_with_indent 3, "#{expr},  #{comment}"
         puts_with_indent 3, "#{expr},"
       end
 
@@ -261,10 +260,9 @@ module TrinoModels
         key
       elsif @simple_classes.include?(base_type)
         "#{base_type}.new(#{key})"
-      else  # model class
+      else # model class
         "#{base_type}.decode(#{key})"
       end
     end
   end
 end
-

data/publish.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.expand_path 'lib/trino/client/version', File.dirname(__FILE__)
+require File.expand_path "lib/trino/client/version", File.dirname(__FILE__)
 
 def run(cmd)
   puts cmd
@@ -11,4 +11,3 @@ run("gem push trino-client-#{Trino::Client::VERSION}.gem")
 
 run("gem build trino-client-ruby/trino-client-ruby.gemspec")
 run("gem push trino-client-ruby/trino-client-ruby-#{Trino::Client::VERSION}.gem")
-

data/release.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'fileutils'
+require "fileutils"
 
-PREFIX = 'https://github.com/treasure-data/trino-client-ruby'
+PREFIX = "https://github.com/treasure-data/trino-client-ruby"
 RELEASE_NOTES_FILE = "ChangeLog.md"
 
 last_tag = `git describe --tags --abbrev=0`.chomp
@@ -19,10 +19,10 @@ logs = `git log #{last_tag}..HEAD --pretty=format:'%h %s'`
 logs = logs.gsub(/\#([0-9]+)/, "[#\\1](#{PREFIX}/issues/\\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|
+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"
   }
@@ -36,11 +36,11 @@ 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)
+File.delete(TMP_RELEASE_NOTES_FILE) if File.exist?(TMP_RELEASE_NOTES_FILE)
+File.write(TMP_RELEASE_NOTES_FILE.to_s, 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)
+abort("The release note file is not saved. Aborted") unless File.exist?(TMP_RELEASE_NOTES_FILE)
 
 def run(cmd)
   puts cmd
@@ -53,4 +53,4 @@ 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"
+# run "git push --tags"

data/spec/basic_query_spec.rb

@@ -79,4 +79,4 @@ describe Trino::Client::Client do
       end
     end
   end
-end
+end

data/spec/client_spec.rb

@@ -22,23 +22,23 @@ describe Trino::Client::Client do
 
       rehashed = client.run_with_names('fake query')
 
-      rehashed.length.should == 3
+      expect(rehashed.length).to eq 3
 
-      rehashed[0]['animal'].should == 'dog'
-      rehashed[0]['score'].should == 1
-      rehashed[0]['name'].should == 'Lassie'
+      expect(rehashed[0]['animal']).to eq 'dog'
+      expect(rehashed[0]['score']).to eq 1
+      expect(rehashed[0]['name']).to eq 'Lassie'
 
-      rehashed[0].values[0].should == 'dog'
-      rehashed[0].values[1].should == 1
-      rehashed[0].values[2].should == 'Lassie'
+      expect(rehashed[0].values[0]).to eq 'dog'
+      expect(rehashed[0].values[1]).to eq 1
+      expect(rehashed[0].values[2]).to eq 'Lassie'
 
-      rehashed[1]['animal'].should == 'horse'
-      rehashed[1]['score'].should == 5
-      rehashed[1]['name'].should == 'Mr. Ed'
+      expect(rehashed[1]['animal']).to eq 'horse'
+      expect(rehashed[1]['score']).to eq 5
+      expect(rehashed[1]['name']).to eq 'Mr. Ed'
 
-      rehashed[1].values[0].should == 'horse'
-      rehashed[1].values[1].should == 5
-      rehashed[1].values[2].should == 'Mr. Ed'
+      expect(rehashed[1].values[0]).to eq 'horse'
+      expect(rehashed[1].values[1]).to eq 5
+      expect(rehashed[1].values[2]).to eq 'Mr. Ed'
     end
 
     it 'empty results' do
@@ -47,14 +47,14 @@ describe Trino::Client::Client do
 
       rehashed = client.run_with_names('fake query')
 
-      rehashed.length.should == 0
+      expect(rehashed.length).to eq 0
     end
 
     it 'handles too few result columns' do
       rows = [['wrong', 'count']]
       client.stub(:run).and_return([columns, rows])
 
-      client.run_with_names('fake query').should == [{
+      expect(client.run_with_names('fake query')).to eq [{
         "animal" => "wrong",
         "score" => "count",
         "name" => nil,
@@ -65,7 +65,7 @@ describe Trino::Client::Client do
       rows = [['wrong', 'count', 'too', 'much', 'columns']]
       client.stub(:run).and_return([columns, rows])
 
-      client.run_with_names('fake query').should == [{
+      expect(client.run_with_names('fake query')).to eq [{
         "animal" => "wrong",
         "score" => "count",
         "name" => 'too',

data/spec/gzip_spec.rb

@@ -37,4 +37,4 @@ describe Trino::Client::Client do
       $stdout = STDOUT
     end
   end
-end
+end

data/spec/model_spec.rb

@@ -29,7 +29,9 @@ describe Trino::Client::Models do
       "info" => {"k" => "v"}
     }
 
-    stats = Models::OperatorStats.decode(h)
-    stats.blocked_reason.should == :waiting_for_memory
+    it 'decode blocked_reason' do
+      stats = Models::OperatorStats.decode(h)
+      expect(stats.blocked_reason).to eq :waiting_for_memory
+    end
   end
-end
+end

data/spec/spec_helper.rb

@@ -21,7 +21,8 @@ require 'tiny-presto'
 
 MAX_RETRY_COUNT = 5
 RETRYABLE_ERRORS = [
-  /No nodes available to run query/
+  /No nodes available to run query/,
+  /failed: nodes is empty/
 ]
 
 def run_with_retry(client, sql)
@@ -32,7 +33,7 @@ def run_with_retry(client, sql)
       return columns, rows
     rescue Trino::Client::TrinoQueryError => e
       if RETRYABLE_ERRORS.any? { |error| e.message =~ error }
-        sleep(i)
+        sleep(2**i)
         i += 1
         next
       end