td-client 0.8.18 → 0.8.19

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2012-07-03 version 0.8.19
+
+* Added Client#partial_delete
+* Client#query and Client#create_schedule support 'priority' option
+
+
 == 2012-06-26 version 0.8.18
 
 * Client#result_each(&block) uses streaming raed not to read all data into memory

data/lib/td/client.rb

@@ -104,30 +104,30 @@ class Client
   end
 
   # => Job
-  def query(db_name, q, result_url=nil)
-    job_id = @api.hive_query(q, db_name, result_url)
+  def query(db_name, q, result_url=nil, priority=nil)
+    job_id = @api.hive_query(q, db_name, result_url, priority)
     Job.new(self, job_id, :hive, q)
   end
 
   # => [Job]
   def jobs(from=nil, to=nil, status=nil)
     result = @api.list_jobs(from, to, status)
-    result.map {|job_id,type,status,query,start_at,end_at,result_url|
-      Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url)
+    result.map {|job_id,type,status,query,start_at,end_at,result_url,priority|
+      Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority)
     }
   end
 
   # => Job
   def job(job_id)
     job_id = job_id.to_s
-    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema = @api.show_job(job_id)
-    Job.new(self, job_id, type, query, status, url, debug, start_at, end_at, nil, result_url, hive_result_schema)
+    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority = @api.show_job(job_id)
+    Job.new(self, job_id, type, query, status, url, debug, start_at, end_at, nil, result_url, hive_result_schema, priority)
   end
 
   # => type:Symbol, url:String
   def job_status(job_id)
-    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema = @api.show_job(job_id)
-    return query, status, url, debug, start_at, end_at, result_url, hive_result_schema
+    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority = @api.show_job(job_id)
+    return query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority
   end
 
   # => result:[{column:String=>value:Object]
@@ -156,6 +156,12 @@ class Client
     Job.new(self, job_id, :export, nil)
   end
 
+  # => Job
+  def partial_delete(db_name, table_name, to, from)
+    job_id = @api.partial_delete(db_name, table_name, to, from)
+    Job.new(self, job_id, :partialdelete, nil)
+  end
+
   # => nil
   def create_bulk_import(name, database, table)
     @api.create_bulk_import(name, database, table)
@@ -229,8 +235,8 @@ class Client
   # [Schedule]
   def schedules
     result = @api.list_schedules
-    result.map {|name,cron,query,database,result_url,timezone,delay,next_time|
-      Schedule.new(self, name, cron, query, database, result_url, timezone, delay, next_time)
+    result.map {|name,cron,query,database,result_url,timezone,delay,next_time,priority|
+      Schedule.new(self, name, cron, query, database, result_url, timezone, delay, next_time, priority)
     }
   end
 
@@ -242,8 +248,8 @@ class Client
   # [ScheduledJob]
   def history(name, from=nil, to=nil)
     result = @api.history(name, from, to)
-    result.map {|scheduled_at,job_id,type,status,query,start_at,end_at,result_url|
-      ScheduledJob.new(self, scheduled_at, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url)
+    result.map {|scheduled_at,job_id,type,status,query,start_at,end_at,result_url,priority|
+      ScheduledJob.new(self, scheduled_at, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority)
     }
   end
 

data/lib/td/client/api.rb

@@ -290,7 +290,8 @@ class API
       start_at = m['start_at']
       end_at = m['end_at']
       result_url = m['result']
-      result << [job_id, type, status, query, start_at, end_at, result_url]
+      priority = m['priority']
+      result << [job_id, type, status, query, start_at, end_at, result_url, priority]
     }
     return result
   end
@@ -317,7 +318,8 @@ class API
     else
       hive_result_schema = JSON.parse(hive_result_schema)
     end
-    return [type, query, status, url, debug, start_at, end_at, result, hive_result_schema]
+    priority = js['priority']
+    return [type, query, status, url, debug, start_at, end_at, result, hive_result_schema, priority]
   end
 
   def job_result(job_id)
@@ -382,9 +384,10 @@ class API
   end
 
   # => jobId:String
-  def hive_query(q, db=nil, result_url=nil)
+  def hive_query(q, db=nil, result_url=nil, priority=nil)
     params = {'query' => q}
     params['result'] = result_url if result_url
+    params['priority'] = priority if priority
     code, body, res = post("/v3/job/issue/hive/#{e db}", params)
     if code != "200"
       raise_error("Query failed", res)
@@ -409,6 +412,23 @@ class API
     return js['job_id'].to_s
   end
 
+
+  ####
+  ## Partial delete API
+  ##
+
+  def partial_delete(db, table, to, from)
+    params = {}
+    params['to'] = to.to_s
+    params['from'] = from.to_s
+    code, body, res = post("/v3/table/partialdelete/#{e db}/#{e table}", params)
+    if code != "200"
+      raise_error("Partial delete failed", res)
+    end
+    js = checked_json(body, %w[job_id])
+    return js['job_id'].to_s
+  end
+
   ####
   ## Bulk import API
   ##
@@ -592,7 +612,8 @@ class API
       timezone = m['timezone']
       delay = m['delay']
       next_time = m['next_time']
-      result << [name, cron, query, database, result_url, timezone, delay, next_time]
+      priority = m['priority']
+      result << [name, cron, query, database, result_url, timezone, delay, next_time, priority]
     }
     return result
   end
