sdbcli 1.1.0 → 1.1.1

data/README

@@ -23,7 +23,7 @@ https://bitbucket.org/winebarrel/sdbcli
           --import=DOMAIN,FILE
           --import-replace=DOMAIN,FILE
           --export=DOMAIN,FILE
-          --export-retry=NUM
+          --retry=NUM
   shell> export AWS_ACCESS_KEY_ID='...'
   shell> export AWS_SECRET_ACCESS_KEY='...'
   shell> export SDB_ENDPOINT='sdb.ap-northeast-1.amazonaws.com' # or SDB_REGION=ap-northeast-1

data/bin/sdbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Version = '1.1.0'
+Version = '1.1.1'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 HISTSIZE = 500
 SELECT_LIMIT = 2500
@@ -24,7 +24,7 @@ $format = :yaml
 $consistent = false
 import = nil
 export = nil
-export_retry = 3
+import_export_retry = 3
 timeout = 60
 
 ARGV.options do |opt|
@@ -38,7 +38,7 @@ ARGV.options do |opt|
   opt.on(''  , '--import=DOMAIN,FILE') {|v| import = v.split(/\s*,\s*/, 2) + [false] }
   opt.on(''  , '--import-replace=DOMAIN,FILE') {|v| import = v.split(/\s*,\s*/, 2) + [true] }
   opt.on(''  , '--export=DOMAIN,FILE') {|v| export = v.split(/\s*,\s*/, 2) }
-  opt.on(''  , '--export-retry=NUM', Integer) {|v| export_retry = v.to_i }
+  opt.on(''  , '--retry=NUM', Integer) {|v| import_export_retry = v.to_i }
   opt.parse!
 
   unless access_key_id and secret_access_key and sdb_endpoint
@@ -184,12 +184,12 @@ if export
     loop do
       items = nil
 
-      export_retry.times do |i|
+      import_export_retry.times do |i|
         begin
           items = $runner.execute(query + query_expr, true, $consistent)
           break
         rescue Timeout::Error => e
-          raise e if i >= (export_retry - 1)
+          raise e if i >= (import_export_retry - 1)
         end
 
         output_error("Retry...", true)
@@ -281,10 +281,20 @@ if import
     until (chunk = items.slice!(0, SELECT_LIMIT)).empty?
       rownum += chunk.length
 
-      if import_as_replace
-        $runner.driver.update(import_domain, chunk)
-      else
-        $runner.driver.insert(import_domain, chunk)
+      import_export_retry.times do |i|
+        begin
+          if import_as_replace
+            $runner.driver.update(import_domain, chunk)
+          else
+            $runner.driver.insert(import_domain, chunk)
+          end
+
+          break
+        rescue Timeout::Error => e
+          raise e if i >= (import_export_retry - 1)
+        end
+
+        output_error("Retry...", true)
       end
 
       output_error("#{rownum} #{rownum > 1 ? 'rows' : 'row'} was inputted...", true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdbcli
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors: