td-client 0.8.32 → 0.8.33

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2012-10-10 version 0.8.33
+
+* supports import_with_id API
+* supports deflate and gzip Content-Encodings and sends Accept-Encoding header
+
+
 == 2012-10-09 version 0.8.32
 
 * Added Client#swap_table

data/lib/td/client.rb

@@ -279,8 +279,8 @@ class Client
   end
 
   # => time:Flaot
-  def import(db_name, table_name, format, stream, size)
-    @api.import(db_name, table_name, format, stream, size)
+  def import(db_name, table_name, format, stream, size, unique_id=nil)
+    @api.import(db_name, table_name, format, stream, size, unique_id)
   end
 
   # => [Result]

data/lib/td/client/api.rb

@@ -408,7 +408,7 @@ class API
         raise_error("Get job result failed", res)
       end
       if io
-        res.read_body {|fragment|
+        res.each_fragment {|fragment|
           io.write(fragment)
         }
       end
@@ -425,7 +425,7 @@ class API
         raise_error("Get job result failed", res)
       end
       u = MessagePack::Unpacker.new
-      res.read_body {|fragment|
+      res.each_fragment {|fragment|
         u.feed_each(fragment, &block)
       }
     }
@@ -744,8 +744,13 @@ class API
   ##
 
   # => time:Float
-  def import(db, table, format, stream, size)
-    code, body, res = put("/v3/table/import/#{e db}/#{e table}/#{format}", stream, size)
+  def import(db, table, format, stream, size, unique_id=nil)
+    if unique_id
+      path = "/v3/table/import_with_id/#{e db}/#{e table}/#{unique_id}/#{format}"
+    else
+      path = "/v3/table/import/#{e db}/#{e table}/#{format}"
+    end
+    code, body, res = put(path, stream, size)
     if code[0] != ?2
       raise_error("Import failed", res)
     end
@@ -1206,6 +1211,32 @@ class API
 
 
   private
+  module DeflateReadBodyMixin
+    attr_accessor :gzip
+
+    def each_fragment(&block)
+      if @gzip
+        infl = Zlib::Inflate.new(Zlib::MAX_WBITS+16)
+      else
+        infl = Zlib::Inflate.new
+      end
+      begin
+        read_body do |fragment|
+          block.call infl.inflate(fragment)
+        end
+      ensure
+        infl.close
+      end
+      nil
+    end
+  end
+
+  module DirectReadBodyMixin
+    def each_fragment(&block)
+      read_body(&block)
+    end
+  end
+
   def get(url, params=nil, &block)
     http, header = new_http
 
@@ -1216,11 +1247,42 @@ class API
       }.join('&')
     end
 
+    header['Accept-Encoding'] = 'deflate, gzip'
     request = Net::HTTP::Get.new(path, header)
 
-    response = http.request(request, &block)
+    if block
+      response = http.request(request) do |res|
+        if ce = res.header['Content-Encoding']
+          require 'zlib'
+          res.extend(DeflateReadBodyMixin)
+          res.gzip = true if ce == 'gzip'
+        else
+          res.extend(DirectReadBodyMixin)
+        end
+        block.call(res)
+      end
+    else
+      response = http.request(request)
+    end
+
+    body = response.body
+    unless block
+      if ce = response.header['content-encoding']
+        require 'zlib'
+        if ce == 'gzip'
+          infl = Zlib::Inflate.new(Zlib::MAX_WBITS+16)
+          begin
+            body = infl.inflate(body)
+          ensure
+            infl.close
+          end
+        else
+          body = Zlib::Inflate.inflate(body)
+        end
+      end
+    end
 
-    return [response.code, response.body, response]
+    return [response.code, body, response]
   end
 
   def post(url, params=nil)

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.32'
+VERSION = '0.8.33'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.32
+  version: 0.8.33
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack