flydata 0.6.3 → 0.6.4

data/lib/flydata/{mysql → source_mysql}/table_ddl.rb

@@ -1,22 +1,11 @@
-require 'flydata/mysql/binlog_position'
+require 'flydata/table_ddl'
 require 'flydata-core/mysql/command_generator'
+require 'flydata-core/mysql/binlog_pos'
 
 module Flydata
-module Mysql
+module SourceMysql
 
 class TableDdl
-  VERSION0 = 0 # the version where no .generated_ddl file was generated.
-               # Therefore, this version never shows up in anywhere.
-  VERSION1 = 1 # the version which doesn't handle server side encoding support.
-  VERSION2 = 2 # the version with server side encoding support, migrated from
-               # the previous versions.  Format/functionality-wise, it's the
-               # same as Version 3.
-  VERSION3 = 3 # the version with server side encoding support, generated by
-               # sync:generated_table_ddl command.
-  VERSION4 = 4 # the version with server side encoding support, generated by
-               # the auto-generated CREATE TABLE event.
-  VERSION = VERSION3
-
   def self.migrate_tables(tables, mysql_opts, sync_fm, position_file, context,
                           &block)
     migrate_to_v2(tables, mysql_opts, sync_fm, position_file, context, &block)
@@ -24,7 +13,7 @@ class TableDdl
 
   private
 
-  V2_TARGET_VERSION = VERSION2
+  V2_TARGET_VERSION = Flydata::TableDdl::VERSION2
   EVENT_TYPE = 'Query'
   ALTER_TABLE_CHARSET_SQL = <<EOS.strip
 ALTER TABLE `%s`.`%s` CHARACTER SET = %s;
@@ -60,9 +49,9 @@ EOS
       mysql_tabledef = mysql_tabledefs[table]
       if binlog_pos.nil?
         # get binlog position
-        binlog_pos = BinLogPosition.new(File.open(position_file){|f| f.read })
+        binlog_pos = FlydataCore::Mysql::BinlogPos.new(File.open(position_file){|f| f.read })
         original_binlog_file = context.current_binlog_file
-        context.current_binlog_file = binlog_pos.file
+        context.current_binlog_file = binlog_pos.filename
       end
       # get charset
       charset = mysql_tabledef.default_charset_mysql

data/lib/flydata/source_zendesk/sync_generate_table_ddl.rb

@@ -0,0 +1,30 @@
+require 'flydata/source/sync_generate_table_ddl'
+require 'flydata/source_zendesk/zendesk_flydata_tabledefs'
+
+module Flydata
+module SourceZendesk
+
+class SyncGenerateTableDdl < Source::SyncGenerateTableDdl
+  def run_compatibility_check
+    #TODO Check version "Zendesk v2 API"
+  end
+
+  def generate_flydata_tabledef(tables, options)
+    flydata_tabledefs = []
+    error_list = []
+    zendesk_resource_names = ZENDESK_FLYDATA_TABLEDEFS.keys.join(" ")
+
+    tables.each do |tablename|
+      flydata_tabledef = ZENDESK_FLYDATA_TABLEDEFS[tablename]
+      if !flydata_tabledef
+        error_list << { error: "Invalid Zendesk resource name specified. Flydata supports following Zendesk resources: #{zendesk_resource_names}", table: tablename }
+        next
+      end
+      flydata_tabledefs << flydata_tabledef
+    end
+    [flydata_tabledefs, error_list]
+  end
+end
+
+end
+end

data/lib/flydata/source_zendesk/zendesk_flydata_tabledefs.rb

