tapsoob 0.3.27-java → 0.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c121ad1d7de6889a3cc1e79d39ab7844099a88a3da79654c1bfba1ddaba87f6
-  data.tar.gz: fac74e80043e1e2418f11541db774650f483a866e52fdfbe7282d4eb3f63a47a
+  metadata.gz: b7fe4d2055d9856830a8bb0ef1adf1970a99d2e924a13e973dfd4ee85c7a860d
+  data.tar.gz: 454a9fa96ab1dd465897b2324b5e04ecad65b81a640c5a677a24ff3111e3acc5
 SHA512:
-  metadata.gz: 4091d6a83bd692f59661236077028ee8c082b9fbe46d8adc7bb38afe736a6f26b3fcb404e4eeb9e2f0597cad75438cfbdeea5dabe9ad70f34f1582f202b7f54e
-  data.tar.gz: 3faea33ccd48dc605cd0f70e8f8fd9c68ed9a0d77ae057af193051a004124a91a9d2b65f3265878368e0aa9d035631ce6af4eb4142b2bd6bcc0070b4a9060152
+  metadata.gz: fd9b4e500e99061c6d2b139e3a3b0cbedfc227a681c1cecde91df9a9203502eeede62d061594c7ccc6c24fb3e2d1ee42f492fb258a222a7f2f3f7e74fc70bd10
+  data.tar.gz: dd73a21cfc24b0bdba74a9cda436dda14d96ada20caa66af3ff4f65cc84d06799439bf2eb3c44f89f31fa24e93bb6e607cdb8a6b917f958d7cba28ae3b8cf6dc

data/lib/tapsoob/cli/data_stream.rb

@@ -28,6 +28,8 @@ 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 :"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"
       def push(database_url, dump_path = nil)
         # instantiate stuff
@@ -46,9 +48,8 @@ module Tapsoob
         data.each do |table|
           stream = Tapsoob::DataStream.factory(db(database_url, opts), {
             table_name: table[:table_name],
-            chunksize: opts[:default_chunksize],
-            debug: opts[:debug]
-          })
+            chunksize: opts[:default_chunksize]
+          }, { :"discard-identity" => opts[:"discard-identity"] || false, :purge => opts[:purge] || false, :debug => opts[:debug] })
 
           begin
             stream.import_rows(table)
@@ -66,6 +67,10 @@ module Tapsoob
             debug: options[:debug]
           }
 
+          # Push only options
+          opts[:purge] = options[:purge] if options.key?(:purge)
+          opts[:"discard-identity"] = options[:"discard-identity"] if options.key?(:"discard-identity")
+
           # Default chunksize
           if options[:chunksize]
             opts[:default_chunksize] = (options[:chunksize] < 10 ? 10 : options[:chunksize])

data/lib/tapsoob/data_stream.rb

@@ -91,7 +91,8 @@ module Tapsoob
       rows = {
         :table_name => ds["table_name"],
         :header     => ds["header"],
-        :data       => ds["data"][state[:offset], (state[:offset] + state[:chunksize])] || [ ]
+        :data       => (ds["data"][state[:offset], (state[:offset] + state[:chunksize])] || [ ]),
+        :types      => ds["types"]
       }
       update_chunksize_stats
       rows
@@ -222,12 +223,24 @@ module Tapsoob
       columns = rows[:header]
       data    = rows[:data]
 
+      # Only import existing columns
+      if table.columns.size != columns.size
+        existing_columns        = table.columns.map(&:to_s)
+        additional_columns      = columns - existing_columns
+        additional_columns_idxs = additional_columns.map { |c| columns.index(c) }
+        additional_columns_idxs.reverse.each do |idx|
+          columns.delete_at(idx)
+          rows[:types].delete_at(idx)
+        end
+        data.each_index { |didx| additional_columns_idxs.reverse.each { |idx| data[didx].delete_at(idx) } }
+      end
+
       # Decode blobs
       if rows.has_key?(:types) && rows[:types].include?("blob")
         blob_indices = rows[:types].each_index.select { |idx| rows[:types][idx] == "blob" }
-        rows[:data].each_index do |idx|
+        data.each_index do |idx|
           blob_indices.each do |bi|
-            rows[:data][idx][bi] = Sequel::SQL::Blob.new(Tapsoob::Utils.base64decode(rows[:data][idx][bi])) unless rows[:data][idx][bi].nil?
+            data[idx][bi] = Sequel::SQL::Blob.new(Tapsoob::Utils.base64decode(data[idx][bi])) unless data[idx][bi].nil?
           end
         end
       end
@@ -237,9 +250,9 @@ module Tapsoob
         %w(date datetime time).each do |type|
           if rows[:types].include?(type)
             type_indices = rows[:types].each_index.select { |idx| rows[:types][idx] == type }
-            rows[:data].each_index do |idx|
+            data.each_index do |idx|
               type_indices.each do |ti|
-                rows[:data][idx][ti] = Sequel.send("string_to_#{type}".to_sym, rows[:data][idx][ti])
+                data[idx][ti] = Sequel.send("string_to_#{type}".to_sym, data[idx][ti]) unless data[idx][ti].nil?
               end
             end
           end
@@ -247,11 +260,11 @@ module Tapsoob
       end
 
       # Remove id column
-      if @options[:"discard-identity"]
+      if @options[:"discard-identity"] && rows[:header].include?("id")
         columns = rows[:header] - ["id"]
         data    = data.map { |d| d[1..-1] }
       end
-      
+
       table.import(columns, data, :commit_every => 100)
       state[:offset] += rows[:data].size
     rescue Exception => ex

data/lib/tapsoob/operation.rb

@@ -198,7 +198,7 @@ module Tapsoob
         stream   = Tapsoob::DataStream.factory(db, {
           :chunksize  => default_chunksize,
           :table_name => table_name
-        })
+        }, { :debug => opts[:debug] }))
         pull_data_from_table(stream, progress)
       end
     end
@@ -393,10 +393,10 @@ module Tapsoob
 
       tables.each do |table_name, count|
         next unless File.exists?(File.join(dump_path, "data", "#{table_name}.json"))
-        db[table_name.to_sym].truncate if @opts[:purge]
+        db[table.to_sym].truncate if @opts[:purge]
         stream = Tapsoob::DataStream.factory(db, {
           :table_name => table_name,
-          :chunksize => default_chunksize }, { :"discard-identity" => @opts[:"discard-identity"] || false })
+          :chunksize => default_chunksize }, { :"discard-identity" => opts[:"discard-identity"] || false, :purge => opts[:purge] || false, :debug => opts[:debug] })
         progress = ProgressBar.new(table_name.to_s, count)
         push_data_from_file(stream, progress)
       end
@@ -429,7 +429,8 @@ module Tapsoob
               }
             end
 
-            size = stream.fetch_data_in_database({ :encoded_data => encoded_data, :checksum => data[:checksum] })
+            row_size = stream.fetch_data_in_database({ :encoded_data => encoded_data, :checksum => data[:checksum] })
+            log.debug "row size: #{row_size}"
             self.stream_state = stream.to_hash
 
             c.idle_secs = (d1 + d2)
@@ -481,7 +482,7 @@ module Tapsoob
       tbls.each do |table|
         if File.exists?(File.join(dump_path, "data", "#{table}.json"))
           data = JSON.parse(File.read(File.join(dump_path, "data", "#{table}.json")))
-          tables_with_counts[table] = data.size
+          tables_with_counts[table] = data["data"].size
         else
           tables_with_counts[table] = 0
         end

data/lib/tapsoob/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.3.27
+  version: 0.4.0
 platform: java
 authors:
 - Félix Bellanger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement