td 0.10.97 → 0.10.98

data/ChangeLog

@@ -1,3 +1,10 @@
+
+== 2014-02-21 version 0.10.98
+
+* import:unfreeze: fixed NoMethodError error
+* import:show uses more efficient REST API
+
+
 == 2013-12-18 version 0.10.97
 
 * import:commit accepts --wait option.

data/lib/td/command/bulk_import.rb

@@ -58,8 +58,7 @@ module Command
 
     client = get_client
 
-    bis = client.bulk_imports
-    bi = bis.find {|bi| name == bi.name }
+    bi = client.bulk_import(name)
     unless bi
       $stderr.puts "Bulk import session '#{name}' does not exist."
       $stderr.puts "Use '#{$prog} " + Config.cl_apikey_string + "bulk_import:create <name> <db> <table>' to create a session."

data/lib/td/command/import.rb

@@ -97,7 +97,7 @@ module Command
 
   def import_unfreeze(op)
     require 'td/command/bulk_import'
-    bulk_importunfreeze(op)
+    bulk_import_unfreeze(op)
   end
 
   private

data/lib/td/command/list.rb

@@ -127,7 +127,7 @@ module List
   LIST = []
   COMMAND = {}
   GUESS = {}
-  HELP_EXCLUDE = [/^help/, /^account/, /^aggr/, /^update/, /^user/, /^acl/]
+  HELP_EXCLUDE = [/^help/, /^account/, /^update/, /^user/, /^acl/]
   USAGE_EXCLUDE = [/bulk_import:upload_part\z/, /bulk_import:delete_part\z/]
 
   def self.add_list(name, args, description, *examples)
@@ -308,15 +308,6 @@ module List
   add_list 'acl:revoke', %w[subject action scope], 'Revoke an access control'
   # TODO acl:test
 
-  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 'sample:apache', %w[path.json], 'Create a sample log file'
@@ -375,9 +366,6 @@ module List
   add_alias 'acl', 'acl:list'
   add_alias 'acls', 'acl:list'
 
-  add_alias 'aggr', 'aggr:show'
-  add_alias 'aggrs', 'aggr:list'
-
   add_alias 'apikey', 'apikey:show'
   add_alias 'server', 'server:status'
   add_alias 'sample', 'sample:apache'

data/lib/td/command/table.rb

@@ -23,7 +23,7 @@ module Command
       end
       type = s.to_sym
     }
-    op.on('--primary-key PRIMARY_KEY_AND_TYPE', '[primary key]:[primary key type]') {|s|
+    op.on('--primary-key PRIMARY_KEY_AND_TYPE', '[primary key]:[primary key type(int or string)]') {|s|
       unless /\A[\w]+:(string|int)\z/ =~ s
         $stderr.puts "--primary-key PRIMARY_KEY_AND_TYPE is required, and should be in the format [primary key]:[primary key type]"
         exit 1

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.97'
+VERSION = '0.10.98'
 
 end

data/td.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "yajl-ruby", "~> 1.1.0"
   gem.add_dependency "hirb", ">= 0.4.5"
   gem.add_dependency "parallel", "~> 0.6.1"
-  gem.add_dependency "td-client", "~> 0.8.56"
+  gem.add_dependency "td-client", "~> 0.8.57"
   gem.add_dependency "td-logger", "~> 0.3.21"
   gem.add_dependency "rubyzip", "~> 0.9.9"
   gem.add_development_dependency "rake", "~> 0.9"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.97
+  version: 0.10.98
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -112,7 +112,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.56
+        version: 0.8.57
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.56
+        version: 0.8.57
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
@@ -237,7 +237,6 @@ files:
 - lib/td.rb
 - lib/td/command/account.rb
 - lib/td/command/acl.rb
-- lib/td/command/aggr.rb
 - lib/td/command/apikey.rb
 - lib/td/command/bulk_import.rb
 - lib/td/command/common.rb
@@ -289,18 +288,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1410145252245092295
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1410145252245092295
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -317,3 +310,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/td/helpers_spec.rb
 - spec/td/version_spec.rb
+has_rdoc: false

data/lib/td/command/aggr.rb

@@ -1,208 +0,0 @@
-
-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, :Timezone=>as.timezone}
-    }
-
-    puts cmd_render_table(rows, :fields => [:Name, :Relation, :Timezone])
-
-    if rows.empty?
-      $stderr.puts "There are no aggregation schemas."
-      $stderr.puts "Use '#{$prog} " + Config.cl_apikey_string + "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)
-    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, {'timezone'=>timezone})
-    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} " + Config.cl_apikey_string + "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} " + Config.cl_apikey_string + "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