myreplicator 1.1.15 → 1.1.16

data/app/models/myreplicator/log.rb

@@ -124,7 +124,7 @@ module Myreplicator
       if log.nil?
         return false
       else
-        return true if log.state != "running"
+        return true if log.state == "completed"
       end
       
       return false

data/lib/exporter/mysql_exporter.rb

@@ -281,11 +281,11 @@ module Myreplicator
 
     def on_export_success metadata
       metadata.on_success do |m|
+        zipfile(metadata)
         update_export(:state => "export_completed", 
                       :export_finished_at => Time.now, 
                       :error => metadata.error)
         metadata.state = "export_completed"
-        zipfile(metadata)
       end
     end
     

data/lib/loader/loader.rb

@@ -293,9 +293,9 @@ module Myreplicator
         puts "&&&&&&&&&&&&&&&&&&&&&&&&&&"
         Kernel.p file
         puts "&&&&&&&&&&&&&&&&&&&&&&&&&&"
-        if job.state == "transport_completed"
+        #if job.state == "transport_completed"
           result << file
-        end
+        #end
         puts "^^^^^^^^^^^^^^^^^^^^^^^^^^"
         Kernel.p result
         puts "^^^^^^^^^^^^^^^^^^^^^^^^^^"

data/lib/loader/vertica/vertica_loader.rb

@@ -153,7 +153,7 @@ module Myreplicator
           options[:table] = options[:table_name]
           Kernel.p "===== MERGE ====="
           vertica_merge options
-          #drop the temp table
+          drop the temp table
           Kernel.p "===== DROP TEMP TABLE ====="
           sql = "DROP TABLE IF EXISTS #{options[:db]}.#{options[:destination_schema]}.#{temp_table} CASCADE;"
           VerticaDb::Base.connection.execute sql
@@ -211,11 +211,11 @@ module Myreplicator
           # special case for NULL MySQL datetime/date type but the column is defined NOT NULL
           extension = file.split('.').last
           if value == '0000-00-00'
-            cmd1 = "sed -i .dat 's/#{value}/1900-01-01/g' #{file}"
+            cmd1 = "sed -i 's/#{value}/1900-01-01/g' #{file}"
             Kernel.p cmd1
             system(cmd1)
           else
-            cmd1 = "sed -i .dat 's/#{value}/#{null_value}/g' #{file}"
+            cmd1 = "sed -i 's/#{value}/#{null_value}/g' #{file}"
             Kernel.p cmd1
             system(cmd1)
           end
@@ -232,19 +232,14 @@ module Myreplicator
         temp_file = "tmp/temp_#{file.split('.').first.split('/').last}.txt"
         
         cmd = "gunzip -f #{file} -c > #{temp_file}"
+        Kernel.p cmd
         system(cmd)
         # sed
         replace_null("#{temp_file}", list_of_nulls, null_value)
         # zip
-        cmd4 = "cp #{temp_file}.dat #{temp_file}"
-        Kernel.p cmd4
-        system(cmd4)
         cmd2 = "gzip #{temp_file} -c > #{file}"
         Kernel.p cmd2
         system(cmd2)
-        cmd5 = "rm #{temp_file}.dat"
-        Kernel.p cmd5
-        system(cmd5)
         cmd3 = "rm #{temp_file}"
         Kernel.p cmd3
         system(cmd3)
@@ -329,7 +324,7 @@ module Myreplicator
           end
           count += 1
         end  
-        sql+= ";"  
+        sql+= "; COMMIT;"  
         cmd = "#{prepared_options[:vsql]} -h #{prepared_options[:host]} -U #{prepared_options[:user]} -w #{prepared_options[:pass]} -d #{prepared_options[:db]} -c \"#{sql}\""
         return cmd    
       end

data/lib/myreplicator/version.rb

@@ -1,3 +1,3 @@
 module Myreplicator
-  VERSION = "1.1.15"
+  VERSION = "1.1.16"
 end

data/lib/transporter/transporter.rb

@@ -39,7 +39,7 @@ module Myreplicator
     # downloads export files concurrently from multiple sources
     ##
     def self.transfer
-      unique_jobs = Export.where("active = 1 and state = 'export_completed'").group("source_schema")
+      unique_jobs = Export.where("active = 1").group("source_schema")
       Kernel.p "===== unique_jobs ====="
       Kernel.p unique_jobs 
       unique_jobs.each do |export|
@@ -105,7 +105,7 @@ module Myreplicator
               local_dump_file = File.join(tmp_dir, dump_file.split("/").last)
               sftp.download!(dump_file, local_dump_file)
               Transporter.remove!(export, json_file, dump_file)
-              export.update_attributes!({:state => 'transport_completed'})
+              #export.update_attributes!({:state => 'transport_completed'})
               # store back up as well
               unless metadata.store_in.blank?
                 Transporter.backup_files(metadata.backup_path, json_local_path, local_dump_file)
@@ -151,7 +151,8 @@ module Myreplicator
         return []
       end
       files = done_files.split("\n")
-      jobs = Export.where("active = 1 and state = 'export_completed' and source_schema = '#{export.source_schema}'")
+      
+      jobs = Export.where("active = 1 and source_schema = '#{export.source_schema}'")
       #jobs.each do |j|
       #  j.update_attributes!({:state => "transporting"})
       #end
@@ -161,7 +162,7 @@ module Myreplicator
         jobs.each do |job|
           if file.include?(job.table_name)
             flag = job 
-            job.update_attributes!({:state => 'transporting'})
+            #job.update_attributes!({:state => 'transporting'})
           end
         end
         if flag
@@ -171,6 +172,10 @@ module Myreplicator
       Kernel.p "===== done_files ====="
       Kernel.p result
       return result
+
+      #Kernel.p "===== done_files ====="
+      #Kernel.p files
+      #return files
     end
 
     def self.metadata_obj json_path