td-client 0.8.1 → 0.8.2

data/ChangeLog

@@ -1,4 +1,11 @@
 
+== 2011-09-13 version 0.8.2
+
+* Added APIs for scheduled queries
+* Set 'Content-Length: 0' header to POST request if no parameters are
+  provided
+
+
 == 2011-09-09 version 0.8.1
 
 * Added Client#kill method

data/lib/td/client.rb

@@ -105,10 +105,10 @@ class Client
     Job.new(self, job_id, :hive, q)  # TODO url
   end
 
-  # => [Job=]
+  # => [Job]
   def jobs(from=nil, to=nil)
-    js = @api.list_jobs(from, to)
-    js.map {|job_id,type,status,query,start_at,end_at|
+    result = @api.list_jobs(from, to)
+    result.map {|job_id,type,status,query,start_at,end_at|
       Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at)
     }
   end
@@ -146,6 +146,35 @@ class Client
     @api.kill(job_id)
   end
 
+  # => first_time:Time
+  def create_schedule(name, opts)
+    raise ArgumentError, "'cron' option is required" unless opts[:cron] || opts['cron']
+    raise ArgumentError, "'query' option is required" unless opts[:query] || opts['query']
+    start = @api.create_schedule(name, opts)
+    return Time.parse(start)
+  end
+
+  # => true
+  def delete_schedule(name)
+    @api.delete_schedule(name)
+  end
+
+  # [Schedule]
+  def schedules
+    result = @api.list_schedules
+    result.map {|name,cron,query,database|
+      Schedule.new(self, name, cron, query, database)
+    }
+  end
+
+  # [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|
+      ScheduledJob.new(self, scheduled_at, job_id, type, query, status, nil, nil, start_at, end_at)
+    }
+  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

@@ -297,6 +297,76 @@ class API
   end
 
 
+  ####
+  ## Schedule API
+  ##
+
+  # => start:String
+  def create_schedule(name, opts)
+    params = opts.update({'type'=>'hive'})
+    code, body, res = post("/v3/schedule/create/#{e name}", params)
+    if code != "200"
+      raise_error("Create schedule failed", res)
+    end
+    # TODO format check
+    js = JSON.load(body)
+    return js['start']
+  end
+
+  # => cron:String, query:String
+  def delete_schedule(name)
+    code, body, res = post("/v3/schedule/delete/#{e name}")
+    if code != "200"
+      raise_error("Delete schedule failed", res)
+    end
+    # TODO format check
+    js = JSON.load(body)
+    return js['cron'], js["query"]
+  end
+
+  def list_schedules
+    code, body, res = get("/v3/schedule/list")
+    if code != "200"
+      raise_error("List schedules failed", res)
+    end
+    # TODO format check
+    js = JSON.load(body)
+    result = []
+    js['schedules'].each {|m|
+      name = m['name']
+      cron = m['cron']
+      query = m['query']
+      database = m['database']
+      result << [name, cron, query, database]
+    }
+    return result
+  end
+
+  def history(name, from=0, to=nil)
+    params = {}
+    params['from'] = from.to_s if from
+    params['to'] = to.to_s if to
+    code, body, res = get("/v3/schedule/history/#{e name}", params)
+    if code != "200"
+      raise_error("List history failed", res)
+    end
+    # TODO format check
+    js = JSON.load(body)
+    result = []
+    js['history'].each {|m|
+      job_id = m['job_id']
+      type = (m['type'] || '?').to_sym
+      status = m['status']
+      query = m['query']
+      start_at = m['start_at']
+      end_at = m['end_at']
+      scheduled_at = m['scheduled_at']
+      result << [scheduled_at, job_id, type, status, query, start_at, end_at]
+    }
+    return result
+  end
+
+
   ####
   ## Import API
   ##
@@ -385,8 +455,13 @@ class API
 
     path = BASE_URL + url
 
-    request = Net::HTTP::Post.new(path, header)
-    request.set_form_data(params) if params
+    if params && !params.empty?
+      request = Net::HTTP::Post.new(path, header)
+      request.set_form_data(params)
+    else
+      header['Content-Length'] = 0.to_s
+      request = Net::HTTP::Post.new(path, header)
+    end
 
     response = http.request(request)
     return [response.code, response.body, response]

data/lib/td/client/model.rb

@@ -250,5 +250,30 @@ class Job < Model
 end
 
 
+class ScheduledJob < Job
+  def initialize(client, scheduled_at, *super_args)
+    super(client, *super_args)
+    @scheduled_at = scheduled_at
+  end
+
+  def scheduled_at
+    @scheduled_at ? Time.parse(@scheduled_at) : nil
+  end
+end
+
+
+class Schedule < Model
+  def initialize(client, name, cron, query, database=nil)
+    super(client)
+    @name = name
+    @cron = cron
+    @query = query
+    @database = database
+  end
+
+  attr_reader :name, :cron, :query, :database
+end
+
+
 end
 

data/lib/td/client/version.rb

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

metadata

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