tapsoob 0.5.26-java → 0.5.27-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe2c90dbfc6fff88f1ee9b6cc612de126911267688b74573c08777da3b75d8e9
-  data.tar.gz: a0d8eb29b71d4e66ec95efd8d0dbbccbefafed14c0a34864b63a9332a1f5b54d
+  metadata.gz: 64913bf573488ae2289aa0f84f33b09430b64e7556df3829c5d96cfea40bbb1d
+  data.tar.gz: 50e3ddb402f4775b791553f1c804368cf42e1c0ebb0925240a92f116a2bbca4e
 SHA512:
-  metadata.gz: 03ef33a4a575e953e2f5a91fa86154507a2cf3d43c63de48991361f8d10ea49e36e8ffc45e7679fa21b74b023d8032dd73ba7f2db99e633070a4dfa3795c6c6a
-  data.tar.gz: 3abad922203a7119f59e12cad794c9deefe34071ce0783b0f7743d2e3478c432b828d58bf1ce214af8e802f92c11350c7fa5e70786f60c0dc4217c9304d9ad94
+  metadata.gz: f2c54e67813d6c1209b884e67bbfde35a1940c5ccbb82f53f4371742d0d63baa898e3f888ed94b2f7feba5428e6db3d4e5f12ac0c17ba54413e09484ffc3b82a
+  data.tar.gz: f7e820052a312fc0d81e9e146a204ed9454a724ddb642cc2c24c4100588e1825dce59e1f34585e2f5d629dad6f8a5d08180b8b2e074cd171c4b4519609f5e5d9

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
+        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
+      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)

data/lib/tapsoob/version.rb

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

metadata

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