sdbcli 1.3.1 → 1.3.2

data/bin/sdbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Version = '1.3.1'
+Version = '1.3.2'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 HISTSIZE = 500
 SELECT_LIMIT = 2500
@@ -26,7 +26,7 @@ $format = :yaml
 $consistent = false
 import = nil
 export = nil
-$import_export_retry = 3
+$request_retry = 3
 $retry_interval = 3
 timeout = 60
 iteratable = false
@@ -42,7 +42,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(''  , '--retry=NUM', Integer) {|v| $import_export_retry = v.to_i }
+  opt.on(''  , '--retry=NUM', Integer) {|v| $request_retry = v.to_i }
   opt.on(''  , '--retry-interval=SECOND', Integer) {|v| $retry_interval = v.to_i }
   opt.on(''  , '--require=FILE_LIST', Array) {|v| v.each {|i| require i} }
   opt.on(''  , '--iteratable') { iteratable = true }
@@ -177,20 +177,20 @@ def execute(src, show_rows = false)
 end
 
 def retry_api_call
-  ($import_export_retry + 1).times do |i|
+  ($request_retry + 1).times do |i|
     begin
       yield
       break
     rescue Errno::ETIMEDOUT => e
-      raise e if i >= $import_export_retry
+      raise e if i >= $request_retry
     rescue SimpleDB::Error => e
       if /\AServiceUnavailable:/ =~ e.message
-        raise e if i >= $import_export_retry
+        raise e if i >= $request_retry
       else
         raise e
       end
     rescue Timeout::Error => e
-      raise e if i >= $import_export_retry
+      raise e if i >= $request_retry
     end
 
     wait_sec = $retry_interval * (i + 1)
@@ -215,15 +215,14 @@ if export
       raise 'must not happen'
     end
 
-    query = "SELECT * FROM #{export_domain} "
-    query_expr = "WHERE itemName() IS NOT NULL ORDER BY itemName() LIMIT #{SELECT_LIMIT}"
+    query = "SELECT * FROM #{export_domain} LIMIT #{SELECT_LIMIT}"
     rownum = 0
 
     loop do
       items = nil
 
       retry_api_call do
-        items = $runner.execute(query + query_expr, true, $consistent)
+        items = $runner.execute(query, true, $consistent)
       end
 
       break if items.empty?
@@ -243,8 +242,7 @@ if export
         raise 'must not happen'
       end
 
-      tail_item_name = "'" + items.last[0].gsub(/'/, "''") + "'"
-      query_expr = "WHERE itemName() > #{tail_item_name} ORDER BY itemName() LIMIT #{SELECT_LIMIT}"
+      query = 'NEXT'
 
       output_error("#{rownum} #{rownum > 1 ? 'rows' : 'row'} was outputted...", true)
     end

metadata

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