@@ -624,7 +645,8 @@ class API
       end_at = m['end_at']
       scheduled_at = m['scheduled_at']
       result_url = m['result']
-      result << [scheduled_at, job_id, type, status, query, start_at, end_at, result_url]
+      priority = m['priority']
+      result << [scheduled_at, job_id, type, status, query, start_at, end_at, result_url, priority]
     }
     return result
   end

data/lib/td/client/model.rb

@@ -175,7 +175,7 @@ class Job < Model
   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, result_url=nil, hive_result_schema=nil)
+  def initialize(client, job_id, type, query, status=nil, url=nil, debug=nil, start_at=nil, end_at=nil, result=nil, result_url=nil, hive_result_schema=nil, priority=nil)
     super(client)
     @job_id = job_id
     @type = type
@@ -188,10 +188,11 @@ class Job < Model
     @result = result
     @result_url = result_url
     @hive_result_schema = hive_result_schema
+    @priority = priority
   end
 
   attr_reader :job_id, :type, :result_url
-  attr_reader :hive_result_schema
+  attr_reader :hive_result_schema, :priority
 
   def wait(timeout=nil)
     # TODO
@@ -282,7 +283,7 @@ class Job < Model
   end
 
   def update_status!
-    query, status, url, debug, start_at, end_at, result_url, hive_result_schema = @client.job_status(@job_id)
+    query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority = @client.job_status(@job_id)
     @query = query
     @status = status
     @url = url
@@ -308,7 +309,7 @@ end
 
 
 class Schedule < Model
-  def initialize(client, name, cron, query, database=nil, result_url=nil, timezone=nil, delay=nil, next_time=nil)
+  def initialize(client, name, cron, query, database=nil, result_url=nil, timezone=nil, delay=nil, next_time=nil, priority=nil)
     super(client)
     @name = name
     @cron = cron
@@ -318,9 +319,10 @@ class Schedule < Model
     @timezone = timezone
     @delay = delay
     @next_time = next_time
+    @priority = priority
   end
 
-  attr_reader :name, :cron, :query, :database, :result_url, :timezone, :delay
+  attr_reader :name, :cron, :query, :database, :result_url, :timezone, :delay, :priority
 
   def next_time
     @next_time ? Time.parse(@next_time) : nil

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.18'
+VERSION = '0.8.19'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.18
+  version: 0.8.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000Z
+date: 2012-07-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70231327028320 !ruby/object:Gem::Requirement
+  requirement: &70143141621920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70231327028320
+  version_requirements: *70143141621920
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70231327027100 !ruby/object:Gem::Requirement
+  requirement: &70143141621100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70231327027100
+  version_requirements: *70143141621100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70231327025120 !ruby/object:Gem::Requirement
+  requirement: &70143141620160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70231327025120
+  version_requirements: *70143141620160
 description: 
 email: 
 executables: []