td-client 0.8.84 → 0.8.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cf8a70e24c1afadf7756f4b7e97f05b194b9e02
-  data.tar.gz: 19cd3b2d119d5cfd45ed275047d698345cb99047
+  metadata.gz: 60a54746395659411ee0e31937d4456acf1161db
+  data.tar.gz: 86d0d880f287ef9ee6919fdfac91ad1211d887fa
 SHA512:
-  metadata.gz: c729351e09ef71b1b67dec38d4ea413831de6936248e9784d29138fe82f0cda1adf203fc503ce048baf7b9990b28f2c79cad1c456155e421a0c0e44e27aa1a20
-  data.tar.gz: 76ab4a900d117a2fe0b5c500f544287615d453770ec10211f69756f4b2b607a8ccfb6942bc662b758053e44d26ab6ab1554d4fdf9eddfcec753247f712c6d857
+  metadata.gz: 177e498d108552a2b549755455a34e6ac811cf8f06510cf2cb612b53f33ac13876c524fb8390f84459efb52ec00b2316ed8b0fb8a77daf2b11c56674e47bc318
+  data.tar.gz: fd06041a13ded4aeddb1514ce10f0225140d72a70a4dafa2305c77935415b59230d9c31b54378ab5ed04217b1cca4f06a19d1147f54e6c476209ab490adf816a

data/lib/td/client.rb

@@ -182,10 +182,10 @@ class Client
     results = @api.list_jobs(from, to, status, conditions)
     results.map {|job_id, type, status, query, start_at, end_at, cpu_time,
                  result_size, result_url, priority, retry_limit, org, db,
-                 duration|
+                 duration, num_records|
       Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at, cpu_time,
               result_size, nil, result_url, nil, priority, retry_limit, org, db,
-              duration)
+              duration, num_records)
     }
   end
 
@@ -194,9 +194,9 @@ class Client
   def job(job_id)
     job_id = job_id.to_s
     type, query, status, url, debug, start_at, end_at, cpu_time,
-      result_size, result_url, hive_result_schema, priority, retry_limit, org, db = @api.show_job(job_id)
+      result_size, result_url, hive_result_schema, priority, retry_limit, org, db, num_records = @api.show_job(job_id)
     Job.new(self, job_id, type, query, status, url, debug, start_at, end_at, cpu_time,
-            result_size, nil, result_url, hive_result_schema, priority, retry_limit, org, db)
+            result_size, nil, result_url, hive_result_schema, priority, retry_limit, org, db, num_records)
   end
 
   # @param [String] job_id
@@ -254,6 +254,14 @@ class Client
     Job.new(self, job_id, :export, nil)
   end
 
+  # @param [String] target_job_id
+  # @param [Hash] opts
+  # @return [Job]
+  def result_export(target_job_id, opts={})
+    job_id = @api.result_export(target_job_id, opts)
+    Job.new(self, job_id, :result_export, nil)
+  end
+
   # @param [String] db_name
   # @param [String] table_name
   # @param [Fixnum] to

data/lib/td/client/api.rb

@@ -149,15 +149,27 @@ class API
     end
 
     name = name.to_s
-    if name.empty?
-      raise ParameterValidationError,
+    if max_len
+      if name.length < min_len || name.length > max_len
+        raise ParameterValidationError,
+          "#{target.capitalize} name must be between #{min_len} and #{max_len} characters long. Got #{name.length} " +
+          (name.length == 1 ? "character" : "characters") + "."
+      end
+    else
+      if min_len == 1
+        if name.empty?
+          raise ParameterValidationError,
             "Empty #{target} name is not allowed"
-    end
-    if name.length < min_len || name.length > max_len
-      raise ParameterValidationError,
-            "#{target.capitalize} name must be between #{min_len} and #{max_len} characters long. Got #{name.length} " +
+        end
+      else
+        if name.length < min_len
+          raise ParameterValidationError,
+            "#{target.capitalize} name must be longer than #{min_len} characters. Got #{name.length} " +
             (name.length == 1 ? "character" : "characters") + "."
+        end
+      end
     end
+
     unless name =~ /^([a-z0-9_]+)$/
       raise ParameterValidationError,
             "#{target.capitalize} name must only consist of lower-case alpha-numeric characters and '_'."
@@ -184,25 +196,17 @@ class API
   # @param [String] name
   def self.validate_column_name(name)
     target = 'column'
-    min_len = 1
-    max_len = 128
     name = name.to_s
     if name.empty?
       raise ParameterValidationError,
             "Empty #{target} name is not allowed"
     end
-    if name.length < min_len || name.length > max_len
-      raise ParameterValidationError,
-            "#{target.capitalize} name must be between #{min_len} and #{max_len} characters long. Got #{name.length} " +
-            (name.length == 1 ? "character" : "characters") + "."
-    end
-
     name
   end
 
   # @param [String] name
   def self.validate_sql_alias_name(name)
-    validate_name("sql_alias", 1, 128, name)
+    validate_name("sql_alias", 1, nil, name)
   end
 
   # @param [String] name

data/lib/td/client/api/export.rb

@@ -22,5 +22,17 @@ module Export
     return js['job_id'].to_s
   end
 
+  # => jobId:String
+  # @param [String] target_job_id
+  # @param [Hash] opts
+  # @return [String] job_id
+  def result_export(target_job_id, opts={})
+    code, body, res = post("/v3/job/result_export/#{target_job_id}", opts)
+    if code != "200"
+      raise_error("Result Export failed", res)
+    end
+    js = checked_json(body, %w[job_id])
+    return js['job_id'].to_s
+  end
 end
 end

data/lib/td/client/api/job.rb

@@ -36,9 +36,10 @@ module Job
       priority = m['priority']
       retry_limit = m['retry_limit']
       duration = m['duration']
+      num_records = m['num_records']
       result << [job_id, type, status, query, start_at, end_at, cpu_time,
                  result_size, result_url, priority, retry_limit, nil, database,
-                 duration]
+                 duration, num_records]
     }
     return result
   end
@@ -63,6 +64,7 @@ module Job
     end_at = js['end_at']
     cpu_time = js['cpu_time']
     result_size = js['result_size'] # compressed result size in msgpack.gz format
+    num_records = js['num_records']
     result = js['result'] # result target URL
     hive_result_schema = (js['hive_result_schema'] || '')
     if hive_result_schema.empty?
@@ -97,7 +99,7 @@ module Job
     priority = js['priority']
     retry_limit = js['retry_limit']
     return [type, query, status, url, debug, start_at, end_at, cpu_time,
-            result_size, result, hive_result_schema, priority, retry_limit, nil, database]
+            result_size, result, hive_result_schema, priority, retry_limit, nil, database, num_records]
   end
 
   # @param [String] job_id

data/lib/td/client/model.rb

@@ -402,9 +402,10 @@ class Job < Model
   # @param [String] org_name
   # @param [String] db_name
   # @param [Fixnum] duration
+  # @param [Fixnum] num_records
   def initialize(client, job_id, type, query, status=nil, url=nil, debug=nil, start_at=nil, end_at=nil, cpu_time=nil,
                  result_size=nil, result=nil, result_url=nil, hive_result_schema=nil, priority=nil, retry_limit=nil,
-                 org_name=nil, db_name=nil, duration=nil)
+                 org_name=nil, db_name=nil, duration=nil, num_records=nil)
     super(client)
     @job_id = job_id
     @type = type
@@ -423,6 +424,7 @@ class Job < Model
     @retry_limit = retry_limit
     @db_name = db_name
     @duration = duration
+    @num_records = num_records
   end
 
   # @!attribute [r] job_id
@@ -433,26 +435,35 @@ class Job < Model
   # @!attribute [r] org_name
   # @!attribute [r] db_name
   # @!attribute [r] duration
+  # @!attribute [r] num_records
   attr_reader :job_id, :type, :result_url
   attr_reader :priority, :retry_limit, :org_name, :db_name
-  attr_reader :duration
+  attr_reader :duration, :num_records
 
   # @option timeout [Integer,nil] timeout in second
   # @option wait_interval [Integer,nil] interval in second of polling the job status
   # @param detail [Boolean] update job detail or not
   # @param verbose [Boolean] out retry log to stderr or not
-  def wait(timeout=nil, wait_interval=2, detail: false, verbose: ENV['TD_CLIENT_DEBUG'])
-    deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + timeout if timeout
+  def wait(*args)
+    opthash = Hash.try_convert(args.last)
+    if opthash
+      args.pop
+      detail = opthash.fetch(:detail, false)
+      verbose = opthash.fetch(:verbose, ENV['TD_CLIENT_DEBUG'])
+    end
+    timeout = args[0]
+    wait_interval = args[1] || 2
+    deadline = monotonic_clock + timeout if timeout
     timeout_klass = Class.new(Exception)
     begin
       if timeout
-        if deadline <= Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        if deadline <= monotonic_clock
           raise timeout_klass, "timeout (#{timeout}) exceeded wait_interval=#{wait_interval}"
         end
       end
       sleep wait_interval
+      detail ? update_status! : update_progress!
       yield self if block_given?
-        detail ? update_status! : update_progress!
     rescue timeout_klass
       raise Timeout::Error, $!.message
     rescue Timeout::Error, SystemCallError, EOFError, SocketError, HTTPClient::ConnectTimeoutError
@@ -606,7 +617,7 @@ class Job < Model
   def update_status!
     type, query, status, url, debug, start_at, end_at, cpu_time,
       result_size, result_url, hive_result_schema, priority, retry_limit,
-      org_name, db_name = @client.api.show_job(@job_id)
+      org_name, db_name , num_records = @client.api.show_job(@job_id)
     @query = query
     @status = status
     @url = url
@@ -620,8 +631,18 @@ class Job < Model
     @priority = priority
     @retry_limit = retry_limit
     @db_name = db_name
+    @num_records = num_records
     self
   end
+
+  private
+  def monotonic_clock
+    if defined?(Process.clock_gettime)
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    else
+      Time.now.to_i
+    end
+  end
 end
 
 

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '0.8.84'
+    VERSION = '0.8.85'
   end
 end

data/spec/td/client/api_spec.rb

@@ -126,7 +126,7 @@ describe API do
 
     describe "'validate_column_name'" do
       it 'should raise a ParameterValidationError exception' do
-        ['', 'a'*129].each { |ng|
+        [''].each { |ng|
           expect {
             API.validate_column_name(ng)
           }.to raise_error(ParameterValidationError)
@@ -137,7 +137,7 @@ describe API do
         VALID_NAMES.each {|ok|
           expect(API.validate_column_name(ok)).to eq(ok)
         }
-        ['a', 'a'*128].each {|ok|
+        ['a', 'a'*255].each {|ok|
           expect(API.validate_column_name(ok)).to eq(ok)
         }
       end
@@ -145,7 +145,7 @@ describe API do
 
     describe "'validate_sql_alias_name'" do
       it 'should raise a ParameterValidationError exception' do
-        ['', 'a'*129].each { |ng|
+        [''].each { |ng|
           expect{API.validate_sql_alias_name(ng)}.to raise_error(ParameterValidationError)
         }
         valid = ("a".."z").to_a.join<<("0".."9").to_a.join<<"_"
@@ -159,7 +159,7 @@ describe API do
         VALID_NAMES.each {|ok|
           expect(API.validate_sql_alias_name(ok)).to eq(ok)
         }
-        ['a', '_a', 'a_', 'a'*128].each {|ok|
+        ['a', '_a', 'a_', 'a'*512].each {|ok|
           expect(API.validate_sql_alias_name(ok)).to eq(ok)
         }
       end

data/spec/td/client/export_api_spec.rb

@@ -37,5 +37,15 @@ describe 'Export API' do
 
     # TODO: Add other parameters spec
   end
+
+  describe 'result_export' do
+    it 'should export result successfully' do
+      params = {'result' => 'mysql://user:pass@host.com/database/table'}
+      stub_api_request(:post, "/v3/job/result_export/100").with(:body => params).
+        to_return(:body => {'job_id' => '101'}.to_json)
+
+      expect(api.result_export(100, params)).to eq('101')
+    end
+  end
 end
 

data/spec/td/client/job_api_spec.rb

@@ -31,7 +31,7 @@ describe 'Job API' do
         jobs = api.list_jobs
         jobs[i..i].map {|job_id, type, status, query, start_at, end_at, cpu_time,
                       result_size, result_url, priority, retry_limit, org, db,
-                      duration|
+                      duration, num_records|
           expect(job_id).to eq(job['job_id'])
           expect(type).to eq(job['type'])
           expect(status).to eq(job['status'])
@@ -46,6 +46,7 @@ describe 'Job API' do
           expect(org).to eq(job['organization'])
           expect(db).to eq(job['database'])
           expect(duration).to eq(job['duration'])
+          expect(num_records).to eq(job['num_records'])
         }
       end
     }
@@ -74,7 +75,7 @@ describe 'Job API' do
         stub_api_request(:get, "/v3/job/show/#{e(i)}").to_return(:body => job.to_json)
 
         type, query, status, url, debug, start_at, end_at, cpu_time,
-          result_size, result_url, hive_result_schema, priority, retry_limit, org, db = api.show_job(i)
+          result_size, result_url, hive_result_schema, priority, retry_limit, org, db, num_records = api.show_job(i)
         expect(type).to eq(job['type'])
         expect(query).to eq(job['query'])
         expect(status).to eq(job['status'])
@@ -90,6 +91,7 @@ describe 'Job API' do
         expect(priority).to eq(job['priority'])
         expect(org).to eq(job['organization'])
         expect(db).to eq(job['database'])
+        expect(num_records).to eq(job['num_records'])
       end
     }
 
@@ -669,7 +671,7 @@ describe 'Job API' do
       s.string
     end
     let :deflated do
-      Zlib.deflate(formatted)
+      Zlib::Deflate.deflate(formatted)
     end
     subject do
       str = ''

data/spec/td/client/model_job_spec.rb

@@ -26,7 +26,7 @@ describe 'Job Model' do
         'job_id', 'type', 'query', 'status', 'url', 'debug',
         'start_at', 'end_at', 'cpu_time', 'result_size', 'result', 'result_url',
         'hive_result_schema', 'priority', 'retry_limit', 'org_name', 'db_name',
-        'duration'
+        'duration', 'num_records'
       ].map {|name| job_attributes[name]}
     end
 

data/spec/td/client/spec_resources.rb

@@ -86,6 +86,7 @@ shared_context 'job resources' do
         "result_size"        => i * 1000,
         'retry_limit'        => 10,
         "duration"           => i,
+        "num_records"        => i * 1000,
         'organization'       => nil,
         'hive_result_schema' => nil,
         'debug' => {

data/spec/td/client_spec.rb

@@ -39,6 +39,7 @@ describe 'Command' do
         expect(job.org_name).to     eq raw_jobs[i]['organization']
         expect(job.db_name).to      eq raw_jobs[i]['database']
         expect(job.duration).to     eq raw_jobs[i]['duration']
+        expect(job.num_records).to  eq raw_jobs[i]['num_records']
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.84
+  version: 0.8.85
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Treasure Data API library for Ruby