td-client 0.8.9 → 0.8.10

data/ChangeLog

@@ -1,4 +1,11 @@
 
+== 2012-02-22 version 0.8.10
+
+* Added Client#run_schedule and update_schedule
+* Added timezone, delay and next_time fields to the Schedule model
+* create_aggregation_schema accepts params argument
+
+
 == 2012-02-12 version 0.8.9
 
 * Added API#normalize_table_name and API#normalize_database_name

data/lib/td/client.rb

@@ -169,12 +169,17 @@ class Client
   # [Schedule]
   def schedules
     result = @api.list_schedules
-    result.map {|name,cron,query,database,rset|
+    result.map {|name,cron,query,database,rset,timezone,delay,next_time|
       rset = ResultSet.new(self, rset) if rset
-      Schedule.new(self, name, cron, query, database, rset)
+      Schedule.new(self, name, cron, query, database, rset, timezone, delay, next_time)
     }
   end
 
+  def update_schedule(name, params)
+    @api.update_schedule(name, params)
+    nil
+  end
+
   # [ScheduledJob]
   def history(name, from=nil, to=nil)
     result = @api.history(name, from, to)
@@ -184,6 +189,12 @@ class Client
     }
   end
 
+  # TODO nil -> [ScheduledJob] or [Job]
+  def run_schedule(name, time, num)
+    @api.run_schedule(name, time, num)
+    nil
+  end
+
   # => time:Flaot
   def import(db_name, table_name, format, stream, size)
     @api.import(db_name, table_name, format, stream, size)
@@ -218,14 +229,14 @@ class Client
   # => [AggregationSchema]
   def aggregation_schemas
     list = @api.list_aggregation_schema
-    list.map {|name,relation_key|
-      AggregationSchema.new(self, name, relation_key)
+    list.map {|name,relation_key,timezone|
+      AggregationSchema.new(self, name, relation_key, nil, nil, timezone)
     }
   end
 
   # => true
-  def create_aggregation_schema(name, relation_key)
-    @api.create_aggregation_schema(name, relation_key)
+  def create_aggregation_schema(name, relation_key, params={})
+    @api.create_aggregation_schema(name, relation_key, params)
   end
 
   # => true

data/lib/td/client/api.rb

@@ -410,11 +410,22 @@ class API
       query = m['query']
       database = m['database']
       rset = m['result']
-      result << [name, cron, query, database, rset]
+      timezone = m['timezone']
+      delay = m['delay']
+      next_time = m['next_time']
+      result << [name, cron, query, database, rset, timezone, delay, next_time]
     }
     return result
   end
 
+  def update_schedule(name, params)
+    code, body, res = get("/v3/schedule/update/#{e name}", params)
+    if code != "200"
+      raise_error("Update schedule failed", res)
+    end
+    return nil
+  end
+
   def history(name, from=0, to=nil)
     params = {}
     params['from'] = from.to_s if from
@@ -439,6 +450,22 @@ class API
     return result
   end
 
+  def run_schedule(name, time, num)
+    params = {}
+    params = {'num' => num} if num
+    code, body, res = post("/v3/schedule/run/#{e name}/#{e time}", params)
+    if code != "200"
+      raise_error("Run schedule failed", res)
+    end
+    js = checked_json(body, %w[jobs])
+    result = []
+    js['jobs'].each {|m|
+      job_id = m['job_id']
+      scheduled_at = m['scheduled_at']
+      result << [job_id, scheduled_at]
+    }
+    return result
+  end
 
   ####
   ## Import API
@@ -516,14 +543,14 @@ class API
     result = js["aggrs"].map {|aggrinfo|
       name = aggrinfo['name'].to_s
       relation_key = aggrinfo['relation_key'].to_s
-      [name, relation_key]
+      timezone = aggrinfo['timezone'].to_s
+      [name, relation_key, timezone]
     }
     return result
   end
 
   # => true
-  def create_aggregation_schema(name, relation_key)
-    params = {}
+  def create_aggregation_schema(name, relation_key, params={})
     params['relation_key'] = relation_key if relation_key
     code, body, res = post("/v3/aggr/create/#{e name}", params)
     if code != "200"

data/lib/td/client/model.rb

@@ -282,20 +282,31 @@ end
 
 
 class Schedule < Model
-  def initialize(client, name, cron, query, database=nil, rset=nil)
+  def initialize(client, name, cron, query, database=nil, rset=nil, timezone=nil, delay=nil, next_time=nil)
     super(client)
     @name = name
     @cron = cron
     @query = query
     @database = database
     @rset = rset
+    @timezone = timezone
+    @delay = delay
+    @next_time = next_time
   end
 
   def rset_name
     @rset ? @rset.name : nil
   end
 
-  attr_reader :name, :cron, :query, :database, :rset
+  attr_reader :name, :cron, :query, :database, :rset, :timezone, :delay
+
+  def next_time
+    @next_time ? Time.parse(@next_time) : nil
+  end
+
+  def run(time, num)
+    @client.run_schedule(time, num)
+  end
 end
 
 
@@ -325,15 +336,16 @@ end
 
 
 class AggregationSchema < Model
-  def initialize(client, name, relation_key, logs=nil, attributes=nil)
+  def initialize(client, name, relation_key, logs=nil, attributes=nil, timezone=nil)
     super(client)
     @name = name
     @relation_key = relation_key
     @logs = logs
     @attributes = attributes
+    @timezone = timezone
   end
 
-  attr_reader :name, :relation_key
+  attr_reader :name, :relation_key, :timezone
 
   def logs
     update_entries! unless @logs

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.9'
+VERSION = '0.8.10'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70135893795480 !ruby/object:Gem::Requirement
+  requirement: &70267150692160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70135893795480
+  version_requirements: *70267150692160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70135893794220 !ruby/object:Gem::Requirement
+  requirement: &70267150691460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70135893794220
+  version_requirements: *70267150691460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70135893792760 !ruby/object:Gem::Requirement
+  requirement: &70267150690860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70135893792760
+  version_requirements: *70267150690860
 description: 
 email: 
 executables: []