ddbcli 0.1.5 → 0.1.6

data/README

@@ -1,4 +1,4 @@
-= sdbcli
+= ddbcli
 
 == Description
 
@@ -42,6 +42,9 @@ https://bitbucket.org/winebarrel/ddbcli
   SHOW TABLES
     displays a table list
   
+  SHOW TABLE STATUS
+    displays table statues
+  
   SHOW REGIONS
     displays a region list
   
@@ -70,6 +73,8 @@ https://bitbucket.org/winebarrel/ddbcli
     gets items
   
   INSERT INTO table_name (attr1, attr2, ...) VALUES ('val1', 'val2', ...), ('val3', 'val4', ...), ...
+  INSERT INTO table_name SELECT ...
+  INSERT INTO table_name SELECT ALL ...
     creates items
   
   UPDATE table_name {SET|ADD} attr1 = 'val1', ... WHERE key1 = '...' AND ...
@@ -147,7 +152,7 @@ https://bitbucket.org/winebarrel/ddbcli
   ##### Command #####
   
   .help                           displays this message
-  .quit | .exit                   exits sdbcli
+  .quit | .exit                   exits ddbcli
   .consistent      (true|false)?  displays ConsistentRead parameter or changes it
   .iteratable      (true|false)?  displays iteratable option or changes it
                                   all results are displayed if true

data/bin/ddbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Version = '0.1.5'
+Version = '0.1.6'
 
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.ddbcli_history')
 HISTSIZE = 500

data/lib/ddbcli/cli/help.rb

@@ -5,6 +5,9 @@ def print_help
 SHOW TABLES
   displays a table list
 
+SHOW TABLE STATUS
+  displays table statues
+
 SHOW REGIONS
   displays a region list
 
@@ -33,6 +36,8 @@ GET {*|attrs} FROM table_name WHERE key1 = '...' AND ...
   gets items
 
 INSERT INTO table_name (attr1, attr2, ...) VALUES ('val1', 'val2', ...), ('val3', 'val4', ...), ...
+INSERT INTO table_name SELECT ...
+INSERT INTO table_name SELECT ALL ...
   creates items
 
 UPDATE table_name {SET|ADD} attr1 = 'val1', ... WHERE key1 = '...' AND ...
@@ -110,7 +115,7 @@ Shell
 ##### Command #####
 
 .help                           displays this message
-.quit | .exit                   exits sdbcli
+.quit | .exit                   exits ddbcli
 .consistent      (true|false)?  displays ConsistentRead parameter or changes it
 .iteratable      (true|false)?  displays iteratable option or changes it
                                 all results are displayed if true

data/lib/ddbcli/ddb-driver.rb

@@ -52,6 +52,8 @@ module DynamoDB
       retval = case command
                when :SHOW_TABLES
                  do_show_tables(parsed)
+               when :SHOW_TABLE_STATUS
+                 do_show_table_status(parsed)
                when :SHOW_REGIONS
                  do_show_regions(parsed)
                when :SHOW_CREATE_TABLE
@@ -84,6 +86,10 @@ module DynamoDB
                  do_delete_all(parsed)
                when :INSERT
                  do_insert(parsed)
+               when :INSERT_SELECT
+                 do_insert_select('Query', parsed)
+               when :INSERT_SCAN
+                 do_insert_select('Scan', parsed)
                when :NEXT
                  if @last_action and @last_parsed and @last_evaluated_key
                    do_select(@last_action, @last_parsed, :last_evaluated_key => @last_evaluated_key)
@@ -152,10 +158,14 @@ module DynamoDB
     private
 
     def do_show_tables(parsed)
+      do_show_tables0(parsed.limit)
+    end
+
+    def do_show_tables0(limit = nil)
       req_hash = {}
       table_names = []
 
-      req_hash['Limit'] = parsed.limit if parsed.limit
+      req_hash['Limit'] = limit if limit
 
       list = lambda do |last_evaluated_table_name|
         req_hash['ExclusiveStartTableName'] = last_evaluated_table_name if last_evaluated_table_name
@@ -169,7 +179,7 @@ module DynamoDB
       loop do
         letn = list.call(letn)
 
-        if parsed.limit or not letn
+        if limit or not letn
           break
         end
       end
@@ -177,6 +187,18 @@ module DynamoDB
       return table_names
     end
 
+    def do_show_table_status(parsed)
+      table_names = do_show_tables0
+      h = {}
+
+      table_names.map do |table_name|
+        table_info = @client.query('DescribeTable', 'TableName' => table_name)['Table']
+        h[table_name] = table_info['TableStatus']
+      end
+
+      return h
+    end
+
     def do_show_regions(parsed)
       DynamoDB::Endpoint.regions
     end
@@ -384,6 +406,12 @@ module DynamoDB
     end
 
     def do_select(action, parsed, opts = {})
+      do_select0(action, parsed, opts) do |i|
+        convert_to_ruby_value(i)
+      end
+    end
+
+    def do_select0(action, parsed, opts = {})
       select_proc = lambda do |last_evaluated_key|
         req_hash = {'TableName' => parsed.table}
         req_hash['AttributesToGet'] = parsed.attrs unless parsed.attrs.empty?
@@ -450,12 +478,14 @@ module DynamoDB
           retval += res_data['Count']
         end
       else
-        retval = res_data['Items'].map {|i| convert_to_ruby_value(i) }
+        retval = block_given? ? res_data['Items'].map {|i| yield(i) } : res_data['Items']
 
-        if @iteratable and not parsed.limit
+        if (@iteratable or opts[:iteratable]) and not parsed.limit
           while res_data['LastEvaluatedKey']
             res_data = select_proc.call(res_data['LastEvaluatedKey'])
-            retval.concat(res_data['Items'].map {|i| convert_to_ruby_value(i) })
+            retval.concat(
+              block_given? ? res_data['Items'].map {|i| yield(i) } : res_data['Items']
+            )
           end
         end
       end
@@ -730,6 +760,32 @@ module DynamoDB
       Rownum.new(n)
     end
 
+    def do_insert_select(action, parsed)
+      items = do_select0(action, parsed.select, :iteratable => true)
+      n = 0
+
+      until (chunk = items.slice!(0, MAX_NUMBER_BATCH_PROCESS_ITEMS)).empty?
+        operations = []
+
+        req_hash = {
+          'RequestItems' => {
+            parsed.table => operations,
+          },
+        }
+
+        chunk.each do |item|
+          operations << {
+            'PutRequest' => {'Item' => item}
+          }
+        end
+
+        batch_write_item(req_hash)
+        n += chunk.length
+      end
+
+      Rownum.new(n)
+    end
+
     def str_to_num(str)
       str =~ /\./ ? str.to_f : str.to_i
     end