td 0.10.20 → 0.10.21

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2012-04-04 version 0.10.21
+
+* Added sample:apache subcommand
+* table:import --json and --msgpack use 'time' as the default value for --time-key option
+
+
 == 2012-04-03 version 0.10.20
 
 * db:list: show number of records

data/lib/td/command/import.rb

@@ -24,7 +24,7 @@ module Command
     op.banner << "  json\n"
 
     format = 'apache'
-    time_key = nil
+    time_key = 'time'
 
     op.on('--format FORMAT', "file format (default: #{format})") {|s|
       format = s
@@ -56,10 +56,10 @@ module Command
 
     case format
     when 'json', 'msgpack'
-      unless time_key
-        $stderr.puts "-t, --time-key COL_NAME (e.g. '-t created_at') parameter is required for #{format} format"
-        exit 1
-      end
+      #unless time_key
+      #  $stderr.puts "-t, --time-key COL_NAME (e.g. '-t created_at') parameter is required for #{format} format"
+      #  exit 1
+      #end
       if format == 'json'
         require 'json'
         require 'time'

data/lib/td/command/list.rb

@@ -265,6 +265,8 @@ module List
 
   add_list 'server:status', %w[], 'Show status of the Treasure Data server'
 
+  add_list 'sample:apache', %w[path.json], 'Create a sample log file'
+
   add_list 'help:all', %w[], 'Show usage of all commands'
   add_list 'help', %w[command], 'Show usage of a command'
 

data/lib/td/command/sample.rb

@@ -0,0 +1,33 @@
+
+module TreasureData
+module Command
+
+  def sample_apache(op)
+    fname = op.cmd_parse
+
+    require 'json'
+
+    t = Time.now.to_i
+    i = 0
+    last_time = nil
+
+    data = File.join(File.dirname(__FILE__), '../../../data/sample_apache.json')
+    File.open(data) {|df|
+      File.open(fname, 'w') {|of|
+        df.each_line {|line|
+          record = JSON.parse(line)
+          record['time'] = last_time = (t - (i**1.3)).to_i
+          of.puts record.to_json
+          i += 1
+        }
+      }
+    }
+
+    $stderr.puts "Create #{fname} with #{i} records whose time is"
+    $stderr.puts "from #{Time.at(last_time)} to #{Time.at(t)}."
+    $stderr.puts "Use '#{$prog} table:import <db> <table> --json #{fname}' to import this file."
+  end
+
+end
+end
+

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.20'
+VERSION = '0.10.21'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.20
+  version: 0.10.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000Z
+date: 2012-04-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70328093139260 !ruby/object:Gem::Requirement
+  requirement: &70131070404920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70328093139260
+  version_requirements: *70131070404920
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70328093117780 !ruby/object:Gem::Requirement
+  requirement: &70131070404060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70328093117780
+  version_requirements: *70131070404060
 - !ruby/object:Gem::Dependency
   name: hirb
-  requirement: &70328093116300 !ruby/object:Gem::Requirement
+  requirement: &70131070401640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70328093116300
+  version_requirements: *70131070401640
 - !ruby/object:Gem::Dependency
   name: td-client
-  requirement: &70328093114040 !ruby/object:Gem::Requirement
+  requirement: &70131070399480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.8.14
   type: :runtime
   prerelease: false
-  version_requirements: *70328093114040
+  version_requirements: *70131070399480
 - !ruby/object:Gem::Dependency
   name: td-logger
-  requirement: &70328093111120 !ruby/object:Gem::Requirement
+  requirement: &70131070397240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *70328093111120
+  version_requirements: *70131070397240
 description: 
 email: 
 executables:
@@ -88,6 +88,7 @@ files:
 - lib/td/command/query.rb
 - lib/td/command/result.rb
 - lib/td/command/runner.rb
+- lib/td/command/sample.rb
 - lib/td/command/sched.rb
 - lib/td/command/schema.rb
 - lib/td/command/server.rb