td-client 0.8.0 → 0.8.1

data/ChangeLog

@@ -1,4 +1,11 @@
 
+== 2011-09-09 version 0.8.1
+
+* Added Client#kill method
+* Client.authenticate throws AuthError instead of APIError when
+  status code is 400
+
+
 == 2011-08-21 version 0.8.0
 
 * First release

data/lib/td/client.rb

@@ -141,6 +141,11 @@ class Client
     @api.job_result_each(job_id, &block)
   end
 
+  # => former_status:String
+  def kill(job_id)
+    @api.kill(job_id)
+  end
+
   # => time:Flaot
   def import(db_name, table_name, format, stream, size)
     @api.import(db_name, table_name, format, stream, size)

data/lib/td/client/api.rb

@@ -274,6 +274,17 @@ class API
     return body
   end
 
+  def kill(job_id)
+    code, body, res = post("/v3/job/kill/#{e job_id}")
+    if code != "200"
+      raise_error("Get job result failed", res)
+    end
+    # TODO format check
+    js = JSON.load(body)
+    former_status = js['former_status']
+    return former_status
+  end
+
   # => jobId:String
   def hive_query(q, db=nil)
     code, body, res = post("/v3/job/issue/hive/#{e db}", {'query'=>q})
@@ -311,7 +322,11 @@ class API
   def authenticate(user, password)
     code, body, res = post("/v3/user/authenticate", {'user'=>user, 'password'=>password})
     if code != "200"
-      raise_error("Authentication failed", res)
+      if code == "400"
+        raise_error("Authentication failed", res, AuthError)
+      else
+        raise_error("Authentication failed", res)
+      end
     end
     # TODO format check
     js = JSON.load(body)
@@ -423,13 +438,15 @@ class API
     return http, header
   end
 
-  def raise_error(msg, res)
+  def raise_error(msg, res, klass=nil)
     begin
       js = JSON.load(res.body)
       msg = js['message']
       error_code = js['error_code']
 
-      if res.code == "404"
+      if klass
+        raise klass, "#{error_code}: #{msg}"
+      elsif res.code == "404"
         raise NotFoundError, "#{error_code}: #{msg}"
       elsif res.code == "409"
         raise AlreadyExistsError, "#{error_code}: #{msg}"
@@ -438,7 +455,9 @@ class API
       end
 
     rescue
-      if res.code == "404"
+      if klass
+        raise klass, "#{error_code}: #{msg}"
+      elsif res.code == "404"
         raise NotFoundError, "#{msg}: #{res.body}"
       elsif res.code == "409"
         raise AlreadyExistsError, "#{msg}: #{res.body}"

data/lib/td/client/model.rb

@@ -126,6 +126,14 @@ class Schema
 end
 
 class Job < Model
+  STATUS_QUEUED = "queued"
+  STATUS_BOOTING = "booting"
+  STATUS_RUNNING = "running"
+  STATUS_SUCCESS = "success"
+  STATUS_ERROR = "error"
+  STATUS_KILLED = "killed"
+  FINISHED_STATUS = [STATUS_SUCCESS, STATUS_ERROR, STATUS_KILLED]
+
   def initialize(client, job_id, type, query, status=nil, url=nil, debug=nil, start_at=nil, end_at=nil, result=nil)
     super(client)
     @job_id = job_id
@@ -145,6 +153,10 @@ class Job < Model
     # TODO
   end
 
+  def kill!
+    # TODO
+  end
+
   def query
     update_status! unless @query
     @query
@@ -199,7 +211,7 @@ class Job < Model
 
   def finished?
     update_status! unless @status
-    if @status == "success" || @status == "error"
+    if FINISHED_STATUS.include?(@status)
       return true
     else
       return false
@@ -220,6 +232,11 @@ class Job < Model
     @status == "error"
   end
 
+  def killed?
+    update_status! unless @status
+    @status == "killed"
+  end
+
   def update_status!
     query, status, url, debug, start_at, end_at = @client.job_status(@job_id)
     @query = query

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.0'
+VERSION = '0.8.1'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: td-client
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-21 00:00:00 +09:00
+date: 2011-09-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency