td 0.10.4 → 0.10.5

data/ChangeLog

@@ -1,4 +1,15 @@
 
+== 2011-12-04 version 0.10.5
+
+* Added new feature: result
+* Added new feature: status
+* Refined usage message
+* Fixed argument length check
+* help subcommand shows commandline examples
+* table:tail subcommand reduced default max row number
+* job:list subcommand supports --running and --error options
+
+
 == 2011-11-11 version 0.10.4
 
 * Updated dependency: td-logger-0.3.7

data/lib/td/command/aggr.rb

@@ -0,0 +1,202 @@
+
+module TreasureData
+module Command
+
+  def aggr_list(op)
+    op.cmd_parse
+
+    client = get_client
+
+    ass = client.aggregation_schemas
+
+    rows = []
+    ass.each {|as|
+      rows << {:Name=>as.name, :Relation=>as.relation_key}
+    }
+
+    puts cmd_render_table(rows, :fields => [:Name, :Relation])
+
+    if rows.empty?
+      $stderr.puts "There are no aggregation schemas."
+      $stderr.puts "Use '#{$prog} aggr:create <name>' to create a aggregation schema."
+    end
+  end
+
+  def aggr_show(op)
+    name = op.cmd_parse
+
+    client = get_client
+
+    begin
+      as = client.aggregation_schema(name)
+    rescue
+      cmd_debug_error $!
+      $stderr.puts "Aggregation '#{name}' does not exist."
+      exit 1
+    end
+
+    log_rows = []
+    as.logs.each {|las|
+      log_rows << {
+        :Table=>las.table.identifier,
+        :Name=>las.name,
+        :o1_key=>las.okeys[0].to_s,
+        :o2_key=>las.okeys[1].to_s,
+        :o3_key=>las.okeys[2].to_s,
+        :value_key=>las.value_key.to_s,
+        :count_key=>las.count_key.to_s,
+        :Comment=>las.comment.to_s
+      }
+    }
+
+    attr_rows = []
+    as.attributes.each {|aas|
+      params = aas.parameters.to_a.map {|k,v| "#{k}=#{v}" }.join(' ')
+      attr_rows << {
+        :Table=>aas.table.identifier,
+        :Name=>aas.name,
+        :Method=>aas.method_name,
+        :Parameters=>params,
+        :Comment=>aas.comment.to_s,
+      }
+    }
+
+    puts "Log entries:"
+    puts cmd_render_table(log_rows, :fields => [:Table, :Name, :o1_key, :o2_key, :o3_key, :value_key, :count_key, :Comment], :max_width=>400)
+
+    puts ''
+
+    puts "Attribute entries:"
+    puts cmd_render_table(attr_rows, :fields => [:Table, :Name, :Method, :Parameters, :Comment], :max_width=>400)
+  end
+
+  def aggr_create(op)
+    name, relation_key = op.cmd_parse
+
+    client = get_client
+
+    begin
+      client.create_aggregation_schema(name, relation_key)
+    rescue AlreadyExistsError
+      cmd_debug_error $!
+      $stderr.puts "Aggregation '#{name}' already exists."
+      exit 1
+    end
+
+    $stderr.puts "Aggregation schema '#{name}' is created."
+  end
+
+  def aggr_delete(op)
+    name = op.cmd_parse
+
+    client = get_client
+
+    client.delete_aggregation_schema(name)
+
+    $stderr.puts "Aggregation schema '#{name}' is deleted."
+  end
+
+  def aggr_add_log(op)
+    comment = nil
+    value_key = nil
+    count_key = nil
+
+    op.on('-m', '--comment COMMENT', 'comment of this entry') {|s|
+      comment = s
+    }
+    op.on('-v', '--value KEY_NAME', 'key name of value field') {|s|
+      value_key = s
+    }
+    op.on('-c', '--count KEY_NAME', 'key name of count field') {|s|
+      count_key = s
+    }
+
+    name, db_name, table_name, entry_name, o1_key, o2_key, o3_key = op.cmd_parse
+
+    okeys = [o1_key, o2_key, o3_key].compact
+
+    client = get_client
+
+    get_table(client, db_name, table_name)
+
+    begin
+      client.create_aggregation_log_entry(name, entry_name, comment, db_name, table_name, okeys, value_key, count_key)
+    rescue NotFoundError
+      cmd_debug_error $!
+      $stderr.puts "Aggregation schema '#{name}' does not exist."
+      $stderr.puts "Use '#{$prog} aggr:create #{name}' to create the aggregation schema."
+      exit 1
+    rescue AlreadyExistsError
+      $stderr.puts "Aggregation log entry '#{entry_name}' already exists."
+      exit 1
+    end
+
+    $stderr.puts "Aggregation log entry '#{entry_name}' is created."
+  end
+
+  def aggr_add_attr(op)
+    comment = nil
+
+    op.on('-m', '--comment COMMENT', 'comment of this entry') {|s|
+      comment = s
+    }
+
+    name, db_name, table_name, entry_name, method_name, *parameters = op.cmd_parse
+
+    params = {}
+    parameters.each {|pa|
+      k, v = pa.split('=')
+      params[k] = v
+    }
+
+    client = get_client
+
+    get_table(client, db_name, table_name)
+
+    begin
+      client.create_aggregation_attr_entry(name, entry_name, comment, db_name, table_name, method_name, params)
+    rescue NotFoundError
+      cmd_debug_error $!
+      $stderr.puts "Aggregation schema '#{name}' does not exist."
+      $stderr.puts "Use '#{$prog} aggr:create #{name}' to create the aggregation schema."
+      exit 1
+    rescue AlreadyExistsError
+      $stderr.puts "Aggregation attribute entry '#{entry_name}' already exists."
+      exit 1
+    end
+
+    $stderr.puts "Aggregation attribute entry '#{entry_name}' is created."
+  end
+
+  def aggr_del_log(op)
+    name, entry_name = op.cmd_parse
+
+    client = get_client
+
+    begin
+      client.delete_aggregation_log_entry(name, entry_name)
+    rescue NotFoundError
+      $stderr.puts "Aggregation log entry '#{entry_name}' does not exist."
+      exit 1
+    end
+
+    $stderr.puts "Aggregation log entry '#{entry_name}' is deleted."
+  end
+
+  def aggr_del_attr(op)
+    name, entry_name = op.cmd_parse
+
+    client = get_client
+
+    begin
+      client.delete_aggregation_attr_entry(name, entry_name)
+    rescue NotFoundError
+      $stderr.puts "Aggregation log entry '#{entry_name}' does not exist."
+      exit 1
+    end
+
+    $stderr.puts "Aggregation log entry '#{entry_name}' is deleted."
+  end
+
+end
+end

data/lib/td/command/common.rb

@@ -11,8 +11,8 @@ autoload :Job, 'td/client'
 module Command
 
   private
-  def get_option(name)
-    List.get_option(name)
+  def initialize
+    @render_indent = ''
   end
 
   def get_client
@@ -28,10 +28,10 @@ module Command
     Hirb::Helpers::Table.render(rows, *opts)
   end
 
-  def cmd_render_tree(nodes, *opts)
-    require 'hirb'
-    Hirb::Helpers::Tree.render(nodes, *opts)
-  end
+  #def cmd_render_tree(nodes, *opts)
+  #  require 'hirb'
+  #  Hirb::Helpers::Tree.render(nodes, *opts)
+  #end
 
   def cmd_debug_error(ex)
     if $verbose
@@ -43,6 +43,32 @@ module Command
     end
   end
 
+  def cmd_format_elapsed(start, finish)
+    if start
+      if !finish
+        finish = Time.now.utc
+      end
+      e = finish.to_i - start.to_i
+      elapsed = ''
+      if e >= 3600
+        elapsed << "#{e/3600}h "
+        e %= 3600
+        elapsed << "% 2dm " % (e/60)
+        e %= 60
+        elapsed << "% 2dsec" % e
+      elsif e >= 60
+        elapsed << "% 2dm " % (e/60)
+        e %= 60
+        elapsed << "% 2dsec" % e
+      else
+        elapsed << "% 2dsec" % e
+      end
+    else
+      elapsed = ''
+    end
+    elapsed = "% 10s" % elapsed  # right aligned
+  end
+
   def get_database(client, db_name)
     begin
       return client.database(db_name)

data/lib/td/command/help.rb

@@ -5,14 +5,22 @@ module Command
   def help(op)
     cmd = op.cmd_parse
 
-    op = List.get_option(cmd)
-    unless op
+    usage = List.cmd_usage(cmd)
+    unless usage
       $stderr.puts "'#{cmd}' is not a td command. Run '#{$prog}' to show the list."
       List.show_guess(cmd)
       exit 1
     end
 
-    puts op.message
+    puts usage
+  end
+
+  def help_all(op)
+    cmd = op.cmd_parse
+
+    TreasureData::Command::List.show_help(op.summary_indent)
+    puts ""
+    puts "Type '#{$prog} help COMMAND' for more information on a specific command."
   end
 
 end

data/lib/td/command/import.rb

@@ -222,6 +222,10 @@ module Command
         begin
           record = JSON.parse(line)
 
+          unless record.is_a?(Hash)
+            raise "record must be a Hash"
+          end
+
           time = record[@time_key]
           unless time
             raise "record doesn't have '#{@time_key}' column"
@@ -255,6 +259,10 @@ module Command
       MessagePack::Unpacker.new(file).each {|record|
         i += 1
         begin
+          unless record.is_a?(Hash)
+            raise "record must be a Hash"
+          end
+
           time = record[@time_key]
           unless time
             raise "record doesn't have '#{@time_key}' column"

data/lib/td/command/job.rb

@@ -5,6 +5,8 @@ module Command
   def job_list(op)
     page = 0
     skip = 0
+    running = false
+    error = false
 
     op.on('-p', '--page PAGE', 'skip N pages', Integer) {|i|
       page = i
@@ -12,6 +14,12 @@ module Command
     op.on('-s', '--skip N', 'skip N jobs', Integer) {|i|
       skip = i
     }
+    op.on('-R', '--running', 'show only running jobs', TrueClass) {|b|
+      running = b
+    }
+    op.on('-E', '--error', 'show only error jobs', TrueClass) {|b|
+      error = b
+    }
 
     max = op.cmd_parse
 
@@ -26,36 +34,14 @@ module Command
 
     rows = []
     jobs.each {|job|
+      next if running && !job.running?
+      next if error && !job.error?
       start = job.start_at
-      finish = job.end_at
-      if start
-        if !finish
-          finish = Time.now.utc
-        end
-        e = finish.to_i - start.to_i
-        elapsed = ''
-        if e >= 3600
-          elapsed << "#{e/3600}h "
-          e %= 3600
-          elapsed << "% 2dm " % (e/60)
-          e %= 60
-          elapsed << "% 2dsec" % e
-        elsif e >= 60
-          elapsed << "% 2dm " % (e/60)
-          e %= 60
-          elapsed << "% 2dsec" % e
-        else
-          elapsed << "% 2dsec" % e
-        end
-      else
-        elapsed = ''
-      end
-      elapsed = "% 10s" % elapsed  # right aligned
-
-      rows << {:JobID => job.job_id, :Status => job.status, :Query => job.query.to_s, :Start => (start ? start.localtime : ''), :Elapsed => elapsed}
+      elapsed = cmd_format_elapsed(start, job.end_at)
+      rows << {:JobID => job.job_id, :Status => job.status, :Query => job.query.to_s, :Start => (start ? start.localtime : ''), :Elapsed => elapsed, :Result => job.rset_name}
     }
 
-    puts cmd_render_table(rows, :fields => [:JobID, :Status, :Start, :Elapsed, :Query])
+    puts cmd_render_table(rows, :fields => [:JobID, :Status, :Start, :Elapsed, :Result, :Query])
   end
 
   def job_show(op)
@@ -86,21 +72,22 @@ module Command
 
     job = client.job(job_id)
 
-    puts "JobID      : #{job.job_id}"
-    puts "URL        : #{job.url}"
-    puts "Status     : #{job.status}"
-    puts "Query      : #{job.query}"
+    puts "JobID        : #{job.job_id}"
+    puts "URL          : #{job.url}"
+    puts "Status       : #{job.status}"
+    puts "Query        : #{job.query}"
+    puts "Result table : #{job.rset_name}"
 
     if wait && !job.finished?
       wait_job(job)
       if job.success?
-        puts "Result     :"
+        puts "Result       :"
         show_result(job, output, format)
       end
 
     else
       if job.success?
-        puts "Result     :"
+        puts "Result       :"
         show_result(job, output, format)
       end
 
@@ -231,7 +218,8 @@ module Command
       # TODO limit number of rows to show
       rows << row.map {|v|
         if v.is_a?(String)
-          v.to_s
+          # TODO encoding check
+          v.to_s.force_encoding('ASCII-8BIT')
         else
           v.to_json
         end

data/lib/td/command/list.rb

@@ -3,69 +3,36 @@ module TreasureData
 module Command
 module List
 
-  class CommandOption < OptionParser
-    def initialize(name, args, description)
+  class CommandParser < OptionParser
+    def initialize(name, req_args, opt_args, varlen, argv)
       super()
-
-      @name = name
-      @description = description.to_s
-
-      if args.last.to_s =~ /_$/
-        @varlen = true
-        args.push args.pop.to_s[0..-2]+'...'
-      elsif args.last.to_s =~ /_\?$/
-        @varlen = true
-        args.push args.pop.to_s[0..-3]+'...?'
-      end
-
-      @req_args, opt_args = args.partition {|a| a.to_s !~ /\?$/ }
-      @opt_args = opt_args.map {|a| a.to_s[0..-2].to_sym }
-      @args = @req_args + @opt_args
-
-      @usage_args = "#{@name}"
-      @req_args.each {|a| @usage_args << " <#{a}>" }
-      @opt_args.each {|a| @usage_args << " [#{a}]" }
-
+      @req_args = req_args
+      @opt_args = opt_args
+      @varlen = varlen
+      @argv = argv
       @has_options = false
-
-      self.summary_indent = "  "
-
-      banner  = "usage:\n"
-      banner << "  $ #{File.basename($0)} #{@usage_args}\n"
-      banner << "\n"
-      banner << "description:\n"
-      @description.split("\n").each {|l|
-        banner << "  #{l}\n"
-      }
-      self.banner = banner
-
-      @message = nil
-      @argv = nil
+      @message = ''
     end
 
-    attr_accessor :message, :argv
+    attr_accessor :message
 
-    def message
-      @message || to_s
+    def on(*argv)
+      @has_options = true
+      super
     end
 
     def banner
-      s = super.dup
+      s = @message.dup
       if @has_options
         s << "\n"
         s << "options:\n"
       end
-      s << "\n"
       s
     end
 
-    def usage
-      "%-40s   # %s" % [@usage_args, @description]
-    end
-
     def cmd_parse(argv=@argv||ARGV)
       parse!(argv)
-      if argv.length < @req_args.length || (!@varlen && argv.length > @argv.length)
+      if argv.length < @req_args.length || (!@varlen && argv.length > (@req_args.length+@opt_args.length))
         cmd_usage nil
       end
       if argv.length <= 1
@@ -78,40 +45,92 @@ module List
     end
 
     def cmd_usage(msg=nil)
-      puts self.message
-      if msg
-        puts ""
-        puts "error: #{msg}"
-      end
+      puts self.to_s
+      puts "error: #{msg}" if msg
       exit 1
     end
+  end
 
-    def group
-      name.split(':', 2).first
+  class CommandOption
+    def initialize(name, args, description, examples)
+      @name = name
+      @args = args
+      @description = description.to_s
+      @examples = examples
+      @override_message = nil
     end
 
-    def on(*argv)
-      @has_options = true
-      super
+    attr_reader :name, :args, :description, :examples
+    attr_accessor :override_message
+
+    def compile!
+      return if @usage_args
+
+      args = @args.dup
+      if args.last.to_s =~ /_$/
+        @varlen = true
+        args.push args.pop.to_s[0..-2]+'...'
+      elsif args.last.to_s =~ /_\?$/
+        @varlen = true
+        args.push args.pop.to_s[0..-3]+'...?'
+      end
+
+      @req_args, @opt_args = args.partition {|a| a.to_s !~ /\?$/ }
+      @opt_args = @opt_args.map {|a| a.to_s[0..-2].to_sym }
+
+      @usage_args = "#{@name}"
+      @req_args.each {|a| @usage_args << " <#{a}>" }
+      @opt_args.each {|a| @usage_args << " [#{a}]" }
     end
 
-    def with_args(argv)
-      d = dup
-      d.argv = argv
-      d
+    def create_optparse(argv)
+      compile!
+      op = CommandParser.new(@name, @req_args, @opt_args, @varlen, argv)
+
+      message = "usage:\n"
+      message << "  $ #{File.basename($0)} #{@usage_args}\n"
+      unless @examples.empty?
+        message << "\n"
+        message << "example:\n"
+        @examples.each {|l|
+          message << "  $ #{File.basename($0)} #{l}\n"
+        }
+      end
+      message << "\n"
+      message << "description:\n"
+      @description.split("\n").each {|l|
+        message << "  #{l}\n"
+      }
+
+      op.message = message
+      op.summary_indent = "  "
+
+      if msg = @override_message
+        (class<<op;self;end).module_eval do
+          define_method(:to_s) { msg }
+        end
+      end
+
+      op
+    end
+
+    def usage
+      compile!
+      "%-40s   # %s" % [@usage_args, @description]
     end
 
-    attr_reader :name
-    attr_reader :description
+    def group
+      @name.split(':', 2).first
+    end
   end
 
   LIST = []
   COMMAND = {}
   GUESS = {}
-  HELP_EXCLUDE = ['help', 'account']
+  HELP_EXCLUDE = [/^help/, /^account/, /^aggr/]
 
-  def self.add_list(name, args, description)
-    LIST << COMMAND[name] = CommandOption.new(name, args, description)
+  def self.add_list(name, args, description, *examples)
+    LIST << COMMAND[name] = CommandOption.new(name, args, description, examples)
   end
 
   def self.add_alias(new_cmd, old_cmd)
@@ -122,15 +141,22 @@ module List
     GUESS[wrong] = correct
   end
 
+  def self.cmd_usage(name)
+    if c = COMMAND[name]
+      c.create_optparse([]).cmd_usage
+    end
+    nil
+  end
+
   def self.get_method(name)
-    if op = COMMAND[name]
-      name = op.name
-      group, action = op.group
+    if c = COMMAND[name]
+      name = c.name
+      group, action = c.group
       require 'td/command/common'
       require "td/command/#{group}"
-      cmd = name.gsub(':', '_')
+      cmd = name.gsub(/[\:\-]/, '_')
       m = Object.new.extend(Command).method(cmd)
-      return Proc.new {|args| m.call(op.with_args(args)) }
+      return Proc.new {|args| m.call(c.create_optparse(args)) }
     end
     nil
   end
@@ -147,74 +173,96 @@ module List
 
   def self.show_help(indent='  ')
     before_group = nil
-    LIST.each {|op|
-      next if HELP_EXCLUDE.include?(op.name)
-      if before_group != op.group
-        before_group = op.group
+    LIST.each {|c|
+      next if HELP_EXCLUDE.any? {|pattern| pattern =~ c.name }
+      if before_group != c.group
+        before_group = c.group
         puts ""
       end
-      puts "#{indent}#{op.usage}"
+      puts "#{indent}#{c.usage}"
     }
   end
 
   def self.get_group(group)
-    LIST.map {|op|
-      op.group == group
+    LIST.map {|c|
+      c.group == group
     }
   end
 
   def self.finishup
     groups = {}
-    LIST.each {|op|
-      (groups[op.group] ||= []) << op
+    LIST.each {|c|
+      (groups[c.group] ||= []) << c
     }
     groups.each_pair {|group,ops|
-      if ops.size > 1 && xop = COMMAND[group].dup
+      if ops.size > 1 && c = COMMAND[group]
+        c = c.dup
+
         msg = %[Additional commands, type "#{File.basename($0)} help COMMAND" for more details:\n\n]
-        ops.each {|op|
-          msg << %[  #{op.usage}\n]
+        ops.each {|c|
+          msg << %[  #{c.usage}\n]
         }
         msg << %[\n]
-        xop.message = msg
-        COMMAND[group] = xop
+        c.override_message = msg
+
+        COMMAND[group] = c
       end
     }
   end
 
-  add_list 'db:list', %w[], 'Show list of tables in a database'
-  add_list 'db:show', %w[db], 'Describe a information of a database'
-  add_list 'db:create', %w[db], 'Create a database'
-  add_list 'db:delete', %w[db], 'Delete a database'
+  add_list 'db:list', %w[], 'Show list of tables in a database', 'db:list', 'dbs'
+  add_list 'db:show', %w[db], 'Describe a information of a database', 'db example_db'
+  add_list 'db:create', %w[db], 'Create a database', 'db:create example_db'
+  add_list 'db:delete', %w[db], 'Delete a database', 'db:delete example_db'
+
+  add_list 'table:list', %w[db?], 'Show list of tables', 'table:list', 'table:list example_db', 'tables'
+  add_list 'table:show', %w[db table], 'Describe a information of a table', 'table example_db table1'
+  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: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'
+  add_list 'result:list', %w[], 'Show list of result tables', 'result:list', 'results'
+  add_list 'result:create', %w[name], 'Create a result table', 'result:create rset1'
+  add_list 'result:delete', %w[name], 'Delete a result table', 'result:delete rset1'
+  add_list 'result:connect', %w[sql?], 'Connect to the server using mysql command', 'result:connect'
+  #add_list 'result:get', %w[name], 'Download dump of the result table'
 
-  add_list 'table:list', %w[db?], 'Show list of tables'
-  add_list 'table:show', %w[db table], 'Describe a information of a table'
-  add_list 'table:create', %w[db table], 'Create a table'
-  add_list 'table:delete', %w[db table], 'Delete a table'
-  add_list 'table:import', %w[db table files_], 'Parse and import files to a table'
-  add_list 'table:tail', %w[db table], 'Get recently imported logs'
+  add_list 'status', %w[], 'Show schedules, jobs, tables and results', 'status', 's'
 
-  add_list 'schema:show', %w[db table], 'Show schema of a table'
-  add_list 'schema:set', %w[db table columns_?], 'Set new schema on a table'
-  add_list 'schema:add', %w[db table columns_], 'Add new columns to a table'
-  add_list 'schema:remove', %w[db table columns_], 'Remove columns from a table'
+  add_list 'schema:show', %w[db table], 'Show schema of a table', 'schema example_db table1'
+  add_list 'schema:set', %w[db table columns_?], 'Set new schema on a table', 'schema:set example_db table1 user:string size:int'
+  add_list 'schema:add', %w[db table columns_], 'Add new columns to a table', 'schema:add example_db table1 user:string size:int'
+  add_list 'schema:remove', %w[db table columns_], 'Remove columns from a table', 'schema:remove example_db table1 user size'
 
-  add_list 'sched:list', %w[], 'Show list of schedules'
-  add_list 'sched:create', %w[name cron sql], 'Create a schedule'
-  add_list 'sched:delete', %w[name], 'Delete a schedule'
-  add_list 'sched:history', %w[name max?], 'Show history of scheduled queries'
+  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:history', %w[name max?], 'Show history of scheduled queries', 'sched sched1 --page 1'
 
-  add_list 'query', %w[sql], 'Issue a query'
+  add_list 'query', %w[sql], 'Issue a query', 'query -d example_db -w -r rset1 "select count(*) from table1"'
 
-  add_list 'job:show', %w[job_id], 'Show status and result of a job'
-  add_list 'job:list', %w[max?], 'Show list of jobs'
-  add_list 'job:kill', %w[job_id], 'Kill or cancel a job'
+  add_list 'job:show', %w[job_id], 'Show status and result of a job', 'job 1461'
+  add_list 'job:list', %w[max?], 'Show list of jobs', 'jobs', 'jobs --page 1'
+  add_list 'job:kill', %w[job_id], 'Kill or cancel a job', 'job:kill 1461'
 
   add_list 'account', %w[user_name?], 'Setup a Treasure Data account'
   add_list 'apikey:show', %w[], 'Show Treasure Data API key'
   add_list 'apikey:set', %w[apikey], 'Set Treasure Data API key'
 
+  add_list 'aggr:list', %w[], 'Show list of aggregation schemas'
+  add_list 'aggr:show', %w[name], 'Describe a aggregation schema'
+  add_list 'aggr:create', %w[name relation_key], 'Create a aggregation schema'
+  add_list 'aggr:delete', %w[name], 'Delete a aggregation schema'
+  add_list 'aggr:add-log', %w[name db table entry_name o1_key? o2_key? o3_key?], 'Add a log aggregation entry'
+  add_list 'aggr:add-attr', %w[name db table entry_name method_name parameters_?], 'Add an attribute aggregation entry'
+  add_list 'aggr:del-log', %w[name entry_name], 'Delete a log aggregation entry'
+  add_list 'aggr:del-attr', %w[name entry_name], 'Delete an attribute aggregation entry'
+
   add_list 'server:status', %w[], 'Show status of the Treasure Data server'
 
+  add_list 'help:all', %w[], 'Show usage of all commands'
   add_list 'help', %w[command], 'Show usage of a command'
 
   # aliases
@@ -231,6 +279,9 @@ module List
   add_alias 'table', 'table:show'
   add_alias 'tables', 'table:list'
 
+  add_alias 'result', 'help'  # dummy
+  add_alias 'results', 'result:list'
+
   add_alias 'schema', 'schema:show'
 
   add_alias 'schedule:list', 'sched:list'
@@ -247,7 +298,13 @@ module List
   add_alias 'jobs', 'job:list'
   add_alias 'kill', 'job:kill'
 
+  add_alias 'aggr', 'aggr:show'
+  add_alias 'aggrs', 'aggr:list'
+
   add_alias 'apikey', 'apikey:show'
+  add_alias 'server', 'server:status'
+
+  add_alias 's', 'status'
 
   # backward compatibility
   add_alias 'show-databases',   'db:list'

data/lib/td/command/query.rb

@@ -7,6 +7,7 @@ module Command
     wait = false
     output = nil
     format = 'tsv'
+    result = nil
 
     op.on('-d', '--database DB_NAME', 'use the database (required)') {|s|
       db_name = s
@@ -14,6 +15,9 @@ module Command
     op.on('-w', '--wait', 'wait for finishing the job', TrueClass) {|b|
       wait = b
     }
+    op.on('-r', '--result RESULT_TABLE', 'write result to the result table (use result:create command)') {|s|
+      result = s
+    }
     op.on('-o', '--output PATH', 'write result to the file') {|s|
       output = s
     }
@@ -36,7 +40,7 @@ module Command
     # local existance check
     get_database(client, db_name)
 
-    job = client.query(db_name, sql)
+    job = client.query(db_name, sql, result)
 
     $stderr.puts "Job #{job.job_id} is queued."
     $stderr.puts "Use '#{$prog} job:show #{job.job_id}' to show the status."

data/lib/td/command/result.rb

@@ -0,0 +1,111 @@
+
+module TreasureData
+module Command
+
+  def result_info(op)
+    op.cmd_parse
+
+    client = get_client
+
+    info = client.result_set_info
+
+    puts "Type       : #{info.type}"
+    puts "Host       : #{info.host}"
+    puts "Port       : #{info.port}"
+    puts "User       : #{info.user}"
+    puts "Password   : #{info.password}"
+    puts "Database   : #{info.database}"
+  end
+
+  def result_list(op)
+    op.cmd_parse
+
+    client = get_client
+
+    rsets = client.result_sets
+
+    rows = []
+    rsets.each {|rset|
+      rows << {:Name => rset.name}
+    }
+    rows = rows.sort_by {|map|
+      map[:Name]
+    }
+
+    puts cmd_render_table(rows, :fields => [:Name])
+
+    if rsets.empty?
+      $stderr.puts "There are result tables."
+      $stderr.puts "Use '#{$prog} result:create <name>' to create a result table."
+    end
+  end
+
+  def result_create(op)
+    name = op.cmd_parse
+
+    API.validate_database_name(name)
+
+    client = get_client
+
+    begin
+      client.create_result_set(name)
+    rescue AlreadyExistsError
+      $stderr.puts "Result table '#{name}' already exists."
+      exit 1
+    end
+
+    $stderr.puts "Result table '#{name}' is created."
+  end
+
+  def result_delete(op)
+    name = op.cmd_parse
+
+    client = get_client
+
+    begin
+      client.delete_result_set(name)
+    rescue NotFoundError
+      $stderr.puts "Result table '#{name}' does not exist."
+      exit 1
+    end
+
+    $stderr.puts "Result table '#{name}' is deleted."
+  end
+
+  def result_connect(op)
+    mysql = 'mysql'
+
+    op.on('-e', '--execute MYSQL', 'mysql command') {|s|
+      mysql = s
+    }
+
+    sql = op.cmd_parse
+
+    client = get_client
+
+    info = client.result_set_info
+
+    cmd = [mysql, '-h', info.host, '-P', info.port.to_s, '-u', info.user, "--password=#{info.password}", info.database]
+
+    cmd_start = Time.now
+
+    if sql
+      IO.popen(cmd, "w") {|io|
+        io.write sql
+        io.close
+      }
+    else
+      STDERR.puts "> #{cmd.join(' ')}"
+      system(*cmd)
+    end
+
+    cmd_alive = Time.now - cmd_start
+    if $?.to_i != 0 && cmd_alive < 1.0
+      STDERR.puts "Command died within 1 second with exit code #{$?.to_i}."
+      STDERR.puts "Please confirm mysql command is installed."
+    end
+  end
+
+end
+end
+

data/lib/td/command/runner.rb

@@ -33,10 +33,26 @@ EOF
         require 'td/command/list'
         puts op.to_s
         puts ""
-        puts "commands:"
-        TreasureData::Command::List.show_help(op.summary_indent)
-        puts ""
-        puts "Type '#{$prog} help COMMAND' for more information on a specific command."
+        puts <<EOF
+Basic commands:
+
+  db             # create/delete/list databases
+  table          # create/delete/list/import/tail tables
+  query          # issue a query
+  job            # show/kill/list jobs
+  result         # create/delete/list/connect/get MySQL result set
+
+Additional commands:
+
+  sched          # create/delete/list schedules that run a query periodically
+  schema         # create/delete/modify schemas of tables
+  status         # show scheds, jobs, tables and results
+  apikey         # show/set API key
+  server         # show status of the Treasure Data server
+  help           # show help messages
+
+Type 'td help COMMAND' for more information on a specific command.
+EOF
         if errmsg
           puts "error: #{errmsg}"
           exit 1

data/lib/td/command/sched.rb

@@ -11,21 +11,25 @@ module Command
 
     rows = []
     scheds.each {|sched|
-      rows << {:Name => sched.name, :Cron => sched.cron, :Query => sched.query}
+      rows << {:Name => sched.name, :Cron => sched.cron, :Result => sched.rset_name, :Query => sched.query}
     }
     rows = rows.sort_by {|map|
       map[:Name]
     }
 
-    puts cmd_render_table(rows, :fields => [:Name, :Cron, :Query])
+    puts cmd_render_table(rows, :fields => [:Name, :Cron, :Result, :Query])
   end
 
   def sched_create(op)
     db_name = nil
+    result = nil
 
     op.on('-d', '--database DB_NAME', 'use the database (required)') {|s|
       db_name = s
     }
+    op.on('-r', '--result RESULT_TABLE', 'write result to the result table (use result:create command)') {|s|
+      result = s
+    }
 
     name, cron, sql = op.cmd_parse
 
@@ -40,7 +44,7 @@ module Command
     get_database(client, db_name)
 
     begin
-      first_time = client.create_schedule(name, :cron=>cron, :query=>sql, :database=>db_name)
+      first_time = client.create_schedule(name, :cron=>cron, :query=>sql, :database=>db_name, :result=>result)
     rescue AlreadyExistsError
       cmd_debug_error $!
       $stderr.puts "Schedule '#{name}' already exists."
@@ -99,10 +103,10 @@ module Command
 
     rows = []
     history.each {|j|
-      rows << {:Time => j.scheduled_at.localtime, :JobID => j.job_id, :Status => j.status}
+      rows << {:Time => j.scheduled_at.localtime, :JobID => j.job_id, :Status => j.status, :Result=>j.rset_name}
     }
 
-    puts cmd_render_table(rows, :fields => [:JobID, :Time, :Status])
+    puts cmd_render_table(rows, :fields => [:JobID, :Time, :Status, :Result])
   end
 
 end

data/lib/td/command/status.rb

@@ -0,0 +1,89 @@
+
+module TreasureData
+module Command
+
+  def status(op)
+    op.cmd_parse
+
+    client = get_client
+
+    # +----------------+
+    # |     scheds     |
+    # +----------------+
+    # +----------------+
+    # |      jobs      |
+    # +----------------+
+    # +------+ +-------+
+    # |tables| |results|
+    # +------+ +-------+
+
+    scheds = []
+    jobs = []
+    tables = []
+    results = []
+
+    s = client.schedules
+    s.each {|sched|
+      scheds << {:Name => sched.name, :Cron => sched.cron, :Result => sched.rset_name, :Query => sched.query}
+    }
+    scheds = scheds.sort_by {|map|
+      map[:Name]
+    }
+    x1, y1 = status_render(0, 0, "[Schedules]", scheds, :fields => [:Name, :Cron, :Result, :Query])
+
+    j = client.jobs(0, 4)
+    j.each {|job|
+      start = job.start_at
+      elapsed = cmd_format_elapsed(start, job.end_at)
+      jobs << {:JobID => job.job_id, :Status => job.status, :Query => job.query.to_s, :Start => (start ? start.localtime : ''), :Elapsed => elapsed, :Result => job.rset_name}
+    }
+    x2, y2 = status_render(0, 0, "[Jobs]", jobs, :fields => [:JobID, :Status, :Start, :Elapsed, :Result, :Query])
+
+    dbs = client.databases
+    dbs.map {|db|
+      db.tables.each {|table|
+        tables << {:Database => db.name, :Table => table.name, :Count => table.count.to_s}
+      }
+    }
+    x3, y3 = status_render(0, 0, "[Tables]", tables, :fields => [:Database, :Table, :Count])
+
+    r = client.result_sets
+    r.each {|rset|
+      results << {:Name => rset.name}
+    }
+    results = results.sort_by {|map|
+      map[:Name]
+    }
+    x4, y4 = status_render(x3+2, y3, "[Results]", results, :fields => [:Name])
+
+    (y3-y4-1).times do
+      print "\eD"
+    end
+    print "\eE"
+  end
+
+  private
+  def status_render(movex, movey, msg, *args)
+    lines = cmd_render_table(*args).split("\n")
+    lines.pop  # remove 'N rows in set' line
+    lines.unshift(msg)
+    #lines.unshift("")
+
+    print "\e[#{movey}A" if movey > 0
+
+    max_width = 0
+    height = 0
+    lines.each {|line|
+      print "\e[#{movex}C" if movex > 0
+      puts line
+      width = line.length
+      max_width = width if max_width < width
+      height += 1
+    }
+
+    return movex+max_width, height
+  end
+
+end
+end
+

data/lib/td/command/table.rb

@@ -103,15 +103,34 @@ module Command
 
   def table_tail(op)
     to = nil
-    count = 80
+    count = nil
 
     op.on('-t', '--to TIME', 'end time of logs to get') {|s|
-      to = Time.parse(s).to_i
+      if s.to_i.to_s == s
+        to = s
+      else
+        to = Time.parse(s).to_i
+      end
     }
     op.on('-n', '--count N', 'number of logs to get', Integer) {|i|
       count = i
     }
 
+    if count == nil
+      # smart count calculation
+      begin
+        require "curses"
+	      if Curses.stdscr.maxy - 1 <= 40
+          count = 5
+        else
+          count = 10
+        end
+	      Curses.close_screen
+      rescue
+        count = 5
+      end
+    end
+
     db_name, table_name = op.cmd_parse
 
     client = get_client

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.4'
+VERSION = '0.10.5'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000Z
+date: 2011-12-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70139722729600 !ruby/object:Gem::Requirement
+  requirement: &70131804842780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70139722729600
+  version_requirements: *70131804842780
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70139722729020 !ruby/object:Gem::Requirement
+  requirement: &70131804842240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70139722729020
+  version_requirements: *70131804842240
 - !ruby/object:Gem::Dependency
   name: hirb
-  requirement: &70139722728440 !ruby/object:Gem::Requirement
+  requirement: &70131804841700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,21 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70139722728440
+  version_requirements: *70131804841700
 - !ruby/object:Gem::Dependency
   name: td-client
-  requirement: &70139722727900 !ruby/object:Gem::Requirement
+  requirement: &70131804841140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.5
   type: :runtime
   prerelease: false
-  version_requirements: *70139722727900
+  version_requirements: *70131804841140
 - !ruby/object:Gem::Dependency
   name: td-logger
-  requirement: &70139722725860 !ruby/object:Gem::Requirement
+  requirement: &70131804840600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.3.7
   type: :runtime
   prerelease: false
-  version_requirements: *70139722725860
+  version_requirements: *70131804840600
 description: 
 email: 
 executables:
@@ -77,6 +77,7 @@ extra_rdoc_files:
 files:
 - lib/td.rb
 - lib/td/command/account.rb
+- lib/td/command/aggr.rb
 - lib/td/command/apikey.rb
 - lib/td/command/common.rb
 - lib/td/command/db.rb
@@ -85,10 +86,12 @@ files:
 - lib/td/command/job.rb
 - lib/td/command/list.rb
 - lib/td/command/query.rb
+- lib/td/command/result.rb
 - lib/td/command/runner.rb
 - lib/td/command/sched.rb
 - lib/td/command/schema.rb
 - lib/td/command/server.rb
+- lib/td/command/status.rb
 - lib/td/command/table.rb
 - lib/td/config.rb
 - lib/td/version.rb