td 0.10.17 → 0.10.18

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2012-03-12 version 0.10.18
+
+* sched:run shows IDs of submitted jobs
+* Use td-client v0.8.12
+
+
 == 2012-03-01 version 0.10.17
 
 * Use td-client v0.8.11

data/lib/td/command/list.rb

@@ -220,6 +220,7 @@ module List
   add_list 'table:create', %w[db table], 'Create a table', 'table:create example_db table1'
   add_list 'table:delete', %w[db table], 'Delete a table', 'table:delete example_db table1'
   add_list 'table:import', %w[db table files_], 'Parse and import files to a table', 'table:import example_db table1 --apache access.log', 'table:import example_db table1 --json -t time - < test.json'
+  add_list 'table:export', %w[db table], 'Dump logs in a table to the specified storage', 'table:export example_db table1 --s3-bucket mybucket'
   add_list 'table:tail', %w[db table], 'Get recently imported logs', 'table:tail example_db table1', 'table:tail example_db table1 -t "2011-01-02 03:04:05" -n 30'
 
   add_list 'result:info', %w[], 'Show information of the MySQL server', 'result:info'

data/lib/td/command/sched.rb

@@ -210,14 +210,20 @@ module Command
     client = get_client
 
     begin
-      client.run_schedule(name, t.to_i, num)
+      jobs = 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}."
+    rows = []
+    jobs.each_with_index {|job,i|
+      rows << {:JobID => job.job_id, :Time => job.scheduled_at ? job.scheduled_at.localtime : nil}
+    }
+
+    $stderr.puts "Scheduled #{num} jobs from #{t}."
+    puts cmd_render_table(rows, :fields => [:JobID, :Time], :max_width=>500)
   end
 
 end

data/lib/td/command/table.rb

@@ -135,6 +135,7 @@ module Command
       if s.to_i.to_s == s
         to = s
       else
+        require 'time'
         to = Time.parse(s).to_i
       end
     }
@@ -142,6 +143,7 @@ module Command
       if s.to_i.to_s == s
         from = s
       else
+        require 'time'
         from = Time.parse(s).to_i
       end
     }
@@ -178,7 +180,66 @@ module Command
     }
   end
 
+  def table_export(op)
+    from = nil
+    to = nil
+    s3_bucket = nil
+    wait = false
+
+    ## TODO
+    #op.on('-t', '--to TIME', 'end time of logs to get') {|s|
+    #  if s.to_i.to_s == s
+    #    to = s
+    #  else
+    #    require 'time'
+    #    to = Time.parse(s).to_i
+    #  end
+    #}
+    #op.on('-f', '--from TIME', 'start time of logs to get') {|s|
+    #  if s.to_i.to_s == s
+    #    from = s
+    #  else
+    #    require 'time'
+    #    from = Time.parse(s).to_i
+    #  end
+    #}
+    op.on('-w', '--wait', 'wait for finishing the job', TrueClass) {|b|
+      wait = b
+    }
+    op.on('--s3-bucket NAME', 'name of the s3 bucket to output') {|s|
+      s3_bucket = s
+    }
+
+    db_name, table_name = op.cmd_parse
+
+    unless s3_bucket
+      $stderr.puts "--s3-bucket NAME option is required"
+      exit 1
+    end
+
+    client = get_client
+
+    table = get_table(client, db_name, table_name)
+
+    opts = {}
+    opts['s3_bucket'] = s3_bucket
+    opts['s3_file_format'] ='json.gz'
+    opts['from'] = from.to_s if from
+    opts['to']   = to.to_s if to
+
+    job = table.export('s3', opts)
+
+    $stderr.puts "Export job #{job.job_id} is queued."
+    $stderr.puts "Use '#{$prog} job:show #{job.job_id}' to show the status."
+
+    if wait && !job.finished?
+      wait_job(job)
+      puts "Status     : #{job.status}"
+    end
+  end
+
   require 'td/command/import'  # table:import
+  require 'td/command/job'  # wait_job
 end
 end
 

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.17'
+VERSION = '0.10.18'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.17
+  version: 0.10.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000Z
+date: 2012-03-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70299035025320 !ruby/object:Gem::Requirement
+  requirement: &70130919020280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70299035025320
+  version_requirements: *70130919020280
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70299035024300 !ruby/object:Gem::Requirement
+  requirement: &70130919019400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70299035024300
+  version_requirements: *70130919019400
 - !ruby/object:Gem::Dependency
   name: hirb
-  requirement: &70299035023440 !ruby/object:Gem::Requirement
+  requirement: &70130918961080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,21 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70299035023440
+  version_requirements: *70130918961080
 - !ruby/object:Gem::Dependency
   name: td-client
-  requirement: &70299035022500 !ruby/object:Gem::Requirement
+  requirement: &70130918953380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.11
+        version: 0.8.12
   type: :runtime
   prerelease: false
-  version_requirements: *70299035022500
+  version_requirements: *70130918953380
 - !ruby/object:Gem::Dependency
   name: td-logger
-  requirement: &70299035021660 !ruby/object:Gem::Requirement
+  requirement: &70130918942840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *70299035021660
+  version_requirements: *70130918942840
 description: 
 email: 
 executables: