presto-client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjkzMDA1ZjE0N2U5NjQ2ODUwOTg4NDhkMTk3YTEwODcwZDNlYzE3Ng==
+    OGRjOWI0ZDk4MmVhYmMwYTY0NjQwMWM4NWViNzMyYmI4OTMwYzEzMw==
   data.tar.gz: !binary |-
-    ZDhkMzczNzM0YWE2OGFmZWYwZjAyZjM2Yzk0NGUzZDdlMzRlZGU1Yw==
+    NDVhZjQyMzU3YTdjNGQxYjk5ZDUwMzVkYjU1NmQ3M2I4YmNmZGMyYw==
 SHA512:
   metadata.gz: !binary |-
-    ODczY2ZmNmU2YjU4ZjhiNzBhYWE1MDIxMTNhYjIyMDFlYTkxMzYwYWQwOTRj
-    NzI1YmE4MDRjNDVkMjIzN2FkMzVkYTFhZTdjZDU5YWQwMzEzZjA0ZTgwOGY4
-    MmYyNzdmODY5ZmNjZGIzY2Y2ZTIzOTgxZDk1ZTliMjc1YWE4OGQ=
+    ZTAyMDg4ZDE0OTkzMmQzODMwMGUxYWE2MDNhOWRmODc0NTkyOGE3ODIzNzg1
+    YzZlODlmYjFjZWYzODUwM2QyOTdiMWUxMWExMGVhMTUwMzQ2NTViYTI0YTA3
+    ZWRmYWViNWVlNTA4MzQ2ZTI4NTI0OTQzMDgzZmY5YjI0OTY2NWQ=
   data.tar.gz: !binary |-
-    YzM1MmIwODUyOWIyZTU1MzM1MmUyNGNhMGE4NzYwZTQzYzY5MjBlNDAxYjdh
-    MWRjMWQyODBhZTRmZWIwN2I0NjUzOTI3MjAxYmMxZjk2YjA1YmJiMDgzOTY1
-    Zjk3NGMwZjRiNzg3NTY5NmRiOWRhYmQ5N2UwMTc5MDYwNzUzMmI=
+    MDliZTcxOTEyOWY5YjhiZDM3ZTM3MzRkYTVjNDM5OTZjNDk4Y2MzYzVhOWFk
+    NWM1NWQ5ZjlkZmZmZDc5YWFkNzY2ZTVkY2VjOGUyMjBhNjkxNjhjOGVjODA2
+    YjdiNGM5OThhNDljMzI4NzYwMzJiNGE4ZTMyYzNkMDRhMDI2ZmI=

data/ChangeLog

@@ -1,4 +1,17 @@
 
+2014-06-12 version 0.4.1:
+
+* Added EquiJoinClause model class
+* Added StageId#query_id and #id methods
+* Added TaskId#query_id, #stage_id and #id methods
+
+
+2014-06-10 version 0.4.0:
+
+* Added Query#current_results, #advance and #query_info for advanced users
+* Generate model classes from Presto source code to include complete classes
+
+
 2014-05-06 version 0.3.3:
 
 * Added :time_zone and :language options added by Presto 0.66

data/lib/presto/client/models.rb

@@ -49,9 +49,26 @@ module Presto::Client
     end
 
     class StageId < String
+      def initialize(str)
+        super
+        splitted = split('.', 2)
+        @query_id = QueryId.new(splitted[0])
+        @id = QueryId.new(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 PlanNodeId < String
@@ -96,7 +113,6 @@ module Presto::Client
           when "indexsource"        then IndexSourceNode
           when "tablewriter"        then TableWriterNode
           when "tablecommit"        then TableCommitNode
-          else
           end
         model_class.decode(hash) if model_class
       end
@@ -127,6 +143,17 @@ module Presto::Client
       end
     end
 
+    class << EquiJoinClause =
+        Base.new(:left, :right)
+      def decode(hash)
+        obj = allocate
+        obj.send(:initialize_struct,
+          hash["left"],
+          hash["right"],
+        )
+        obj
+      end
+    end
 
     ##
     # Those model classes are automatically generated
@@ -334,6 +361,7 @@ module Presto::Client
           hash["type"],
           hash["probeSource"] && PlanNode.decode(hash["probeSource"]),
           hash["indexSource"] && PlanNode.decode(hash["indexSource"]),
+          hash["criteria"] && hash["criteria"].map {|h| EquiJoinClause.decode(h) },
         )
         obj
       end
@@ -378,6 +406,7 @@ module Presto::Client
           hash["type"],
           hash["left"] && PlanNode.decode(hash["left"]),
           hash["right"] && PlanNode.decode(hash["right"]),
+          hash["criteria"] && hash["criteria"].map {|h| EquiJoinClause.decode(h) },
         )
         obj
       end

data/lib/presto/client/version.rb

@@ -15,6 +15,6 @@
 #
 module Presto
   module Client
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/modelgen/modelgen.rb

@@ -13,7 +13,7 @@ erb = ERB.new(File.read(template_path))
 source_path = "/Users/frsyuki/project/presto-client-ruby/presto"
 
 predefined_simple_classes = %w[QueryId StageId TaskId PlanNodeId PlanFragmentId ConnectorSession]
-predefined_models = %w[DistributionSnapshot PlanNode]
+predefined_models = %w[DistributionSnapshot PlanNode EquiJoinClause]
 
 assume_primitive = %w[Object Type Symbol URI Duration DataSize DateTime ConnectorTableHandle ConnectorOutputTableHandle ConnectorIndexHandle ConnectorColumnHandle Expression FunctionCall]
 enum_types = %w[QueryState StageState TaskState QueueState PlanDistribution OutputPartitioning Step SortOrder]

data/modelgen/models.rb

@@ -49,9 +49,26 @@ module Presto::Client
     end
 
     class StageId < String
+      def initialize(str)
+        super
+        splitted = split('.', 2)
+        @query_id = QueryId.new(splitted[0])
+        @id = QueryId.new(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 PlanNodeId < String
@@ -87,6 +104,10 @@ module Presto::Client
           when "exchange"           then ExchangeNode
           when "sink"               then SinkNode
           when "join"               then JoinNode
+          when "INNER"              then JoinNode
+          when "LEFT"               then JoinNode
+          when "RIGHT"              then JoinNode
+          when "CROSS"              then JoinNode
           when "semijoin"           then SemiJoinNode
           when "indexjoin"          then IndexJoinNode
           when "indexsource"        then IndexSourceNode
@@ -122,6 +143,17 @@ module Presto::Client
       end
     end
 
+    class << EquiJoinClause =
+        Base.new(:left, :right)
+      def decode(hash)
+        obj = allocate
+        obj.send(:initialize_struct,
+          hash["left"],
+          hash["right"],
+        )
+        obj
+      end
+    end
 
     ##
     # Those model classes are automatically generated

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: presto-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday