tapsoob 0.4.26-java → 0.5.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e3cbb277f5cdce47dedb68f56ac4122c47e44fa3b3206c6a319c35e86958781
-  data.tar.gz: bd35fe8afb0c23aaf477ea253fd3caee584bc2d889ab44edbd0e06531a657e73
+  metadata.gz: 1b6104bbadc92d741435a9773c00b8645c3d6272a7a341a23fd93d0a7c0f205d
+  data.tar.gz: 459b8833771b33ca771d2813501f7b9dcbf89446a994d398076b9bf9fe90b9ea
 SHA512:
-  metadata.gz: 7810d544770e15e4ed266f367f6e5f9477df1909122ec02c9c542d59cad422cdb80bd789286a21a4109634562f41159a5b4723bb45b129f6ff44ee4d770a2b7f
-  data.tar.gz: ad0409458ec17dfc37d274a8fa4245c16cc242e77423407bd46eb6c1dd62bfa625041b7d6fef4603052baea5f47849c9ba2f8a41bd058dcfe9c6e0283ede6086
+  metadata.gz: decc3c7ca389bab2014d244d3c25ab9feaded6847bdbb74781872d6bfdce47f2ea851630f81ec349977dcb98d1b0f2a2d2f4e9898170665726631231a9b7eabc
+  data.tar.gz: 412420cdf70186f69d67e4d822afae86c5c5b97789688d1b801800846a078e297a130d5c73196a7ad77a3aa46727d896648f8605a8932d41217b720b3983f112

data/lib/tapsoob/cli/data_stream.rb

@@ -26,7 +26,7 @@ module Tapsoob
       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, aliases: "-p"
-      option :purge, desc: "Purge data in tables prior to performing the import", default: false, type: :boolean, aliases: "-p"
+      option :purge, desc: "Purge data in tables prior to performing the import", default: false, type: :boolean
       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 :debug, desc: "Enable debug messages", default: false, type: :boolean, aliases: "-d"

data/lib/tapsoob/cli/root.rb

@@ -10,14 +10,16 @@ module Tapsoob
   module CLI
     class Root < Thor
       desc "pull DUMP_PATH DATABASE_URL", "Pull a dump from a database to a folder"
-      option :"skip-schema", desc: "Don't transfer the schema just data", default: false, type: :boolean, aliases: "-s"
+      option :data, desc: "Pull the data to the database", default: true, type: :boolean, aliases: '-d'
+      option :schema, desc: "Pull the schema to the database", default: true, type: :boolean, aliases: "-s"
       option :"indexes-first", desc: "Transfer indexes first before data", default: false, type: :boolean, aliases: "-i"
       option :resume, desc: "Resume a Tapsoob Session from a stored file", type: :string, aliases: "-r"
       option :chunksize, desc: "Initial chunksize", default: 1000, type: :numeric, aliases: "-c"
       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 :debug, desc: "Enable debug messages", default: false, type: :boolean, aliases: "-d"
+      option :progress, desc: "Show progress", default: true, type: :boolean
+      option :debug, desc: "Enable debug messages", default: false, type: :boolean
       def pull(dump_path, database_url)
         opts = parse_opts(options)
         Tapsoob.log.level = Logger::DEBUG if opts[:debug]
@@ -29,7 +31,8 @@ module Tapsoob
       end
 
       desc "push DUMP_PATH DATABASE_URL", "Push a previously tapsoob dump to a database"
-      option :"skip-schema", desc: "Don't transfer the schema just data", default: false, type: :boolean, aliases: "-s"
+      option :data, desc: "Push the data to the database", default: true, type: :boolean, aliases: '-d'
+      option :schema, desc: "Push the schema to the database", default: true, type: :boolean, aliases: "-s"
       option :"indexes-first", desc: "Transfer indexes first before data", default: false, type: :boolean, aliases: "-i"
       option :resume, desc: "Resume a Tapsoob Session from a stored file", type: :string, aliases: "-r"
       option :chunksize, desc: "Initial chunksize", default: 1000, type: :numeric, aliases: "-c"
@@ -39,7 +42,8 @@ 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 :debug, desc: "Enable debug messages", default: false, type: :boolean, aliases: "-d"
+      option :progress, desc: "Show progress", default: true, type: :boolean
+      option :debug, desc: "Enable debug messages", default: false, type: :boolean
       def push(dump_path, database_url)
         opts = parse_opts(options)
         Tapsoob.log.level = Logger::DEBUG if opts[:debug]
@@ -65,10 +69,12 @@ module Tapsoob
         def parse_opts(options)
           # Default options
           opts = {
-            skip_schema: options[:"skip-schema"],
+            data: options[:data],
+            schema: options[:schema],
             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

@@ -21,8 +21,12 @@ module Tapsoob
       "op"
     end
 
-    def skip_schema?
-      !!opts[:skip_schema]
+    def data?
+      opts[:data]
+    end
+
+    def schema?
+      opts[:schema]
     end
 
     def indexes_first?
@@ -162,13 +166,13 @@ module Tapsoob
     def run
       catch_errors do
         unless resuming?
-          pull_schema if !skip_schema?
-          pull_indexes if indexes_first? && !skip_schema?
+          pull_schema if schema?
+          pull_indexes if indexes_first? && schema?
         end
         setup_signal_trap
-        pull_partial_data if resuming?
-        pull_data
-        pull_indexes if !indexes_first? && !skip_schema?
+        pull_partial_data if data? && resuming?
+        pull_data if data?
+        pull_indexes if !indexes_first? && schema?
         pull_reset_sequences
       end
     end
@@ -216,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
 
@@ -324,13 +359,13 @@ module Tapsoob
     def run
       catch_errors do
         unless resuming?
-          push_schema if !skip_schema?
-          push_indexes if indexes_first? && !skip_schema?
+          push_schema if schema?
+          push_indexes if indexes_first? && schema?
         end
         setup_signal_trap
-        push_partial_data if resuming?
-        push_data
-        push_indexes if !indexes_first? && !skip_schema?
+        push_partial_data if data? && resuming?
+        push_data if data?
+        push_indexes if !indexes_first? && schema?
         push_reset_sequences
       end
     end
@@ -403,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
@@ -425,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
 
@@ -454,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.26".freeze
+  VERSION = "0.5.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.4.26
+  version: 0.5.4
 platform: java
 authors:
 - Félix Bellanger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement