presto-client 0.4.17 → 0.5.0

data/lib/presto/client/statement_client.rb

@@ -48,11 +48,17 @@ module Presto::Client
       @closed = false
       @exception = nil
 
+      if model_version = @options[:model_version]
+        @models = ModelVersions.const_get("V#{model_version.gsub(".", "_")}")
+      else
+        @models = Models
+      end
+
       @faraday.headers.merge!(optional_headers)
 
       if next_uri
         body = faraday_get_with_retry(next_uri)
-        @results = Models::QueryResults.decode(MultiJson.load(body))
+        @results = @models::QueryResults.decode(MultiJson.load(body))
       else
         post_query_request!
       end
@@ -108,7 +114,7 @@ module Presto::Client
       end
 
       body = response.body
-      @results = load_json(uri, body, Models::QueryResults)
+      @results = load_json(uri, body, @models::QueryResults)
     end
 
     private :post_query_request!
@@ -152,7 +158,7 @@ module Presto::Client
       uri = @results.next_uri
 
       body = faraday_get_with_retry(uri)
-      @results = load_json(uri, body, Models::QueryResults)
+      @results = load_json(uri, body, @models::QueryResults)
 
       return true
     end
@@ -160,7 +166,7 @@ module Presto::Client
     def query_info
       uri = "/v1/query/#{@results.id}"
       body = faraday_get_with_retry(uri)
-      load_json(uri, body, Models::QueryInfo)
+      load_json(uri, body, @models::QueryInfo)
     end
 
     def load_json(uri, body, body_class)

data/lib/presto/client/version.rb

@@ -15,6 +15,6 @@
 #
 module Presto
   module Client
-    VERSION = "0.4.17"
+    VERSION = "0.5.0"
   end
 end

data/modelgen/model_versions.rb

@@ -0,0 +1,247 @@
+#
+# Presto client for Ruby
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+module Presto::Client::ModelVersions
+
+  ####
+  ## lib/presto/client/model_versions/*.rb is automatically generated using "rake modelgen:all" command.
+  ## You should not edit this file directly. To modify the class definitions, edit
+  ## modelgen/model_versions.rb file and run "rake modelgen:all".
+  ##
+
+  module V<%= @model_version.gsub(".", "_") %>
+    class Base < Struct
+      class << self
+        alias_method :new_struct, :new
+
+        def new(*args)
+          new_struct(*args) do
+            # make it immutable
+            undef_method :"[]="
+            members.each do |m|
+              undef_method :"#{m}="
+            end
+
+            # replace constructor to receive hash instead of array
+            alias_method :initialize_struct, :initialize
+
+            def initialize(params={})
+              initialize_struct(*members.map {|m| params[m] })
+            end
+          end
+        end
+      end
+    end
+
+    class StageId < String
+      def initialize(str)
+        super
+        splitted = split('.', 2)
+        @query_id = splitted[0]
+        @id = splitted[1]
+      end
+
+      attr_reader :query_id, :id
+    end
+
+    class TaskId < String
+      def initialize(str)
+        super
+        splitted = split('.', 3)
+        @stage_id = StageId.new("#{splitted[0]}.#{splitted[1]}")
+        @query_id = @stage_id.query_id
+        @id = splitted[2]
+      end
+
+      attr_reader :query_id, :stage_id, :id
+    end
+
+    class ConnectorSession < Hash
+      def initialize(hash)
+        super()
+        merge!(hash)
+      end
+    end
+
+    module PlanNode
+      def self.decode(hash)
+        unless hash.is_a?(Hash)
+          raise TypeError, "Can't convert #{hash.class} to Hash"
+        end
+        model_class = case hash["@type"]
+          when "output"             then OutputNode
+          when "project"            then ProjectNode
+          when "tablescan"          then TableScanNode
+          when "values"             then ValuesNode
+          when "aggregation"        then AggregationNode
+          when "markDistinct"       then MarkDistinctNode
+          when "filter"             then FilterNode
+          when "window"             then WindowNode
+          when "rowNumber"          then RowNumberNode
+          when "topnRowNumber"      then TopNRowNumberNode
+          when "limit"              then LimitNode
+          when "distinctlimit"      then DistinctLimitNode
+          when "topn"               then TopNNode
+          when "sample"             then SampleNode
+          when "sort"               then SortNode
+          when "remoteSource"       then RemoteSourceNode
+          when "join"               then JoinNode
+          when "semijoin"           then SemiJoinNode
+          when "indexjoin"          then IndexJoinNode
+          when "indexsource"        then IndexSourceNode
+          when "tablewriter"        then TableWriterNode
+          when "delete"             then DeleteNode
+          when "metadatadelete"     then MetadataDeleteNode
+          when "tablecommit"        then TableFinishNode
+          when "unnest"             then UnnestNode
+          when "exchange"           then ExchangeNode
+          when "union"              then UnionNode
+          when "intersect"          then IntersectNode
+          when "scalar"             then EnforceSingleRowNode
+          when "groupid"            then GroupIdNode
+          when "explainAnalyze"     then ExplainAnalyzeNode
+          when "apply"              then ApplyNode
+        end
+        if model_class
+           node = model_class.decode(hash)
+           class << node
+             attr_accessor :plan_node_type
+           end
+           node.plan_node_type = hash['@type']
+           node
+        end
+      end
+    end
+
+    # io.airlift.stats.Distribution.DistributionSnapshot
+    class << DistributionSnapshot =
+        Base.new(:max_error, :count, :total, :p01, :p05, :p10, :p25, :p50, :p75, :p90, :p95, :p99, :min, :max)
+      def decode(hash)
+        unless hash.is_a?(Hash)
+          raise TypeError, "Can't convert #{hash.class} to Hash"
+        end
+        obj = allocate
+        obj.send(:initialize_struct,
+          hash["maxError"],
+          hash["count"],
+          hash["total"],
+          hash["p01"],
+          hash["p05"],
+          hash["p10"],
+          hash["p25"],
+          hash["p50"],
+          hash["p75"],
+          hash["p90"],
+          hash["p95"],
+          hash["p99"],
+          hash["min"],
+          hash["max"],
+        )
+        obj
+      end
+    end
+
+    # This is a hybrid of JoinNode.EquiJoinClause and IndexJoinNode.EquiJoinClause
+    class << EquiJoinClause =
+        Base.new(:left, :right, :probe, :index)
+      def decode(hash)
+        unless hash.is_a?(Hash)
+          raise TypeError, "Can't convert #{hash.class} to Hash"
+        end
+        obj = allocate
+        obj.send(:initialize_struct,
+          hash["left"],
+          hash["right"],
+          hash["probe"],
+          hash["index"],
+        )
+        obj
+      end
+    end
+
+    class << WriterTarget =
+        Base.new(:type, :handle)
+      def decode(hash)
+        unless hash.is_a?(Hash)
+          raise TypeError, "Can't convert #{hash.class} to Hash"
+        end
+        obj = allocate
+        model_class = case hash["@type"]
+            when "CreateHandle"       then OutputTableHandle
+            when "InsertHandle"       then InsertTableHandle
+            when "DeleteHandle"       then TableHandle
+        end
+        obj.send(:initialize_struct,
+          hash["@type"],
+          model_class.decode(hash['handle'])
+        )
+        obj
+      end
+    end
+
+    class << DeleteHandle =
+        Base.new(:handle)
+      def decode(hash)
+        unless hash.is_a?(Hash)
+          raise TypeError, "Can't convert #{hash.class} to Hash"
+        end
+        obj = allocate
+        obj.send(:initialize_struct,
+          TableHandle.decode(hash['handle'])
+        )
+        obj
+      end
+    end
+
+    # Inner classes 
+    class << Specification =
+        Base.new(:partition_by, :order_by, :orderings, :frame, :pages_added)
+      def decode(hash)
+        unless hash.is_a?(Hash)
+          raise TypeError, "Can't convert #{hash.class} to Hash"
+        end
+        obj = allocate
+        obj.send(:initialize_struct,
+          hash["partitionBy"],
+          hash["orderBy"],
+          hash["orderings"],
+          hash["frame"],
+        )
+        obj
+      end
+    end
+
+    class << ArgumentBinding =
+        Base.new(:column, :constant)
+      def decode(hash)
+        unless hash.is_a?(Hash)
+          raise TypeError, "Can't convert #{hash.class} to Hash"
+        end
+        obj = allocate
+        obj.send(:initialize_struct,
+          hash["column"],
+          hash["constant"]
+        )
+        obj
+      end
+    end
+
+    ##
+    # Those model classes are automatically generated
+    #
+
+<%= @contents %>
+  end
+end

data/modelgen/modelgen.rb

@@ -1,9 +1,10 @@
 
-if ARGV.length != 3
-  puts "usage: <presto-source-dir> <template.erb> <output.rb>"
+if ARGV.length != 4
+  puts "usage: <model-version> <presto-source-dir> <template.erb> <output.rb>"
+  exit 1
 end
 
-source_dir, template_path, output_path = *ARGV
+model_version, source_dir, template_path, output_path = *ARGV
 
 require_relative 'presto_models'
 
@@ -89,7 +90,8 @@ formatter = PrestoModels::ModelFormatter.new(
 formatter.format(models)
 
 @contents = formatter.contents
+@model_version = model_version
 
 data = erb.result
-File.open(output_path, 'w') {|f| f.write data }
+File.write(output_path, data)
 

data/modelgen/models.rb

@@ -16,232 +16,16 @@
 module Presto::Client
 
   ####
-  ## lib/presto/client/models.rb is automatically generated using "rake modelgen" command.
+  ## lib/presto/client/models.rb is automatically generated using "rake modelgen:latest" command.
   ## You should not edit this file directly. To modify the class definitions, edit
-  ## modelgen/models.rb file and run "rake modelgen".
+  ## modelgen/models.rb file and run "rake modelgen:latest".
   ##
 
-  module Models
-    class Base < Struct
-      class << self
-        alias_method :new_struct, :new
-
-        def new(*args)
-          new_struct(*args) do
-            # make it immutable
-            undef_method :"[]="
-            members.each do |m|
-              undef_method :"#{m}="
-            end
-
-            # replace constructor to receive hash instead of array
-            alias_method :initialize_struct, :initialize
-
-            def initialize(params={})
-              initialize_struct(*members.map {|m| params[m] })
-            end
-          end
-        end
-      end
-    end
-
-    class StageId < String
-      def initialize(str)
-        super
-        splitted = split('.', 2)
-        @query_id = splitted[0]
-        @id = splitted[1]
-      end
-
-      attr_reader :query_id, :id
-    end
-
-    class TaskId < String
-      def initialize(str)
-        super
-        splitted = split('.', 3)
-        @stage_id = StageId.new("#{splitted[0]}.#{splitted[1]}")
-        @query_id = @stage_id.query_id
-        @id = splitted[2]
-      end
-
-      attr_reader :query_id, :stage_id, :id
-    end
-
-    class ConnectorSession < Hash
-      def initialize(hash)
-        super()
-        merge!(hash)
-      end
-    end
-
-    module PlanNode
-      def self.decode(hash)
-        unless hash.is_a?(Hash)
-          raise TypeError, "Can't convert #{hash.class} to Hash"
-        end
-        model_class = case hash["@type"]
-          when "output"             then OutputNode
-          when "project"            then ProjectNode
-          when "tablescan"          then TableScanNode
-          when "values"             then ValuesNode
-          when "aggregation"        then AggregationNode
-          when "markDistinct"       then MarkDistinctNode
-          when "filter"             then FilterNode
-          when "window"             then WindowNode
-          when "rowNumber"          then RowNumberNode
-          when "topnRowNumber"      then TopNRowNumberNode
-          when "limit"              then LimitNode
-          when "distinctlimit"      then DistinctLimitNode
-          when "topn"               then TopNNode
-          when "sample"             then SampleNode
-          when "sort"               then SortNode
-          when "remoteSource"       then RemoteSourceNode
-          when "join"               then JoinNode
-          when "semijoin"           then SemiJoinNode
-          when "indexjoin"          then IndexJoinNode
-          when "indexsource"        then IndexSourceNode
-          when "tablewriter"        then TableWriterNode
-          when "delete"             then DeleteNode
-          when "metadatadelete"     then MetadataDeleteNode
-          when "tablecommit"        then TableFinishNode
-          when "unnest"             then UnnestNode
-          when "exchange"           then ExchangeNode
-          when "union"              then UnionNode
-          when "intersect"          then IntersectNode
-          when "scalar"             then EnforceSingleRowNode
-          when "groupid"            then GroupIdNode
-          when "explainAnalyze"     then ExplainAnalyzeNode
-          when "apply"              then ApplyNode
-        end
-        if model_class
-           node = model_class.decode(hash)
-           class << node
-             attr_accessor :plan_node_type
-           end
-           node.plan_node_type = hash['@type']
-           node
-        end
-      end
-    end
-
-    # io.airlift.stats.Distribution.DistributionSnapshot
-    class << DistributionSnapshot =
-        Base.new(:max_error, :count, :total, :p01, :p05, :p10, :p25, :p50, :p75, :p90, :p95, :p99, :min, :max)
-      def decode(hash)
-        unless hash.is_a?(Hash)
-          raise TypeError, "Can't convert #{hash.class} to Hash"
-        end
-        obj = allocate
-        obj.send(:initialize_struct,
-          hash["maxError"],
-          hash["count"],
-          hash["total"],
-          hash["p01"],
-          hash["p05"],
-          hash["p10"],
-          hash["p25"],
-          hash["p50"],
-          hash["p75"],
-          hash["p90"],
-          hash["p95"],
-          hash["p99"],
-          hash["min"],
-          hash["max"],
-        )
-        obj
-      end
-    end
-
-    # This is a hybrid of JoinNode.EquiJoinClause and IndexJoinNode.EquiJoinClause
-    class << EquiJoinClause =
-        Base.new(:left, :right, :probe, :index)
-      def decode(hash)
-        unless hash.is_a?(Hash)
-          raise TypeError, "Can't convert #{hash.class} to Hash"
-        end
-        obj = allocate
-        obj.send(:initialize_struct,
-          hash["left"],
-          hash["right"],
-          hash["probe"],
-          hash["index"],
-        )
-        obj
-      end
-    end
-
-    class << WriterTarget =
-        Base.new(:type, :handle)
-      def decode(hash)
-        unless hash.is_a?(Hash)
-          raise TypeError, "Can't convert #{hash.class} to Hash"
-        end
-        obj = allocate
-        model_class = case hash["@type"]
-            when "CreateHandle"       then OutputTableHandle
-            when "InsertHandle"       then InsertTableHandle
-            when "DeleteHandle"       then TableHandle
-        end
-        obj.send(:initialize_struct,
-          hash["@type"],
-          model_class.decode(hash['handle'])
-        )
-        obj
-      end
-    end
-
-    class << DeleteHandle =
-        Base.new(:handle)
-      def decode(hash)
-        unless hash.is_a?(Hash)
-          raise TypeError, "Can't convert #{hash.class} to Hash"
-        end
-        obj = allocate
-        obj.send(:initialize_struct,
-          TableHandle.decode(hash['handle'])
-        )
-        obj
-      end
-    end
-
-    # Inner classes 
-    class << Specification =
-        Base.new(:partition_by, :order_by, :orderings, :frame, :pages_added)
-      def decode(hash)
-        unless hash.is_a?(Hash)
-          raise TypeError, "Can't convert #{hash.class} to Hash"
-        end
-        obj = allocate
-        obj.send(:initialize_struct,
-          hash["partitionBy"],
-          hash["orderBy"],
-          hash["orderings"],
-          hash["frame"],
-        )
-        obj
-      end
-    end
-
-    class << ArgumentBinding =
-        Base.new(:column, :constant)
-      def decode(hash)
-        unless hash.is_a?(Hash)
-          raise TypeError, "Can't convert #{hash.class} to Hash"
-        end
-        obj = allocate
-        obj.send(:initialize_struct,
-          hash["column"],
-          hash["constant"]
-        )
-        obj
-      end
-    end
+  module ModelVersions
+  end
+<% @versions.each do |ver| %>
+  require 'presto/client/model_versions/<%= ver %>.rb'<% end %>
 
-    ##
-    # Those model classes are automatically generated
-    #
+  Models = ModelVersions::V<%= @latest_version.gsub(".", "_") %>
 
-<%= @contents %>
-  end
 end