td 0.10.87 → 0.10.88

data/ChangeLog

@@ -1,3 +1,10 @@
+== 2013-09-13 version 0.10.88
+
+* Update td-client-ruby to 0.8.55
+* Update td-bulk-import.jar to 0.2.4
+* Add import:java_version subcommand to show bundled td-bulk-import-java version
+
+
 == 2013-09-05 version 0.10.87
 
 * Add auto-delete option to import:auto subcommand

data/build/update-td-bulk-import-java.sh

@@ -19,13 +19,16 @@ if [ -n "$chrev" ];then
 fi
 
 revname="$(git show --pretty=format:'%H %ad' | head -n 1)"
-vername="0.2.3-SNAPSHOT"
+vername="0.2.4-SNAPSHOT"
 
 mvn package -Dmaven.test.skip=true || exit 1
 echo "copy td-bulk-import-${vername}.jar"
 cp target/td-bulk-import-${vername}.jar ../../java/td-bulk-import.jar
 echo "copy logging.properties"
 cp src/test/resources/java/logging.properties ../../java/logging.properties
+echo "create VERSION file"
+echo "${vername}" > VERSION
+mv VERSION ../../java/VERSION
 
 if [ -n "$chrev" ];then
     git checkout master

data/java/VERSION

@@ -0,0 +1 @@
+0.2.4-SNAPSHOT

data/java/td-bulk-import-java.version

@@ -1 +1 @@
-709f3763a8fe6368d8cd7929524b50173da3137d Wed Sep 4 16:28:40 2013 +0900
+7946ca2a469530c5fcadad412f6de21e495d0fbb Fri Sep 13 18:36:18 2013 +0900

data/lib/td/command/import.rb

@@ -9,9 +9,6 @@ module Command
   JAVA_MAIN_CLASS = "com.treasure_data.bulk_import.BulkImportMain"
   JAVA_HEAP_MAX_SIZE = "-Xmx1024m" # TODO
 
-  APP_OPTION_PREPARE = "prepare"
-  APP_OPTION_UPLOAD = "upload"
-
   def import_list(op)
     require 'td/command/bulk_import'
     bulk_import_list(op)
@@ -27,16 +24,21 @@ module Command
     bulk_import_create(op)
   end
 
+  def import_java_version(op)
+    vfile = find_version_file[0]
+    puts "td-bulk-import-java #{File.open(vfile, 'r').read}"
+  end
+
   def import_prepare(op)
-    import_generic(APP_OPTION_PREPARE)
+    import_by_java('prepare')
   end
 
   def import_upload(op)
-    import_generic(APP_OPTION_UPLOAD)
+    import_by_java('upload')
   end
 
   def import_auto(op)
-    import_generic(APP_OPTION_UPLOAD, true)
+    import_by_java('auto')
   end
 
   def import_perform(op)
@@ -70,7 +72,7 @@ module Command
   end
 
   private
-  def import_generic(subcmd, auto=false)
+  def import_by_java(subcmd)
     # has java runtime
     check_java
 
@@ -95,11 +97,6 @@ module Command
     else
       java_args << ARGV
     end
-    if auto
-      java_args << "--auto-perform"
-      java_args << "--auto-commit"
-      java_args << "--auto-delete"
-    end
 
     # TODO consider parameters including spaces; don't use join(' ')
     cmd = "#{JAVA_COMMAND} #{jvm_opts.join(' ')} #{java_opts.join(' ')} #{sysprops.join(' ')} #{java_args.join(' ')}"
@@ -219,5 +216,11 @@ module Command
     logging_conf_file
   end
 
+  private
+  def find_version_file
+    vfile = Dir.glob("#{BASE_PATH}/java/**/VERSION")
+    vfile
+  end
+
 end
 end

data/lib/td/command/list.rb

@@ -248,6 +248,7 @@ module List
   add_list 'import:list', %w[], 'List bulk import sessions', 'import:list'
   add_list 'import:show', %w[name], 'Show list of uploaded parts', 'import:show'
   add_list 'import:create', %w[name db table], 'Create a new bulk import session to the the table', 'import:create logs_201201 example_db event_logs'
+  add_list 'import:java_version', %w[], 'Show version', 'import:java_version'
   add_list 'import:prepare', %w[files_], 'Convert files into part file format', 'import:prepare logs/*.csv --format csv --columns time,uid,price,count --time-column "time" -o parts/'
   add_list 'import:upload', %w[name files_], 'Upload or re-upload files into a bulk import session', 'import:upload parts/* --parallel 4'
   add_list 'import:auto', %w[name files_], 'Upload files and automatically perform and commit the data', 'import:auto parts/* --parallel 4'

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.87'
+VERSION = '0.10.88'
 
 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.53"
+  gem.add_dependency "td-client", "~> 0.8.55"
   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.87
+  version: 0.10.88
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-13 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.53
+        version: 0.8.55
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.53
+        version: 0.8.55
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +230,7 @@ files:
 - dist/resources/pkg/postinstall
 - dist/resources/pkg/ruby-2.0.0-p0.pkg
 - dist/resources/pkg/td
+- java/VERSION
 - java/logging.properties
 - java/td-bulk-import-java.version
 - java/td-bulk-import.jar
@@ -293,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1597047669310107584
+      hash: 3857310954122118624
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -302,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1597047669310107584
+      hash: 3857310954122118624
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23