@@ -0,0 +1,133 @@
+module Flydata
+module SourceZendesk
+
+class SyncGenerateTableDdl < Source::SyncGenerateTableDdl 
+ZENDESK_FLYDATA_TABLEDEFS = 
+{"tickets"=>
+  {:table_name=>"tickets",
+   :columns=>
+    [{:column=>"id", :type=>"int8(20)", :not_null=>true, :primary_key=>true},
+     {:column=>"url", :type=>"varchar(8000)", :default=>nil},#RFC7231 8000 octets
+     {:column=>"external_id", :type=>"varchar(2047)", :default=>nil},
+     {:column=>"type", :type=>"varchar(24)", :default=>nil},
+     {:column=>"subject", :type=>"text"},
+     {:column=>"raw_subject", :type=>"text"},
+     {:column=>"description", :type=>"text"},
+     {:column=>"priority", :type=>"varchar(24)", :default=>nil},
+     {:column=>"status", :type=>"varchar(24)", :default=>nil},
+     {:column=>"recipient", :type=>"varchar(762)", :default=>nil},#email
+     {:column=>"requester_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"submitter_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"assignee_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"organization_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"group_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"collaborator_ids", :type=>"text"},
+     {:column=>"forum_topic_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"problem_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"has_incidents", :type=>"int1(1)", :default=>nil},
+     {:column=>"due_at", :type=>"datetime", :default=>nil},
+     {:column=>"tags", :type=>"text"},
+     {:column=>"via", :type=>"text"},
+     {:column=>"custom_fields", :type=>"text"},
+     {:column=>"satisfaction_rating", :type=>"text"},
+     {:column=>"sharing_agreement_ids", :type=>"text"},
+     {:column=>"followup_ids", :type=>"text"},
+     {:column=>"ticket_form_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"brand_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"created_at", :type=>"datetime", :default=>nil},
+     {:column=>"updated_at", :type=>"datetime", :default=>nil}],
+   :default_charset=>"UTF_8",
+   :src_ddl=> '{"version":"Zendesk v2 API","url":"https://developer.zendesk.com/rest_api/docs/core/tickets”}'
+  },
+ "ticket_comments"=>
+  {:table_name=>"ticket_comments",
+   :columns=>
+    [{:column=>"id", :type=>"int8(20)", :not_null=>true, :primary_key=>true},
+     {:column=>"type", :type=>"varchar(24)", :default=>nil},
+     {:column=>"body", :type=>"text"},
+     {:column=>"html_body", :type=>"text"},
+     {:column=>"public", :type=>"int1(1)", :default=>nil},
+     {:column=>"author_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"attachments", :type=>"text"},
+     {:column=>"via", :type=>"text"},
+     {:column=>"metadata", :type=>"text"},
+     {:column=>"created_at", :type=>"datetime", :default=>nil}],
+   :default_charset=>"UTF_8",
+   :src_ddl=> '{"version":"Zendesk v2 API","url":"https://developer.zendesk.com/rest_api/docs/core/ticket_comments”}'
+  },
+ "ticket_audits"=>
+  {:table_name=>"ticket_audits",
+   :columns=>
+    [{:column=>"id", :type=>"int8(20)", :not_null=>true, :primary_key=>true},
+     {:column=>"ticket_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"metadata", :type=>"text"},
+     {:column=>"via", :type=>"text"},
+     {:column=>"created_at", :type=>"datetime", :default=>nil},
+     {:column=>"author_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"events", :type=>"text"}],
+   :default_charset=>"UTF_8",
+   :src_ddl=> '{"version":"Zendesk v2 API","url":"https://developer.zendesk.com/rest_api/docs/core/ticket_audits”}'
+  },
+ "users"=>
+  {:table_name=>"users",
+   :columns=>
+    [{:column=>"id", :type=>"int8(20)", :not_null=>true, :primary_key=>true},
+     {:column=>"url", :type=>"varchar(8000)", :default=>nil},#RFC 7230 recommendation (8000 octets)
+     {:column=>"name", :type=>"varchar(6141)", :default=>nil},
+     {:column=>"external_id", :type=>"varchar(2047)", :default=>nil},
+     {:column=>"alias", :type=>"varchar(6141)", :default=>nil},
+     {:column=>"created_at", :type=>"datetime", :default=>nil},
+     {:column=>"updated_at", :type=>"datetime", :default=>nil},
+     {:column=>"active", :type=>"int1(1)", :default=>nil},
+     {:column=>"verified", :type=>"int1(1)", :default=>nil},
+     {:column=>"shared", :type=>"int1(1)", :default=>nil},
+     {:column=>"shared_agent", :type=>"int1(1)", :default=>nil},
+     {:column=>"locale", :type=>"varchar(765)", :default=>nil},
+     {:column=>"locale_id", :type=>"int4(11)", :default=>nil},
+     {:column=>"time_zone", :type=>"varchar(765)", :default=>nil},
+     {:column=>"last_login_at", :type=>"datetime", :default=>nil},
+     {:column=>"two_factor_auth_enabled", :type=>"int1(1)", :default=>nil},
+     {:column=>"email", :type=>"varchar(762)", :default=>nil},
+     {:column=>"phone", :type=>"varchar(765)", :default=>nil},
+     {:column=>"signature", :type=>"text"},
+     {:column=>"details", :type=>"text"},
+     {:column=>"notes", :type=>"text"},
+     {:column=>"organization_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"role", :type=>"varchar(24)", :default=>nil},
+     {:column=>"custom_role_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"moderator", :type=>"int1(1)", :default=>nil},
+     {:column=>"ticket_restriction", :type=>"varchar(24)", :default=>nil},
+     {:column=>"only_private_comments", :type=>"int1(1)", :default=>nil},
+     {:column=>"tags", :type=>"text"},
+     {:column=>"suspended", :type=>"int1(1)", :default=>nil},
+     {:column=>"restricted_agent", :type=>"int1(1)", :default=>nil},
+     {:column=>"photo", :type=>"text"},
+     {:column=>"user_fields", :type=>"text"}],
+   :default_charset=>"UTF_8",
+   :src_ddl=> '{"version":"Zendesk v2 API","url":"https://developer.zendesk.com/rest_api/docs/core/users”}'
+  },
+ "organizations"=>
+  {:table_name=>"organizations",
+   :columns=>
+    [{:column=>"id", :type=>"int8(20)", :not_null=>true, :primary_key=>true},
+     {:column=>"url", :type=>"varchar(8000)", :default=>nil},
+     {:column=>"external_id", :type=>"varchar(2047)", :default=>nil},
+     {:column=>"name", :type=>"varchar(6141)", :default=>nil},
+     {:column=>"created_at", :type=>"datetime", :default=>nil},
+     {:column=>"updated_at", :type=>"datetime", :default=>nil},
+     {:column=>"domain_names", :type=>"text"},
+     {:column=>"details", :type=>"text"},
+     {:column=>"notes", :type=>"text"},
+     {:column=>"group_id", :type=>"int8(20)", :default=>nil},
+     {:column=>"shared_tickets", :type=>"int1(1)", :default=>nil},
+     {:column=>"shared_comments", :type=>"int1(1)", :default=>nil},
+     {:column=>"tags", :type=>"text"},
+     {:column=>"organization_fields", :type=>"text"}],
+   :default_charset=>"UTF_8",
+   :src_ddl=> '{"version":"Zendesk v2 API","url":"https://developer.zendesk.com/rest_api/docs/core/organizations”}'
+  }
+}
+end
+
+end
+end

data/lib/flydata/sync_file_manager.rb

@@ -1,6 +1,9 @@
-require 'mysql2'
 require 'flydata-core/query_job'
+require 'flydata/parser/source_table' # Required for Marshal.load
+require 'flydata/parser'
 require 'set'
+require 'flydata/source'
+require 'flydata/source/source_pos'
 
 module Flydata
   class SyncFileManager
@@ -9,12 +12,17 @@ module Flydata
     TABLE_POSITIONS_DIR = ENV['FLYDATA_TABLE_POSITIONS'] || File.join(FLYDATA_HOME, 'positions')
     SYNC_TABLE_POSITIONS = 0
 
-    def initialize(data_entry)
+    def initialize(data_entry, source = nil)
       @data_entry = data_entry
+      @source = source #for Source dependent objects
       @table_position_files = {} # File objects keyed by table name
       @sync_table_positions_count = SYNC_TABLE_POSITIONS
     end
 
+    def source
+      @source
+    end
+
     def close
       @table_position_files.values.each {|f| f.close }
       @table_position_files = {}
@@ -29,21 +37,19 @@ module Flydata
       dump_file_path + ".pos"
     end
 
-    def save_dump_pos(status, table_name, last_pos, binlog_pos, state = nil, substate = nil)
+    def save_dump_pos(status, table_name, last_pos, source_pos, state = nil, substate = nil)
       File.open(dump_pos_path, 'w') do |f|
-        f.write(dump_pos_content(status, table_name, last_pos, binlog_pos, state, substate))
+        f.write(dump_pos_content(status, table_name, last_pos, source_pos, state, substate))
       end
     end
 
     def load_dump_pos
       path = dump_pos_path
       return {} unless File.exists?(path)
-      items = File.open(path, 'r').readline.split("\t")
-      raise "Invalid dump.pos file: #{path}" unless items.length >= 5 && items.length <= 7
-      mysql_table = load_mysql_table_marshal_dump
-      { status: items[0], table_name: items[1], last_pos: items[2].to_i,
-        binlog_pos: {binfile: items[3], pos: items[4].to_i},
-        state: items[5], substate: items[6], mysql_table: mysql_table}
+      content = File.open(path, 'r').readline
+      source_table = load_source_table_marshal_dump
+
+      dump_pos_content_to_hash(content).merge( { source_table: source_table} )
     end
 
     def load_generated_ddl(tables)
@@ -79,60 +85,73 @@ module Flydata
       new_tables
     end
 
-    # MysqlTable marshal file
-    def mysql_table_marshal_dump_path
-      dump_file_path + ".mysql_table"
+    SOURCE_TABLE_EXT = "mysql_table"
+
+    # SourceTable marshal file
+    def source_table_marshal_dump_path
+      dump_file_path + ".#{SOURCE_TABLE_EXT}"
     end
 
-    def save_mysql_table_marshal_dump(mysql_table)
-      File.open(mysql_table_marshal_dump_path, 'w') do |f|
-        f.write Marshal.dump(mysql_table)
+    def save_source_table_marshal_dump(source_table)
+      File.open(source_table_marshal_dump_path, 'w') do |f|
+        f.write Marshal.dump(source_table)
       end
     end
 
     # master binlog.pos file
-    def save_binlog(binlog_pos)
-      path = binlog_path
+    def save_source_pos(source_pos)
+      path = source_pos_path
       File.open(path, 'w') do |f|
-        f.write(binlog_content(binlog_pos))
+        f.write(source_pos.to_s)
       end
     end
 
-    def load_binlog(file_path = binlog_path)
+    def load_source_pos(file_path = source_pos_path)
       return nil unless File.exists?(file_path)
-      f, pos = IO.read(file_path).strip.split("\t")
-      return nil if f.nil? || f.empty? || pos.nil?
-      { binfile: f, pos: pos.to_i }
+
+      source_pos_str = IO.read(file_path).strip
+      begin
+        context = source.source_pos
+        source_pos = context.create_source_pos(source_pos_str)
+      rescue RuntimeError
+        return nil
+      end
+      source_pos
     end
 
-    def binlog_path
+    def source_pos_path
       File.join(FLYDATA_HOME, @data_entry['name'] + ".binlog.pos")
     end
 
-    # sent binlog.pos file
-    def save_sent_binlog(binlog_pos)
-      File.open(sent_binlog_path, 'w') do |f|
-        f.write(binlog_content(binlog_pos))
+    # sent source pos file (binlog.pos)
+    def save_sent_source_pos(source_pos)
+      File.open(sent_source_pos_path, 'w') do |f|
+        f.write(source_pos.to_s)
       end
     end
 
-    def load_sent_binlog(file_path = sent_binlog_path)
+    def load_sent_source_pos(file_path = sent_source_pos_path)
       return nil unless File.exists?(file_path)
-      f, pos = IO.read(file_path).strip.split("\t")
-      return nil if f.nil? || f.empty? || pos.nil?
-      { binfile: f, pos: pos.to_i }
+
+      source_pos_str = IO.read(file_path).strip
+      begin
+        source_pos = source.source_pos.create_source_pos(source_pos_str)
+      rescue RuntimeError
+        return nil
+      end
+      source_pos
     end
 
-    def sent_binlog_path(master_binlog_path = binlog_path)
-      validate_master_binlog_path(master_binlog_path)
-      "#{master_binlog_path[0..-5]}.sent.pos"
+    def sent_source_pos_path(master_source_pos_path = source_pos_path)
+      validate_master_source_pos_path(master_source_pos_path)
+      "#{master_source_pos_path[0..-5]}.sent.pos"
     end
 
     # ssl_ca file path
-    def ssl_ca_path(master_binlog_path = binlog_path)
-      validate_master_binlog_path(master_binlog_path)
+    def ssl_ca_path(master_source_pos_path = source_pos_path)
+      validate_master_source_pos_path(master_source_pos_path)
       # <data-entry-name>.ssl_ca.pem
-      "#{master_binlog_path[0..-12]}.ssl_ca.pem"
+      "#{master_source_pos_path[0..-12]}.ssl_ca.pem"
     end
 
     def save_ssl_ca(ssl_ca_content, path = ssl_ca_path)
@@ -142,10 +161,10 @@ module Flydata
     end
 
     # ssl_cipher file path
-    def ssl_cipher_path(master_binlog_path = binlog_path)
-      validate_master_binlog_path(master_binlog_path)
+    def ssl_cipher_path(master_source_pos_path = source_pos_path)
+      validate_master_source_pos_path(master_source_pos_path)
       # <data-entry-name>.ssl_cipher
-      "#{master_binlog_path[0..-12]}.ssl_cipher"
+      "#{master_source_pos_path[0..-12]}.ssl_cipher"
     end
 
     def save_ssl_cipher(ssl_cipher_content, path = ssl_cipher_path)
@@ -176,12 +195,12 @@ module Flydata
         tables.map{|table| File.join(table_positions_dir_path, table + '.generated_ddl')}
     end
 
-    def table_binlog_pos_paths(*tables)
+    def table_source_pos_paths(*tables)
       tables.empty? ? Dir.glob(File.join(table_positions_dir_path, '*.binlog.pos')) :
         tables.map{|table| File.join(table_positions_dir_path, table + '.binlog.pos')}
     end
 
-    def table_binlog_pos_init_paths(*tables)
+    def table_source_pos_init_paths(*tables)
       tables.empty? ? Dir.glob(File.join(table_positions_dir_path, '*.binlog.pos.init')) :
         tables.map{|table| File.join(table_positions_dir_path, table + '.binlog.pos.init')}
     end
@@ -262,10 +281,11 @@ module Flydata
         tables: items[1].split(" ") }
     end
 
-    def get_table_binlog_pos_init(table_name)
+    def get_table_source_pos_init(table_name)
       file = File.join(table_positions_dir_path, table_name + ".binlog.pos.init")
       return nil unless File.exists?(file)
-      File.open(file, 'r').readline
+
+      source.source_pos.create_source_pos( File.open(file, 'r').readline )
     end
 
     def table_rev_file_path(table_name)
@@ -302,8 +322,8 @@ module Flydata
     def delete_table_control_files(*tables)
       files_to_delete = [
           table_position_file_paths(*tables),
-          table_binlog_pos_paths(*tables),
-          table_binlog_pos_init_paths(*tables),
+          table_source_pos_paths(*tables),
+          table_source_pos_init_paths(*tables),
           table_rev_file_paths(*tables),
           table_ddl_file_paths(*tables)
       ]
@@ -327,7 +347,7 @@ module Flydata
       files_to_delete = [
           dump_file_path,
           dump_pos_path,
-          mysql_table_marshal_dump_path,
+          source_table_marshal_dump_path,
           sync_info_file,
           stats_path
       ]
@@ -338,8 +358,8 @@ module Flydata
 
     def delete_master_position_files
       files_to_delete = [
-        binlog_path,
-        sent_binlog_path,
+        source_pos_path,
+        sent_source_pos_path,
         lock_pid_file,
       ]
       files_to_delete.flatten.each do |file_to_delete|
@@ -348,7 +368,7 @@ module Flydata
     end
 
 
-    def delete_table_binlog_pos(table_name)
+    def delete_table_source_pos(table_name)
       file = File.join(table_positions_dir_path, table_name + ".binlog.pos")
       if File.exists?(file)
         FileUtils.rm(file, :force => true)
@@ -357,7 +377,7 @@ module Flydata
       end
     end
 
-    def save_table_binlog_pos(tables, binlog_pos, options = {})
+    def save_table_source_pos(tables, source_pos, options = {})
       dest_dir = case options[:destination]
                  when :positions; table_positions_dir_path
                  when :dump; dump_dir
@@ -368,18 +388,28 @@ module Flydata
       tables.each do |table_name|
         file = File.join(dest_dir, table_name + ".binlog.pos")
         File.open(file, "w") do |f|
-          f.write(binlog_content(binlog_pos))
+          f.write(source_pos.to_s)
         end
       end
     end
 
-    def get_table_binlog_pos(table_name)
+    def get_table_source_pos(table_name)
+      source_pos_str = get_table_source_raw_pos(table_name)
+      return nil unless source_pos_str
+
+      source.source_pos.create_source_pos( source_pos_str )
+    end
+
+    def get_table_source_raw_pos(table_name) #returns String. interface for fluentd
       file = File.join(table_positions_dir_path, table_name + ".binlog.pos")
       return nil unless File.exists?(file)
+
       File.open(file, 'r').readline
     end
 
-    def install_table_binlog_files(tables)
+
+
+    def install_table_source_pos_files(tables)
       FileUtils.mkdir_p(table_positions_dir_path) unless Dir.exists?(table_positions_dir_path)
       tables.each do |table_name|
         file_name = table_name + ".binlog.pos"
@@ -403,7 +433,7 @@ module Flydata
       FileUtils.mkdir_p(backup_dir) unless Dir.exists?(backup_dir)
       dest_dir = File.join(backup_dir, Time.now.strftime("%Y%m%d%H%M%S"))
       FileUtils.mkdir(dest_dir)
-      %w(info pos stats mysql_table).each do |ext|
+      ['info', 'pos', 'stats', SOURCE_TABLE_EXT].each do |ext|
         FileUtils.mv(Dir.glob("#{dump_dir}/*.#{ext}"), dest_dir)
       end
     end
@@ -435,29 +465,58 @@ module Flydata
       end
     end
 
-    def dump_pos_content(status, table_name, last_pos, binlog_pos, state = nil, substate = nil)
-      [status, table_name, last_pos, binlog_content(binlog_pos), state, substate].join("\t")
+    def dump_pos_content(status, table_name, last_pos, source_pos, state = nil, substate = nil)
+      [status, table_name, last_pos, source_pos.to_s, state, substate].join("\t")
     end
 
-    def binlog_content(binlog_pos)
-      binlog_pos.kind_of?(Hash) ?
-               [binlog_pos[:binfile], binlog_pos[:pos]].join("\t")
-             : binlog_pos
+    def dump_pos_content_to_hash(content)
+      items = content.split("\t",-1) # -1 means,(1) there is no limit to the number of fields returned
+                                     #          (2) trailing null fields are not suppressed.
+      raise "Invalid dump.pos file: #{path}" unless items.length >= 6
+
+      status = items[0]
+      table_name = items[1]
+      last_pos = items[2].to_i
+
+      source_pos_str = items[3..-3].join("\t")
+      context = source.source_pos
+      source_pos = context.create_source_pos(source_pos_str)
+
+      state = get_parse_state(items[-2])
+      substate = get_parse_state(items[-1])
+
+      { status: status, table_name: table_name, last_pos: last_pos,
+        source_pos: source_pos,
+        state: state, substate: substate }
+    end
+
+    def get_parse_state(state)
+      state.empty? ? nil : state
     end
 
-    def load_mysql_table_marshal_dump
-      path = mysql_table_marshal_dump_path
+    def load_source_table_marshal_dump
+      path = source_table_marshal_dump_path
       return nil unless File.exists?(path)
       Marshal.load(File.open(path, 'r'))
     end
 
+    OLD_DUMP_DIR_PROPERTY = 'mysqldump_dir'
+    DUMP_DIR_PROPERTY = 'dump_dir'
     def dump_dir
       pref = @data_entry['mysql_data_entry_preference']
-      dump_dir = if pref and pref['mysqldump_dir']
-                   pref['mysqldump_dir']
-                 else
-                   nil
-                 end
+      dump_dir = nil
+      dump_dir_property = DUMP_DIR_PROPERTY
+
+      if pref
+        # check the old property for backward compatibility
+        [DUMP_DIR_PROPERTY, OLD_DUMP_DIR_PROPERTY].each do |prop|
+          if pref[prop]
+            dump_dir_property = prop
+            dump_dir = pref[prop]
+            break
+          end
+        end
+      end
       if dump_dir
         dump_dir = dump_dir.dup
         dump_dir[0] = ENV['HOME'] if dump_dir.match(/^~$|^~\//)
@@ -465,15 +524,15 @@ module Flydata
         dump_dir = DUMP_DIR.dup
       end
       if File.exists?(dump_dir) and not Dir.exists?(dump_dir)
-        raise "'mysqldump_dir'(#{dump_dir}) must be a directory."
+        raise "'#{dump_dir_property}'(#{dump_dir}) must be a directory."
       end
       FileUtils.mkdir_p(dump_dir) unless Dir.exists?(dump_dir)
       dump_dir
     end
 
-    def validate_master_binlog_path(master_binlog_path)
-      unless master_binlog_path && master_binlog_path.end_with?('binlog.pos')
-        raise ArgumentError.new("Invalid binlog path. binlog path needs to end with 'binlog.pos'")
+    def validate_master_source_pos_path(master_source_pos_path)
+      unless master_source_pos_path && master_source_pos_path.end_with?('binlog.pos')
+        raise ArgumentError.new("Invalid source position path. Source position path needs to end with 'binlog.pos'")
       end
     end
   end