tapsoob 0.5.26-java → 0.5.28-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe2c90dbfc6fff88f1ee9b6cc612de126911267688b74573c08777da3b75d8e9
-  data.tar.gz: a0d8eb29b71d4e66ec95efd8d0dbbccbefafed14c0a34864b63a9332a1f5b54d
+  metadata.gz: 7554a38a7588261f53f4d653a513c7befc0fe900bd4ca2e12707623f3e574d82
+  data.tar.gz: df55e85a95cba4f95c30a9eeabd3d7523949ff492422159d997a6d848bb1c39f
 SHA512:
-  metadata.gz: 03ef33a4a575e953e2f5a91fa86154507a2cf3d43c63de48991361f8d10ea49e36e8ffc45e7679fa21b74b023d8032dd73ba7f2db99e633070a4dfa3795c6c6a
-  data.tar.gz: 3abad922203a7119f59e12cad794c9deefe34071ce0783b0f7743d2e3478c432b828d58bf1ce214af8e802f92c11350c7fa5e70786f60c0dc4217c9304d9ad94
+  metadata.gz: 804658b12d9d1f43fbc80670645854ccaa54e3cc915e754e3433efa61738a646d73afa2ddf28fee2f317ffc3e8d269778a9533e31aa9bc7cf2b7cfb8f1d04ffc
+  data.tar.gz: ac1ff9b60b5b52fcadd568b772337a8257b814fa23cc2d6b035fabf5d2c99de320ea1054e45fae4c955ec1a2de2de1ff3a34f9eba947b4fbfaeb721b9d01f3f8

data/lib/tapsoob/operation.rb

@@ -198,11 +198,12 @@ module Tapsoob
       log.info "#{tables.size} tables, #{format_number(record_count)} records"
 
       tables.each do |table_name, count|
-        progress = (opts[:progress] ? ProgressBar.new(table_name.to_s, count) : nil)
         stream   = Tapsoob::DataStream.factory(db, {
           :chunksize  => default_chunksize,
           :table_name => table_name
         }, { :debug => opts[:debug] })
+        estimated_chunks = [(count.to_f / default_chunksize).ceil, 1].max
+        progress = (opts[:progress] ? ProgressBar.new(table_name.to_s, estimated_chunks) : nil)
         pull_data_from_table(stream, progress)
       end
     end
@@ -214,8 +215,10 @@ module Tapsoob
       record_count = tables[table_name.to_s]
       log.info "Resuming #{table_name}, #{format_number(record_count)} records"
 
-      progress = (opts[:progress] ? ProgressBar.new(table_name.to_s, record_count) : nil)
       stream = Tapsoob::DataStream.factory(db, stream_state)
+      chunksize = stream_state[:chunksize] || default_chunksize
+      estimated_chunks = [(record_count.to_f / chunksize).ceil, 1].max
+      progress = (opts[:progress] ? ProgressBar.new(table_name.to_s, estimated_chunks) : nil)
       pull_data_from_table(stream, progress)
     end
 
@@ -249,8 +252,8 @@ module Tapsoob
             stream.fetch_data_from_database(data) do |rows|
               next if rows == {}
 
-              # Update progress bar immediately when data is ready, before I/O
-              progress.inc(row_size) if progress
+              # Update progress bar by 1 chunk
+              progress.inc(1) if progress
 
               if dump_path.nil?
                 puts JSON.generate(rows)
@@ -420,8 +423,10 @@ module Tapsoob
       table_name = stream_state[:table_name]
       record_count = tables[table_name.to_s]
       log.info "Resuming #{table_name}, #{format_number(record_count)} records"
-      progress = ProgressBar.new(table_name.to_s, record_count)
       stream = Tapsoob::DataStream.factory(db, stream_state)
+      chunksize = stream_state[:chunksize] || default_chunksize
+      estimated_chunks = [(record_count.to_f / chunksize).ceil, 1].max
+      progress = (opts[:progress] ? ProgressBar.new(table_name.to_s, estimated_chunks) : nil)
       push_data_from_file(stream, progress)
     end
 
@@ -442,7 +447,8 @@ module Tapsoob
           :purge => opts[:purge] || false,
           :debug => opts[:debug]
         })
-        progress = (opts[:progress] ? ProgressBar.new(table_name.to_s, count) : nil)
+        estimated_chunks = [(count.to_f / default_chunksize).ceil, 1].max
+        progress = (opts[:progress] ? ProgressBar.new(table_name.to_s, estimated_chunks) : nil)
         push_data_from_file(stream, progress)
       end
     end
@@ -493,7 +499,8 @@ module Tapsoob
         end
         stream.state[:chunksize] = chunksize
 
-        progress.inc(row_size) if progress
+        # Update progress bar by 1 chunk
+        progress.inc(1) if progress
 
         break if stream.complete?
       end

data/lib/tapsoob/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Tapsoob
-  VERSION = "0.5.26".freeze
+  VERSION = "0.5.28".freeze
 end

data/lib/tasks/tapsoob.rake

@@ -2,7 +2,7 @@ namespace :tapsoob do
   desc "Pulls a database to your filesystem"
   task :pull => :environment do
     # Default options
-    opts={:default_chunksize => 1000, :debug => false, :resume_filename => nil, :disable_compression => false, :schema => true, :data => true, :indexes_first => false}
+    opts={:default_chunksize => 1000, :debug => false, :resume_filename => nil, :disable_compression => false, :schema => true, :data => true, :indexes_first => false, :progress => true}
 
     # Get the dump_path
     dump_path = File.expand_path(Rails.root.join("db", Time.now.strftime("%Y%m%d%I%M%S%p"))).to_s
@@ -23,7 +23,7 @@ namespace :tapsoob do
   desc "Push a compatible dump on your filesystem to a database"
   task :push, [:timestamp] => :environment do |t, args|
     # Default options
-    opts={:default_chunksize => 1000, :debug => false, :resume_filename => nil, :disable_compression => false, :schema => true, :data => true, :indexes_first => false}
+    opts={:default_chunksize => 1000, :debug => false, :resume_filename => nil, :disable_compression => false, :schema => true, :data => true, :indexes_first => false, :progress => true}
 
     # Get the dumps
     dumps = Dir[Rails.root.join("db", "*/")].select { |e| e =~ /([0-9]{14})([A-Z]{2})/ }.sort

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.5.26
+  version: 0.5.28
 platform: java
 authors:
 - Félix Bellanger