td-client 0.8.44 → 0.8.45

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2012-01-25 version 0.8.45
+
+* Re-implement Client#job_status using /v3/job/status/job_id
+  instead of /v3/job/show/job_id to poll the progress of a job
+
+
 == 2012-01-23 version 0.8.44
 
 * Re-add json gem dependency

data/lib/td/client.rb

@@ -140,11 +140,9 @@ class Client
     Job.new(self, job_id, type, query, status, url, debug, start_at, end_at, nil, result_url, hive_result_schema, priority, retry_limit, org, db)
   end
 
-  # => type:Symbol, url:String
+  # => status:String
   def job_status(job_id)
-    # use v3/job/status instead of v3/job/show to poll finish of a job
-    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, retry_limit, org, db = @api.show_job(job_id)
-    return query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, retry_limit, org, db
+    return @api.job_status(job_id)
   end
 
   # => result:[{column:String=>value:Object]

data/lib/td/client/api.rb

@@ -397,6 +397,16 @@ class API
     return [type, query, status, url, debug, start_at, end_at, result, hive_result_schema, priority, retry_limit, organization, database]
   end
 
+  def job_status(job_id)
+    code, body, res = get("/v3/job/status/#{e job_id}")
+    if code != "200"
+      raise_error("Get job status failed", res)
+    end
+
+    js = checked_json(body, %w[status])
+    return js['status']
+  end
+
   def job_result(job_id)
     require 'msgpack'
     code, body, res = get("/v3/job/result/#{e job_id}", {'format'=>'msgpack'})

data/lib/td/client/model.rb

@@ -309,8 +309,8 @@ class Job < Model
   end
 
   def finished?
-    update_status! unless @status
-    if FINISHED_STATUS.include?(@status)
+    update_progress! unless @status
+    if FINISHED_STATUS.include?(@status)      
       return true
     else
       return false
@@ -322,22 +322,26 @@ class Job < Model
   end
 
   def success?
-    update_status! unless @status
+    update_progress! unless @status
     @status == "success"
   end
 
   def error?
-    update_status! unless @status
+    update_progress! unless @status
     @status == "error"
   end
 
   def killed?
-    update_status! unless @status
+    update_progress! unless @status
     @status == "killed"
   end
 
+  def update_progress!
+    @status = @client.job_status(@job_id)
+  end
+
   def update_status!
-    query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, retry_limit, org_name, db_name = @client.job_status(@job_id)
+    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, retry_limit, org_name, db_name = @client.api.show_job(@job_id)
     @query = query
     @status = status
     @url = url

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.44'
+VERSION = '0.8.45'
 
 end

data/spec/td/client/job_api_spec.rb

@@ -74,6 +74,26 @@ describe 'Job API' do
     end
   end
 
+  describe 'job status' do
+    (0...MAX_JOB).each { |i|
+      it 'should return the status of a job #{i}' do
+        job_id = i.to_s
+        raw_job = raw_jobs[i]
+        result_job = {
+          'job_id' => raw_job['job_id'],
+          'status' => raw_job['status'],
+          'created_at' => raw_job['created_at'],
+          'start_at' => raw_job['start_at'],
+          'end_at' => raw_job['end_at'],
+        }
+        stub_api_request(:get, "/v3/job/status/#{e(job_id)}").to_return(:body => result_job.to_json)
+
+        status = api.job_status(job_id)
+        status.should == (i.odd? ? 'success' : 'error')
+      end
+    }
+  end
+
   describe 'hive_query' do
     let :return_body do
       {:body => {'job_id' => '1'}.to_json}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.44
+  version: 0.8.45
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack