td 0.10.13 → 0.10.15

data/ChangeLog

@@ -1,4 +1,17 @@
 
+== 2012-02-27 version 0.10.15
+
+* Updated dependency: td-logger-0.3.8
+* sched:run: shows the scheduled time at the end of command
+
+
+== 2012-02-22 version 0.10.14
+
+* Added sched:update and sched:run
+* sched:list shows 'Database'
+* sched:history shows information of the schedule
+
+
 == 2012-02-21 version 0.10.13
 
 * table:delete asks y/N before deleting a table

data/lib/td/command/aggr.rb

@@ -11,10 +11,10 @@ module Command
 
     rows = []
     ass.each {|as|
-      rows << {:Name=>as.name, :Relation=>as.relation_key}
+      rows << {:Name=>as.name, :Relation=>as.relation_key, :Timezone=>as.timezone}
     }
 
-    puts cmd_render_table(rows, :fields => [:Name, :Relation])
+    puts cmd_render_table(rows, :fields => [:Name, :Relation, :Timezone])
 
     if rows.empty?
       $stderr.puts "There are no aggregation schemas."
@@ -71,12 +71,18 @@ module Command
   end
 
   def aggr_create(op)
+    timezone = nil
+
+    op.on('-t', '--timezone TZ', 'name of the timezone (like Asia/Tokyo)') {|s|
+      timezone = s
+    }
+
     name, relation_key = op.cmd_parse
 
     client = get_client
 
     begin
-      client.create_aggregation_schema(name, relation_key)
+      client.create_aggregation_schema(name, relation_key, {'timezone'=>timezone})
     rescue AlreadyExistsError
       cmd_debug_error $!
       $stderr.puts "Aggregation '#{name}' already exists."

data/lib/td/command/list.rb

@@ -239,7 +239,9 @@ module List
   add_list 'sched:list', %w[], 'Show list of schedules', 'sched:list', 'scheds'
   add_list 'sched:create', %w[name cron sql], 'Create a schedule', 'sched:create sched1 "0 * * * *" -d example_db "select count(*) from table1" -r rset1'
   add_list 'sched:delete', %w[name], 'Delete a schedule', 'sched:delete sched1'
+  add_list 'sched:update', %w[name], 'Modify a schedule', 'sched:update sched1 -s "0 */2 * * *" -d my_db -t "Asia/Tokyo" -D 3600'
   add_list 'sched:history', %w[name max?], 'Show history of scheduled queries', 'sched sched1 --page 1'
+  add_list 'sched:run', %w[name time], 'Run scheduled queries for the specified time', 'sched:run "2013-01-01 00:00:00" -n 6'
 
   add_list 'query', %w[sql], 'Issue a query', 'query -d example_db -w -r rset1 "select count(*) from table1"'
 

data/lib/td/command/sched.rb

@@ -11,18 +11,20 @@ module Command
 
     rows = []
     scheds.each {|sched|
-      rows << {:Name => sched.name, :Cron => sched.cron, :Result => sched.rset_name, :Query => sched.query}
+      rows << {:Name => sched.name, :Cron => sched.cron, :Timezone => sched.timezone, :Delay => sched.delay, :Result => sched.rset_name, :Database => sched.database, :Query => sched.query, :"Next schedule" => sched.next_time ? sched.next_time.localtime : nil }
     }
     rows = rows.sort_by {|map|
       map[:Name]
     }
 
-    puts cmd_render_table(rows, :fields => [:Name, :Cron, :Result, :Query])
+    puts cmd_render_table(rows, :fields => [:Name, :Cron, :Timezone, :"Next schedule", :Delay, :Result, :Database, :Query], :max_width=>500)
   end
 
   def sched_create(op)
     db_name = nil
     result = nil
+    timezone = nil
+    delay = 0
 
     op.on('-d', '--database DB_NAME', 'use the database (required)') {|s|
       db_name = s
@@ -30,6 +32,12 @@ module Command
     op.on('-r', '--result RESULT_TABLE', 'write result to the result table (use result:create command)') {|s|
       result = s
     }
+    op.on('-t', '--timezone TZ', 'name of the timezone (like Asia/Tokyo)') {|s|
+      timezone = s
+    }
+    op.on('-D', '--delay SECONDS', 'delay time of the schedule', Integer) {|i|
+      delay = i
+    }
 
     name, cron, sql = op.cmd_parse
 
@@ -44,14 +52,14 @@ module Command
     get_database(client, db_name)
 
     begin
-      first_time = client.create_schedule(name, :cron=>cron, :query=>sql, :database=>db_name, :result=>result)
+      first_time = client.create_schedule(name, :cron=>cron, :query=>sql, :database=>db_name, :result=>result, :timezone=>timezone, :delay=>delay)
     rescue AlreadyExistsError
       cmd_debug_error $!
       $stderr.puts "Schedule '#{name}' already exists."
       exit 1
     end
 
-    $stderr.puts "Schedule '#{name}' is created. It starts at #{first_time}."
+    $stderr.puts "Schedule '#{name}' is created. It starts at #{first_time.localtime}."
   end
 
   def sched_delete(op)
@@ -71,6 +79,62 @@ module Command
     $stderr.puts "Schedule '#{name}' is deleted."
   end
 
+  def sched_update(op)
+    cron = nil
+    sql = nil
+    db_name = nil
+    result = nil
+    timezone = nil
+    delay = nil
+
+    op.on('-s', '--schedule CRON', 'change the schedule') {|s|
+      cron = s
+    }
+    op.on('-q', '--query SQL', 'change the query') {|s|
+      sql = s
+    }
+    op.on('-d', '--database DB_NAME', 'change the database') {|s|
+      db_name = s
+    }
+    op.on('-r', '--result RESULT_TABLE', 'change the result table') {|s|
+      result = s
+    }
+    op.on('-t', '--timezone TZ', 'change the name of the timezone (like Asia/Tokyo)') {|s|
+      timezone = s
+    }
+    op.on('-D', '--delay SECONDS', 'change the delay time of the schedule', Integer) {|i|
+      delay = i
+    }
+
+    name = op.cmd_parse
+
+    params = {}
+    params['cron'] = cron if cron
+    params['query'] = sql if sql
+    params['database'] = db_name if db_name
+    params['result'] = result if result
+    params['timezone'] = timezone if timezone
+    params['delay'] = delay.to_s if delay
+
+    if params.empty?
+      $stderr.puts op.to_s
+      exit 1
+    end
+
+    client = get_client
+
+    begin
+      client.update_schedule(name, params)
+    rescue NotFoundError
+      cmd_debug_error $!
+      $stderr.puts "Schedule '#{name}' does not exist."
+      $stderr.puts "Use '#{$prog} sched:list' to show list of the schedules."
+      exit 1
+    end
+
+    $stderr.puts "Schedule '#{name}' is updated."
+  end
+
   def sched_history(op)
     page = 0
     skip = 0
@@ -101,6 +165,18 @@ module Command
       exit 1
     end
 
+    scheds = client.schedules
+    if s = scheds.find {|s| s.name == name }
+      puts "Name         : #{s.name}"
+      puts "Cron         : #{s.cron}"
+      puts "Timezone     : #{s.timezone}"
+      puts "Delay        : #{s.delay} sec"
+      puts "Next         : #{s.next_time}"
+      puts "Result       : #{s.rset_name}"
+      puts "Database     : #{s.database}"
+      puts "Query        : #{s.query}"
+    end
+
     rows = []
     history.each {|j|
       rows << {:Time => j.scheduled_at.localtime, :JobID => j.job_id, :Status => j.status, :Result=>j.rset_name}
@@ -109,5 +185,40 @@ module Command
     puts cmd_render_table(rows, :fields => [:JobID, :Time, :Status, :Result])
   end
 
+  def sched_run(op)
+    num = 1
+
+    op.on('-n', '--num N', 'number of jobs to run', Integer) {|i|
+      num = i
+    }
+
+    name, time = op.cmd_parse
+
+    if time.to_i.to_s == time.to_s
+      # UNIX time
+      t = Time.at(time.to_i)
+    else
+      require 'time'
+      begin
+        t = Time.parse(time)
+      rescue
+        $stderr.puts "invalid time format: #{time}"
+        exit 1
+      end
+    end
+
+    client = get_client
+
+    begin
+      client.run_schedule(name, t.to_i, num)
+    rescue NotFoundError
+      cmd_debug_error $!
+      $stderr.puts "Schedule '#{name}' does not exist."
+      $stderr.puts "Use '#{$prog} sched:list' to show list of the schedules."
+    end
+
+    puts "Scheduled #{num} jobs from #{t}."
+  end
+
 end
 end

data/lib/td/command/table.rb

@@ -28,7 +28,7 @@ module Command
 
   def table_delete(op)
     force = false
-    op.on('-f', '--force', 'clear tables and delete the database', TrueClass) {|b|
+    op.on('-f', '--force', 'never prompt', TrueClass) {|b|
       force = true
     }
 

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.13'
+VERSION = '0.10.15'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.13
+  version: 0.10.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70299899663140 !ruby/object:Gem::Requirement
+  requirement: &70345059633180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70299899663140
+  version_requirements: *70345059633180
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70299899661720 !ruby/object:Gem::Requirement
+  requirement: &70345059632320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70299899661720
+  version_requirements: *70345059632320
 - !ruby/object:Gem::Dependency
   name: hirb
-  requirement: &70299899657320 !ruby/object:Gem::Requirement
+  requirement: &70345059631620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,29 +43,29 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70299899657320
+  version_requirements: *70345059631620
 - !ruby/object:Gem::Dependency
   name: td-client
-  requirement: &70299899656420 !ruby/object:Gem::Requirement
+  requirement: &70345059630660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.8.10
   type: :runtime
   prerelease: false
-  version_requirements: *70299899656420
+  version_requirements: *70345059630660
 - !ruby/object:Gem::Dependency
   name: td-logger
-  requirement: &70299899655440 !ruby/object:Gem::Requirement
+  requirement: &70345059629760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *70299899655440
+  version_requirements: *70345059629760
 description: 
 email: 
 executables: