presto-client 0.4.17 → 0.5.0

data/modelgen/presto_models.rb

@@ -214,7 +214,7 @@ module PrestoModels
     def convert_expression(type, base_type, key)
       if @special_types[type]
         special.call(key)
-      elsif @enum_types.include?(type)
+      elsif @enum_types.include?(type) || @enum_types.include?(base_type)
         "#{key}.downcase.to_sym"
       elsif @primitive_types.include?(base_type)
         key

data/spec/model_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Presto::Client::Models do
+  describe 'rehash of BlockedReason' do
+    h = {
+      "operatorId" => 0,
+      "planNodeId" => "47",
+      "operatorType" => "ScanFilterAndProjectOperator",
+      "addInputCalls" => 0,
+      "addInputWall" => "0.00ns",
+      "addInputCpu" => "0.00ns",
+      "addInputUser" => "0.00ns",
+      "inputDataSize" => "9.46MB",
+      "inputPositions" => 440674,
+      "getOutputCalls" => 734,
+      "getOutputWall" => "7.29s",
+      "getOutputCpu" => "0.00ns",
+      "getOutputUser" => "0.00ns",
+      "outputDataSize" => "36.99MB",
+      "outputPositions" => 440674,
+      "blockedWall" => "0.00ns",
+      "finishCalls" => 0,
+      "finishWall" => "0.00ns",
+      "finishCpu" => "0.00ns",
+      "finishUser" => "0.00ns",
+      "memoryReservation" => "0B",
+      "systemMemoryReservation" => "0b",
+      "blockedReason" => "WAITING_FOR_MEMORY",
+      "info" => {"k" => "v"}
+    }
+
+    stats = Models::OperatorStats.decode(h)
+    stats.blocked_reason.should == :waiting_for_memory
+  end
+end

data/spec/statement_client_spec.rb

@@ -85,13 +85,11 @@ describe Presto::Client::StatementClient do
   it "decodes DeleteHandle" do
     dh = Models::DeleteHandle.decode({
       "handle" => {
-        "connectorId" => "c1",
-        "connectorHandle" => {},
+        "connectorHandle" => {}
       }
     })
     dh.handle.should be_a_kind_of Models::TableHandle
-    dh.handle.connector_id.should == "c1"
-    dh.handle.connector_handle.should == {}
+        dh.handle.connector_handle.should == nil
   end
 
   it "validates models" do
@@ -180,5 +178,21 @@ describe Presto::Client::StatementClient do
       end.should raise_error(ArgumentError, /:ssl/)
     end
   end
+
+  it "supports multiple model versions" do
+    stub_request(:post, "localhost/v1/statement").
+      with({body: query}).
+      to_return(body: response_json.to_json)
+
+    faraday = Faraday.new(url: "http://localhost")
+    client = StatementClient.new(faraday, query, options.merge(model_version: "0.149"))
+    client.current_results.should be_a_kind_of(ModelVersions::V0_149::QueryResults)
+  end
+
+  it "rejects unsupported model version" do
+    lambda do
+      StatementClient.new(faraday, query, options.merge(model_version: "0.111"))
+    end.should raise_error(NameError)
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: presto-client
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.5.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -117,15 +117,19 @@ files:
 - lib/presto/client.rb
 - lib/presto/client/client.rb
 - lib/presto/client/errors.rb
+- lib/presto/client/model_versions/0.149.rb
+- lib/presto/client/model_versions/0.153.rb
 - lib/presto/client/models.rb
 - lib/presto/client/query.rb
 - lib/presto/client/statement_client.rb
 - lib/presto/client/version.rb
+- modelgen/model_versions.rb
 - modelgen/modelgen.rb
 - modelgen/models.rb
 - modelgen/presto_models.rb
 - presto-client.gemspec
 - spec/client_spec.rb
+- spec/model_spec.rb
 - spec/spec_helper.rb
 - spec/statement_client_spec.rb
 homepage: https://github.com/treasure-data/presto-client-ruby
@@ -154,5 +158,6 @@ specification_version: 4
 summary: Presto client library
 test_files:
 - spec/client_spec.rb
+- spec/model_spec.rb
 - spec/spec_helper.rb
 - spec/statement_client_spec.rb