tapsoob 0.4.27 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f87d929aa027581755bc0a9cf313fc6532505a99ce68a1537a02539a1bbc4fd9
-  data.tar.gz: ea9242c530789c7175db850b178e7a824e77742c44c04f29731e9e5badb6fb0e
+  metadata.gz: 10ae20ca73c6821c188d7345388336477aa6517e8761d2caefccf1b0df073556
+  data.tar.gz: f36c26256ff6531439a4c1e0f1e93694128157a17b4e9a4d92c98fc45e3e03d0
 SHA512:
-  metadata.gz: feea04845e17624632d56fa5258b8492040bb8078baa0fae7c5f7c0e99e3d4cd3158520d4a84d9aa4e2955e81a5a6a213e350f54b3ff48a820808a9718bb1df5
-  data.tar.gz: 182d6f6df58ff78e1e53e3539a5de2f8ccdec862255bb876b2b8828e890f51b3e4ba7d065fcecbe5d79dddd8c9e6f514b3a56ecdcb2d516d4825cbdcb6cc525b
+  metadata.gz: 4d052875c6dc6d045c673b2e8d6505be0823d8a9ec45ed2c47c8ab8cfe9a9b17007cef94db6a05bece6a95900eae992888be12585e906bef8f40eede6bc96848
+  data.tar.gz: 3e3b6d5c73ae96dc28c44777207c6f7a70379e6c9efbbfa6ab241b2324a3f759d1c970e91cb868f06659945498dafbbb4e4f62f14b02cc3a623b0d3a23d7446f

data/lib/tapsoob/cli/root.rb

@@ -18,6 +18,7 @@ module Tapsoob
       option :"disable-compression", desc: "Disable Compression", default: false, type: :boolean, aliases: "-g"
       option :tables, desc: "Shortcut to filter on a list of tables", type: :array, aliases: "-t"
       option :"exclude-tables", desc: "Shortcut to exclude a list of tables", type: :array, aliases: "-e"
+      option :progress, desc: "Show progress", default: true, type: :boolean
       option :debug, desc: "Enable debug messages", default: false, type: :boolean, aliases: "-d"
       def pull(dump_path, database_url)
         opts = parse_opts(options)
@@ -41,6 +42,7 @@ module Tapsoob
       option :purge, desc: "Purge data in tables prior to performing the import", default: false, type: :boolean, aliases: "-p"
       option :"skip-duplicates", desc: "Remove duplicates when loading data", default: false, type: :boolean
       option :"discard-identity", desc: "Remove identity when pushing data (may result in creating duplicates)", default: false, type: :boolean
+      option :progress, desc: "Show progress", default: true, type: :boolean
       option :debug, desc: "Enable debug messages", default: false, type: :boolean, aliases: "-d"
       def push(dump_path, database_url)
         opts = parse_opts(options)
@@ -72,6 +74,7 @@ module Tapsoob
             indexes_first: options[:"indexes_first"],
             disable_compression: options[:"disable-compression"],
             tables: options[:tables],
+            progress: options[:progress],
             debug: options[:debug]
           }
 

data/lib/tapsoob/data_stream.rb

@@ -74,6 +74,7 @@ module Tapsoob
     def fetch_rows
       state[:chunksize] = fetch_chunksize
       ds = table.order(*order_by).limit(state[:chunksize], state[:offset])
+      state[:size] = table.count
       log.debug "DataStream#fetch_rows SQL -> #{ds.sql}"
       rows = Tapsoob::Utils.format_data(db, ds.all,
         :string_columns => string_columns,
@@ -87,6 +88,7 @@ module Tapsoob
     def fetch_file(dump_path)
       state[:chunksize] = fetch_chunksize
       ds = JSON.parse(File.read(File.join(dump_path, "data", "#{table_name}.json")))
+      state[:size] = ds["data"].size
       log.debug "DataStream#fetch_file"
       rows = {
         :table_name => ds["table_name"],
@@ -132,71 +134,34 @@ module Tapsoob
       t2 = Time.now
       elapsed_time = t2 - t1
 
-      if opts[:type] == "file"
-        @complete = rows[:data] == [ ]
-      else
-        @complete = rows == { }
-      end
+      state[:offset] += (rows == {} ? 0 : rows[:data].size)
 
-      [encoded_data, (@complete ? 0 : rows[:data].size), elapsed_time]
+      [encoded_data, (rows == {} ? 0 : rows[:data].size), elapsed_time]
     end
 
     def complete?
-      @complete
+      state[:offset] >= state[:size]
     end
 
-    def fetch_database
-      params = fetch_from_database
+    def fetch_data_from_database(params)
       encoded_data = params[:encoded_data]
-      json = params[:json]
 
-      rows = parse_encoded_data(encoded_data, json[:checksum])
-
-      @complete = rows == { }
+      rows = parse_encoded_data(encoded_data, params[:checksum])
 
       # update local state
-      state.merge!(json[:state].merge(:chunksize => state[:chunksize]))
-
-      unless @complete
-        yield rows if block_given?
-        state[:offset] += rows[:data].size
-        rows[:data].size
-      else
-        0
-      end
-    end
+      state.merge!(params[:state].merge(:chunksize => state[:chunksize]))
 
-    def fetch_from_database
-      res = nil
-      log.debug "DataStream#fetch_from_database state -> #{state.inspect}"
-      state[:chunksize] = Tapsoob::Utils.calculate_chunksize(state[:chunksize]) do |c|
-        state[:chunksize] = c.to_i
-        encoded_data = fetch.first
-
-        checksum = Tapsoob::Utils.checksum(encoded_data).to_s
-
-        res = {
-          :json         => { :checksum => checksum, :state => to_hash },
-          :encoded_data => encoded_data
-        }
-      end
-
-      res
+      yield rows if block_given?
+      (rows == {} ? 0 : rows[:data].size)
     end
 
-    def fetch_data_in_database(params)
+    def fetch_data_to_database(params)
       encoded_data = params[:encoded_data]
 
       rows = parse_encoded_data(encoded_data, params[:checksum])
-
-      @complete = rows[:data] == [ ]
-
-      unless @complete
-        import_rows(rows)
-        rows[:data].size
-      else
-        0
-      end
+      
+      import_rows(rows)
+      (rows == {} ? 0 : rows[:data].size)
     end
 
     def self.parse_json(json)
@@ -266,7 +231,6 @@ module Tapsoob
       end
 
       table.import(columns, data, :commit_every => 100)
-      state[:offset] += rows[:data].size
     rescue Exception => ex
       case ex.message
       when /integer out of range/ then

data/lib/tapsoob/operation.rb

@@ -220,25 +220,56 @@ module Tapsoob
 
     def pull_data_from_table(stream, progress)
       loop do
-        begin
-          exit 0 if exiting?
+        if exiting?
+          store_session
+          exit 0
+        end
 
-          size = stream.fetch_database do |rows|
-            if dump_path.nil?
-              puts JSON.generate(rows)
-            else
-              Tapsoob::Utils.export_rows(dump_path, stream.table_name, rows)
+        row_size = 0
+        chunksize = stream.state[:chunksize]
+
+        begin
+          chunksize = Tapsoob::Utils.calculate_chunksize(chunksize) do |c|
+            stream.state[:chunksize] = c.to_i
+            encoded_data, row_size, elapsed_time = nil
+            d1 = c.time_delta do
+              encoded_data, row_size, elapsed_time = stream.fetch
             end
+        
+            data = nil
+            d2 = c.time_delta do
+              data = {
+                :state        => stream.to_hash,
+                :checksum     => Tapsoob::Utils.checksum(encoded_data).to_s,
+                :encoded_data => encoded_data
+              }
+            end
+        
+            stream.fetch_data_from_database(data) do |rows|
+              next if rows == {}
+
+              if dump_path.nil?
+                puts JSON.generate(rows)
+              else
+                Tapsoob::Utils.export_rows(dump_path, stream.table_name, rows)
+              end
+            end
+            log.debug "row size: #{row_size}"
+            stream.error = false
+            self.stream_state = stream.to_hash
+            
+            c.idle_secs = (d1 + d2)
+            
+            elapsed_time
           end
-          stream.error = false
-          self.stream_state = stream.to_hash
         rescue Tapsoob::CorruptedData => e
           log.info "Corrupted Data Received #{e.message}, retrying..."
           stream.error = true
           next
         end
 
-        progress.inc(size) if progress && !exiting?
+        progress.inc(row_size) if progress
+        
         break if stream.complete?
       end
 
@@ -407,7 +438,7 @@ module Tapsoob
           :purge => opts[:purge] || false,
           :debug => opts[:debug]
         })
-        progress = ProgressBar.new(table_name.to_s, count)
+        progress = (opts[:progress] ? ProgressBar.new(table_name.to_s, count) : nil)
         push_data_from_file(stream, progress)
       end
     end
@@ -429,17 +460,17 @@ module Tapsoob
             d1 = c.time_delta do
               encoded_data, row_size, elapsed_time = stream.fetch({ :type => "file", :source => dump_path })
             end
-            break if stream.complete?
 
             data = nil
             d2 = c.time_delta do
               data = {
-                :state    => stream.to_hash,
-                :checksum => Tapsoob::Utils.checksum(encoded_data).to_s
+                :state        => stream.to_hash,
+                :checksum     => Tapsoob::Utils.checksum(encoded_data).to_s,
+                :encoded_data => encoded_data
               }
             end
 
-            row_size = stream.fetch_data_in_database({ :encoded_data => encoded_data, :checksum => data[:checksum] })
+            stream.fetch_data_to_database(data)
             log.debug "row size: #{row_size}"
             self.stream_state = stream.to_hash
 
@@ -458,13 +489,12 @@ module Tapsoob
         end
         stream.state[:chunksize] = chunksize
 
-        progress.inc(row_size)
+        progress.inc(row_size) if progress
 
-        stream.increment(row_size)
         break if stream.complete?
       end
 
-      progress.finish
+      progress.finish if progress
       completed_tables << stream.table_name.to_s
       self.stream_state = {}
     end

data/lib/tapsoob/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.4.27
+  version: 0.5.2
 platform: ruby
 authors:
 - Félix Bellanger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ripl