flydata 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7290d3afa3aae7bb6743d2cb07f4fcbc177cd6b2
-  data.tar.gz: 7b25b15017cbbe48e989a0ac81f144db992edd47
+  metadata.gz: b6701c9350e3750c31548dd87a4eef8f7fe0b892
+  data.tar.gz: 47bc03157661a676aa260bd8b4874ddb841473dd
 SHA512:
-  metadata.gz: 83d1593bbdc920c839eaa47896f7d346d00df01ce746688a0ff90ca9db0fb8165910cb608b0af56614ea0210e82b7a4f670613ad79273cb555b949b986dfd42d
-  data.tar.gz: 13316271fc44a751101167abb48b8250aceefd2a9393f081c7e29dfc2465b36ad45249734a052f5a0db8ae86ab551c75e6c67d4e369391ba1aa1c4557aee7784
+  metadata.gz: 9bad37633ebfa90d3cd8a6cd7a7a0fe89c37b44c6d0af79485b3d73b4ba3aea2f430fc979a9eedad4c390a3ff99270d7470977dcabe7bdadbaf801f6b4ba3210
+  data.tar.gz: 2177c90471da7c96ff39fb2af91e5144904296d460a21d024b0b60c9de37ada11de1718a07e239385bd64a62635006db4189cb76687dfdb26acd1eee50c0ccb9

data/VERSION

@@ -1 +1 @@
-0.6.6
+0.6.7

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.6.6"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS"]
-  s.date = "2016-02-09"
+  s.date = "2016-02-17"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdmysqldump", "fdredshift", "flydata", "serverinfo"]
@@ -217,6 +217,7 @@ Gem::Specification.new do |s|
     "lib/flydata/source/source_pos.rb",
     "lib/flydata/source/sync.rb",
     "lib/flydata/source/sync_generate_table_ddl.rb",
+    "lib/flydata/source_file/data_entry.rb",
     "lib/flydata/source_file/setup.rb",
     "lib/flydata/source_file/sync.rb",
     "lib/flydata/source_mysql/command/mysql.rb",

data/lib/flydata/command/restart.rb

@@ -15,8 +15,7 @@ module Flydata
         sender = Flydata::Command::Sender.new(opts)
         sender.restart
         unless opts.skip_helper?
-          helper = Flydata::Command::Helper.new
-          helper.restart(quiet: true)
+          system "flydata helper:restart"
         end
       end
       run_exclusive :run

data/lib/flydata/command/setup.rb

@@ -71,7 +71,7 @@ What's next?
         # Surprisingly, Helper's start method kills the process after starting
         # the helper thanks to ServerEngine.  So the command needs to run in a
         # separate process.
-        fork { Flydata::Command::Helper.new.restart(quiet: true) }
+        system "flydata helper:restart"
         Flydata::Command::Login.new.run unless flydata.credentials.authenticated?
         Flydata::Command::Conf.new.copy_templates
         puts

data/lib/flydata/command/sync.rb

@@ -268,11 +268,15 @@ EOS
         end
       end
 
+      # Command: flydata sync:repair
+      #  - Entry method
       def repair
         _repair
       end
       run_exclusive :repair
 
+      # Command: flydata sync:check
+      #  - Entry method
       def check(options = {})
         context = source.source_pos
         status, pos_mismatch_tables, gap_tables = _check(context, options)
@@ -310,6 +314,14 @@ EOS
       end
       run_exclusive :check
 
+      # Command: flydata sync:compat_check
+      #  - Entry method
+      def compat_check
+        context = source.sync_generate_table_ddl(flydata.data_port.get, opts)
+        context.run_compatibility_check
+      end
+      run_exclusive :compat_check
+
       private
 
       def generate_kv_pairs(keys, values)

data/lib/flydata/source_file/data_entry.rb

@@ -0,0 +1,11 @@
+require 'flydata/source/data_entry'
+
+module Flydata
+module SourceFile
+
+class DataEntry < Source::DataEntry
+  CONFIG_PARAMS = {}
+end
+
+end
+end

data/lib/flydata/source_mysql/command/mysqlbinlog.rb

@@ -8,14 +8,17 @@ module Flydata
       include MysqlCommandBase
 
       def generate_command(dbconf, args)
+        skip_ssl = !!args.delete('--skip-ssl')
         dbconf.delete('tables')
         dbconf[:custom_option_end] = args.join(' ')
         dbconf[:command] = 'mysqlbinlog'
         # --default-character-set=utf8 is not supported
         dbconf[:no_default_option] = true
         # ssl is not supported for mysql5.6 or older mysqlbinlog command
-        dbconf.delete('ssl_ca')
-        dbconf.delete('ssl_cipher')
+        if skip_ssl
+          dbconf.delete('ssl_ca')
+          dbconf.delete('ssl_cipher')
+        end
         dbconf.delete('database')
         if args.empty?
           puts <<EOT
@@ -24,6 +27,8 @@ example:
   flydata mysqlbinlog --raw --read-from-remote-server --result-file "binlog-" mysql-bin-changelog.xxxx
 2. Dump decoded binlog data
   flydata mysqlbinlog  -vv --base64-output=decode-row --hexdump --read-from-remote-server --start-position=4 --stop-position=yyyyy mysql-bin-changelog.xxxxx > mysql-bin-changelog.xxxxx
+
+NOTE: Add --skip-ssl to skip ssl options
 EOT
           return
         end

data/spec/flydata/command/restart_spec.rb

@@ -6,14 +6,12 @@ module Flydata
     describe Restart do
       subject { described_class.new }
       let(:sender) { double("sender") }
-      let(:helper) { double("helper") }
       let(:opts) { double("opts") }
 
       it "should restart sender and helper when skip-helper option is not passed" do
         expect(Flydata::Command::Sender).to receive(:new).and_return(sender)
         expect(sender).to receive(:restart)
-        expect(Flydata::Command::Helper).to receive(:new).and_return(helper)
-        expect(helper).to receive(:restart)
+        expect_any_instance_of(Flydata::Command::Restart).to receive(:system).with('flydata helper:restart')
         subject.run
       end
 
@@ -21,6 +19,7 @@ module Flydata
         expect(Flydata::Command::Sender).to receive(:new).and_return(sender)
         expect(sender).to receive(:restart)
         expect(opts).to receive(:skip_helper?).and_return(true)
+        expect_any_instance_of(Flydata::Command::Restart).to receive(:system).never
         described_class.new(opts).run
       end
     end

data/spec/flydata/command/setup_spec.rb

@@ -36,7 +36,7 @@ module Flydata
         expect(Flydata::Command::Conf).to receive(:new).and_return(conf)
         expect(Flydata::Command::Login).to receive(:new).and_return(login)
         expect(Flydata::Command::Sender).to receive(:new).and_return(sender).twice
-
+        expect_any_instance_of(Flydata::Command::Setup).to receive(:system).with('flydata helper:restart')
         subject.initial_run
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -692,6 +692,7 @@ files:
 - lib/flydata/source/source_pos.rb
 - lib/flydata/source/sync.rb
 - lib/flydata/source/sync_generate_table_ddl.rb
+- lib/flydata/source_file/data_entry.rb
 - lib/flydata/source_file/setup.rb
 - lib/flydata/source_file/sync.rb
 - lib/flydata/source_mysql/command/mysql.rb