flydata 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b8bbf89988f5ae28562da185290028c00f02304
-  data.tar.gz: e443c6fb75c571b1c1fc95ef40c3a877a7bb31fa
+  metadata.gz: 5ef2dc67241b147ae812ec973f9574a332eadc0b
+  data.tar.gz: fc755e2fe59e6213320cc01d147a4c00a61ccfbb
 SHA512:
-  metadata.gz: aef7d1b13401d4881f020406ed6cfd32aca7193a01570cfac081556ce24a9a67b63678ce7da1762036dfbddeb02cbf67f283e4ce3ff4e7d9c756580cb786960c
-  data.tar.gz: cb4a80a2c7ce7fc1a507c57b6ad6ea51f23ae3299c562e3165799764d03eb9c8a021895209b1bb7c4708a54ebd609ae29b8dd437cf85d495e166169624dab0f6
+  metadata.gz: dc76e606a4c7a3eb5d7d4b32dc80cbeac02fd349b82e1348331ca6708eceb1f3bedba626ed78f8727ecd0cfe9859f1789190c1d38ea882b205c50695ae3025de
+  data.tar.gz: 31e441f72535a2d3f3e9cd093a2ee0d0343909e61f53cf327e0f5034e367dde1a090635e43f34f137cc59e3dfbee941c39de8fdd20e7bc552eccb9cc36acba48

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/flydata.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: flydata 0.3.2 ruby lib
+# stub: flydata 0.3.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS"]
-  s.date = "2015-02-25"
+  s.date = "2015-02-26"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdmysqldump", "flydata", "serverinfo"]

data/lib/flydata/command/sync.rb

@@ -32,6 +32,7 @@ module Flydata
       def self.slop
         Slop.new do
           on 'c', 'skip-cleanup', 'Skip server cleanup'
+          on 'f', 'skip-flush', 'Skip server flush'
           on 'y', 'yes', 'Skip command prompt assuming yes to all questions.  Use this for batch operation.'
           on 'd', 'dump-file', 'Dump mysqldump into a file. Use this for debugging after making sure the free space.' # dummy for compatibility
           on 's', 'dump-stream', 'Dump mysqldump stream instead of saving dump file. It might cause timeout error if db size is larger than 10GB.'
@@ -124,6 +125,7 @@ EOS
 
       def self.slop_flush
         Slop.new do
+          on 'f', 'skip-flush', 'Skip server flush'
           on 'y', 'yes', 'Skip command prompt assuming yes to all questions.  Use this for batch operation.'
         end
       end
@@ -724,7 +726,11 @@ Thank you for using FlyData!
       def flush_buffer_and_stop
         sender = Flydata::Command::Sender.new
         sender.flush_client_buffer
-        wait_for_server_data_processing(SERVER_DATA_PROCESSING_TIMEOUT)
+        if opts.skip_flush?
+          log_info_stdout("Skip waiting for server data processing.")
+        else
+          wait_for_server_data_processing(SERVER_DATA_PROCESSING_TIMEOUT)
+        end
         sender.stop(quiet: true)
       end
     end

data/lib/flydata/helpers.rb

@@ -23,10 +23,12 @@ Usage: flydata COMMAND
   stop                     # stop flydata process
   restart                  # restart flydata process
   status                   # check flydata process
+  version                  # show flydata version
   conf                     # show configuration
   sync [tables]            # initial sync (only for mysql database)
-  sync:generate_table_ddl [tables] # Generate CREATE TABLE script for Redshift
-  sync:reset [tables]      # reset sync
+  sync:generate_table_ddl [tables| –all-tables] # Generate CREATE TABLE script for Redshift
+  sync:reset [tables]      # reset sync and stop flydata process
+  sync:flush               # flush your current buffer and stop flydata process
       EOM
       text += "\n"
       text += '-' * 64

data/lib/flydata/parser/mysql/dump_parser.rb

@@ -181,6 +181,7 @@ REPLACE(TABLE_NAME, '`', '``'), '` ')
 AS tables
 FROM INFORMATION_SCHEMA.TABLES
 WHERE TABLE_TYPE = 'BASE TABLE'
+AND TABLE_SCHEMA IN (%s)
 AND ENGINE NOT IN ('MEMORY', 'CSV', 'PERFORMANCE_SCHEMA');
 EOS
 
@@ -214,7 +215,7 @@ EOS
           tables = ""
           if mysql_server_version(client) >= "5.5"
             # FLUSH TABLES table_names,... WITH READ LOCK syntax is supported from MySQL 5.5
-            result = client.query(USER_TABLES_QUERY)
+            result = client.query(USER_TABLES_QUERY % ["mysql", client.query_options[:database].to_s].collect{|db| "'#{db}'"}.join(","))
             tables = result.collect{|r| r['tables']}.join(", ")
           end
           FLUSH_TABLES_QUERY_TEMPLATE % [tables]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client