td 0.10.64 → 0.10.65

data/ChangeLog

@@ -1,3 +1,12 @@
+== 2012-12-27 version 0.10.65
+
+* td-client v0.8.40
+* Use Yajl.dump instead of to_json to avoid invalid encoding problem.
+* Fix table:list displays broken database list in Ruby 1.8
+* Fix -e option handling in bulk_import
+* Add 'Last import' column to table:list
+  https://github.com/treasure-data/td/issues/6
+
 == 2012-12-10 version 0.10.64
 
 * td-client v0.8.39

data/lib/td/command/bulk_import.rb

@@ -278,8 +278,9 @@ module Command
       exit 1
     end
 
+    require 'yajl'
     client.bulk_import_error_records(name) {|r|
-      puts r.to_json
+      puts Yajl.dump(r)
     }
   end
 
@@ -336,13 +337,13 @@ module Command
     require 'fileutils'
     FileUtils.mkdir_p(outdir)
 
-    require 'json'
+    require 'yajl'
     require 'msgpack'
     require 'zlib'
 
     error = Proc.new {|reason,data|
       begin
-        $stderr.puts "#{reason}: #{data.to_json}"
+        $stderr.puts "#{reason}: #{Yajl.dump(data)}"
       rescue
         $stderr.puts "#{reason}"
       end
@@ -367,7 +368,7 @@ module Command
               zout = Zlib::GzipWriter.new(out)
 
               t = record['time']
-              $stderr.puts "  sample: #{Time.at(t).utc} #{record.to_json}"
+              $stderr.puts "  sample: #{Time.at(t).utc} #{Yajl.dump(record)}"
             end
 
             zout.write(record.to_msgpack)

data/lib/td/command/job.rb

@@ -213,7 +213,7 @@ module Command
   def write_result(job, output, format)
     case format
     when 'json'
-      require 'json'
+      require 'yajl'
       first = true
       File.open(output, "w") {|f|
         f.write "["
@@ -223,7 +223,7 @@ module Command
           else
             f.write ","
           end
-          f.write row.to_json
+          f.write Yajl.dump(row)
         }
         f.write "]"
       }
@@ -239,16 +239,16 @@ module Command
       }
 
     when 'csv'
-      require 'json'
+      require 'yajl'
       require 'csv'
       CSV.open(output, "w") {|writer|
         job.result_each {|row|
-          writer << row.map {|col| col.is_a?(String) ? col.to_s : col.to_json }
+          writer << row.map {|col| col.is_a?(String) ? col.to_s : Yajl.dump(col) }
         }
       }
 
     when 'tsv'
-      require 'json'
+      require 'yajl'
       File.open(output, "w") {|f|
         job.result_each {|row|
           first = true
@@ -258,7 +258,7 @@ module Command
             else
               f.write "\t"
             end
-            f.write col.is_a?(String) ? col.to_s : col.to_json
+            f.write col.is_a?(String) ? col.to_s : Yajl.dump(col)
           }
           f.write "\n"
         }
@@ -270,7 +270,7 @@ module Command
   end
 
   def render_result(job, opts)
-    require 'json'
+    require 'yajl'
     rows = []
     job.result_each {|row|
       # TODO limit number of rows to show
@@ -278,7 +278,7 @@ module Command
         if v.is_a?(String)
           s = v.to_s
         else
-          s = v.to_json
+          s = Yajl.dump(v)
         end
         # Here does UTF-8 -> UTF-16LE -> UTF8 conversion:
         #   a) to make sure the string doesn't include invalid byte sequence

data/lib/td/command/table.rb

@@ -81,26 +81,27 @@ module Command
     client = get_client
 
     if db_name
-      db = get_database(client, db_name)
-      dbs = [db]
+      database = get_database(client, db_name)
+      databases = [database]
     else
-      dbs = client.databases
+      databases = client.databases
     end
 
     rows = []
-    ::Parallel.each(dbs, :in_threads => num_threads) {|db|
+    ::Parallel.each(databases, :in_threads => num_threads) {|db|
       db.tables.each {|table|
         pschema = table.schema.fields.map {|f|
           "#{f.name}:#{f.type}"
         }.join(', ')
-        rows << {:Database => db.name, :Table => table.name, :Type => table.type.to_s, :Count => table.count.to_s, :Size => table.estimated_storage_size_string, :Schema => pschema}
+        rows << {:Database => db.name, :Table => table.name, :Type => table.type.to_s, :Count => table.count.to_s,
+          :Size => table.estimated_storage_size_string, 'Last import' => table.last_import ? table.last_import.localtime : nil, :Schema => pschema}
       }
     }
     rows = rows.sort_by {|map|
       [map[:Database], map[:Type].size, map[:Table]]
     }
 
-    puts cmd_render_table(rows, :fields => [:Database, :Table, :Type, :Count, :Size, :Schema], :max_width=>500)
+    puts cmd_render_table(rows, :fields => [:Database, :Table, :Type, :Count, :Size, 'Last import', :Schema], :max_width=>500)
 
     if rows.empty?
       if db_name

data/lib/td/file_reader.rb

@@ -40,7 +40,7 @@ module TreasureData
     class LineReader
       def initialize(io, error, opts)
         if encoding = opts[:encoding]
-          io.external_encoding = encoding
+          io.set_encoding(encoding) if io.respond_to?(:set_encoding)
         end
         #@delimiter = opts[:line_delimiter_expr] || /\r?\n/
         @io = io
@@ -84,6 +84,7 @@ module TreasureData
 
     class JSONParser
       def initialize(reader, error, opts)
+        require 'json'  # TODO yajl?
         @reader = reader
         @error = error
       end

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.64'
+VERSION = '0.10.65'
 
 end

data/td.gemspec

@@ -17,9 +17,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency "msgpack", "~> 0.4.4"
+  gem.add_dependency "yajl-ruby", "~> 1.1.0"
   gem.add_dependency "hirb", ">= 0.4.5"
   gem.add_dependency "parallel", "~> 0.5.19"
-  gem.add_dependency "td-client", "~> 0.8.39"
+  gem.add_dependency "td-client", "~> 0.8.40"
   gem.add_dependency "td-logger", "~> 0.3.16"
   gem.add_development_dependency "rake", "~> 0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.64
+  version: 0.10.65
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.4
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.39
+        version: 0.8.40
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.39
+        version: 0.8.40
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
@@ -176,18 +192,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3517208562406139060
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3517208562406139060
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23