presto-client 0.4.1 → 0.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGRjOWI0ZDk4MmVhYmMwYTY0NjQwMWM4NWViNzMyYmI4OTMwYzEzMw==
+    OGU1Zjc0ZTVmNmY0ZGM3YzcyMjgyY2RkNDJhOWFmODhkMWY4ZTI5Ng==
   data.tar.gz: !binary |-
-    NDVhZjQyMzU3YTdjNGQxYjk5ZDUwMzVkYjU1NmQ3M2I4YmNmZGMyYw==
+    NTY1NDcwYTM5ODMxY2M5OWE2ZDRkZjEzOWIxMGIxOGVjZTY0YzQ3NQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTAyMDg4ZDE0OTkzMmQzODMwMGUxYWE2MDNhOWRmODc0NTkyOGE3ODIzNzg1
-    YzZlODlmYjFjZWYzODUwM2QyOTdiMWUxMWExMGVhMTUwMzQ2NTViYTI0YTA3
-    ZWRmYWViNWVlNTA4MzQ2ZTI4NTI0OTQzMDgzZmY5YjI0OTY2NWQ=
+    MTBjYmQ4OWJjOTk1MTcyZDY2OWRlMzJmNWU1ZTM1NDlhM2QyYTczNThlNDdi
+    OWQxMjYzMDVmYjlkNjE5ZDEwNzU2NDhiN2I2ZDJjNTE2MTgzYjcxYTljMTY2
+    NDE3YjI1Zjk5YmRjYjdjNDI1NDlmMzFiYzlkZWY1NDE5YTdkMzQ=
   data.tar.gz: !binary |-
-    MDliZTcxOTEyOWY5YjhiZDM3ZTM3MzRkYTVjNDM5OTZjNDk4Y2MzYzVhOWFk
-    NWM1NWQ5ZjlkZmZmZDc5YWFkNzY2ZTVkY2VjOGUyMjBhNjkxNjhjOGVjODA2
-    YjdiNGM5OThhNDljMzI4NzYwMzJiNGE4ZTMyYzNkMDRhMDI2ZmI=
+    OWVlY2QwMmNiNWZhNWM1NmFhZDU5NzcwMGM0ODZlYzA4YTA2Y2I2ODg1YTUz
+    NjE0NjIyNjg1NzVkYmQ2ZGZkNTY4ODE4MGUxYjk1ZGEyNThiZWRkZTM2ZmQz
+    YWUwZjY5OWVmZDM2ZjUwYzMyYjQyYTkwZjk1OWZhN2U5Nzk4N2M=

data/ChangeLog

@@ -1,4 +1,10 @@
 
+2014-10-15 version 0.4.2:
+
+* Added support for :properties option to set session properties introduced
+since Presto 0.78
+
+
 2014-06-12 version 0.4.1:
 
 * Added EquiJoinClause model class

data/README.md

@@ -16,6 +16,9 @@ client = Presto::Client.new(
   catalog: "native",
   schema: "default",
   user: "frsyuki",
+  time_zone: "US/Pacific", # optional
+  language: "en_us", # optional
+  properties: {"hello" => "world", "mycatalog.hello" => "world"},  # optional
   http_debug: true,
 )
 

data/lib/presto/client/statement_client.rb

@@ -26,6 +26,7 @@ module Presto::Client
     PRESTO_SCHEMA = "X-Presto-Schema"
     PRESTO_TIME_ZONE = "X-Presto-Time-Zone"
     PRESTO_LANGUAGE = "X-Presto-Language"
+    PRESTO_SESSION = "X-Presto-Session"
 
     PRESTO_CURRENT_STATE = "X-Presto-Current-State"
     PRESTO_MAX_WAIT = "X-Presto-Max-Wait"
@@ -78,6 +79,9 @@ module Presto::Client
         if v = @options[:language]
           req.headers[PrestoHeaders::PRESTO_LANGUAGE] = v
         end
+        if v = @options[:properties]
+          req.headers[PrestoHeaders::PRESTO_SESSION] = encode_properties(v)
+        end
 
         req.body = @query
       end
@@ -183,6 +187,27 @@ module Presto::Client
       return false
     end
 
+    HTTP11_SEPARATOR = ["(", ")", "<", ">", "@", ",", ";", ":", "\\", "<", ">", "/", "[", "]", "?", "=", "{", "}", " ", "\v"]
+    HTTP11_TOKEN_CHARSET = (32..126).map {|x| x.chr } - HTTP11_SEPARATOR
+    HTTP11_TOKEN_REGEXP = /^[#{Regexp.escape(HTTP11_TOKEN_CHARSET.join)}]+\z/
+    HTTP11_CTL_CHARSET = (0..31).map {|x| x.chr } + [127.chr]
+    HTTP11_CTL_CHARSET_REGEXP = /[#{Regexp.escape(HTTP11_CTL_CHARSET.join)}]/
+
+    def encode_properties(properties)
+      # this is a hack to set same header multiple times.
+      properties.map do |k, v|
+        token = k.to_s
+        field_value = v.to_s  # TODO LWS encoding is not implemented
+        unless k =~ HTTP11_TOKEN_REGEXP
+          raise Faraday::ClientError, "Key of properties can't include HTTP/1.1 control characters or separators (#{HTTP11_SEPARATOR.map {|c| c =~ /\s/ ? c.dump : c }.join(' ')})"
+        end
+        if field_value =~ HTTP11_CTL_CHARSET_REGEXP
+          raise Faraday::ClientError, "Value of properties can't include HTTP/1.1 control characters"
+        end
+        "#{token}=#{field_value}"
+      end.join("\r\n#{PrestoHeaders::PRESTO_SESSION}: ")
+    end
+
     def close
       return if @closed
 

data/lib/presto/client/version.rb

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

data/spec/statement_client_spec.rb

@@ -9,6 +9,7 @@ describe Presto::Client::StatementClient do
       schema: "default",
       time_zone: "US/Pacific",
       language: "ja_JP",
+      properties: {"hello" => "world", "name"=>"value"},
       debug: true,
     }
   end
@@ -34,6 +35,7 @@ describe Presto::Client::StatementClient do
               "X-Presto-User" => options[:user],
               "X-Presto-Language" => options[:language],
               "X-Presto-Time-Zone" => options[:time_zone],
+              "X-Presto-Session" => options[:properties].map {|k,v| "#{k}=#{v}"}.join("\r\nX-Presto-Session: ")
     }).to_return(body: response_json.to_json)
 
     faraday = Faraday.new(url: "http://localhost")

metadata

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