table_sync 4.1.0 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6b452885641883758a131ec14f3a9aa2f8508bb1c3a540b8e78c727a8d86a88
-  data.tar.gz: efd055d98480febde524af5af5db5cfefde1b534a5fa40d7b8cb696ac11432ba
+  metadata.gz: 1d5af530003a4144653d1866fda0a581a5ecf021cbcd8e7c2a29028c0e838eb2
+  data.tar.gz: 836de51df89dc99294bd8be65eeaf4e00cba6bdb22071170bef42372c4984a70
 SHA512:
-  metadata.gz: bd98bc390f5d04625d98c9c5fac179a9b588830210502727288b74c46f4badf4a177afbcbe02b67bd33cdd7ba8ed7d3fea593e3893e5519f5d2c40c01f3a454e
-  data.tar.gz: 230f6a412f0d2d55750a4d1edb75b5c9605730de1c6352d5e5d1e8b4375ed16081fe296f70ace3dff65b54d5b85bc1a18a153119d8a6f7c1994289d5170ddc80
+  metadata.gz: 2558335ef49a853d8d0d12878cdb42cfb91d4bf7dc7838f22c4853dbf09a22aa60569c420eaee0f5a667f21ea55c02b4a62d3c9d7a4299128d2a6d4b47d7b76a
+  data.tar.gz: d24f3e8e2cab9f946a37296261d531a44b3ea6e660aa1a9424e0685c9ba2ffff73130e6b9661f3ff76a0636eab9c877e4f7b18ce2c1b7b65326bfb5d2434df48

data/CHANGELOG.md

@@ -1,6 +1,26 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [4.2.2] - 2020-11-20
+### Fixed
+- potential data corruption with batches
+
+## [4.2.1] - 2020-11-20
+### Fixed
+- bug with sorting data in handler, it was bad idea to use `.hash` replaced to `.to_s` 
+
+## [4.2.0] - 2020-11-19
+
+- No changes. Just stabilization release.
+
+## [4.1.2] - 2020-11-19
+### Fixed
+- bug with sorting data in handler
+
+## [4.1.1] - 2020-11-06
+### Fixed
+- dead locks in receiving module (see: `spec/receiving/handler_spec.rb#avoid dead locks`)
+
 ## [4.1.0] - 2020-11-02
 ### Changed
 - move `TableSync::Instrument.notify` from models to the handler

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    table_sync (4.1.0)
+    table_sync (4.2.2)
       memery
       rabbit_messaging (~> 0.3)
       rails
@@ -84,7 +84,7 @@ GEM
     crass (1.0.6)
     diff-lcs (1.4.4)
     docile (1.3.2)
-    erubi (1.9.0)
+    erubi (1.10.0)
     exception_notification (4.4.3)
       actionmailer (>= 4.0, < 7)
       activesupport (>= 4.0, < 7)
@@ -119,11 +119,11 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rabbit_messaging (0.7.1)
+    rabbit_messaging (0.9.0)
       bunny (~> 2.0)
       exception_notification
       lamian
-      rails
+      rails (>= 5.2)
       sneakers (~> 2.0)
       tainbox
     rack (2.2.3)

data/lib/table_sync/receiving/handler.rb

@@ -23,6 +23,8 @@ class TableSync::Receiving::Handler < Rabbit::EventHandler
 
       validate_data(data, target_keys: target_keys)
 
+      data.sort_by! { |row| row.values_at(*target_keys).to_s }
+
       params = { data: data, target_keys: target_keys, version_key: version_key }
 
       if event == :update
@@ -53,16 +55,20 @@ class TableSync::Receiving::Handler < Rabbit::EventHandler
   end
 
   def configs
-    @configs ||= self.class.configs[model]&.map do |config|
-      ::TableSync::Receiving::ConfigDecorator.new(
-        config: config,
-        # next parameters will be send to each proc-options from config
-        event: event,
-        model: model,
-        version: version,
-        project_id: project_id,
-        raw_data: data,
-      )
+    @configs ||= begin
+      configs = self.class.configs[model]
+      configs = configs.sort_by { |config| "#{config.model.schema}.#{config.model.table}" }
+      configs.map do |config|
+        ::TableSync::Receiving::ConfigDecorator.new(
+          config: config,
+          # next parameters will be send to each proc-options from config
+          event: event,
+          model: model,
+          version: version,
+          project_id: project_id,
+          raw_data: data,
+        )
+      end
     end
   end
 
@@ -99,9 +105,18 @@ class TableSync::Receiving::Handler < Rabbit::EventHandler
     end
 
     if data.uniq { |row| row.slice(*target_keys) }.size != data.size
-      raise TableSync::DataError.new(
-        data, target_keys, "Duplicate rows found!"
-      )
+      raise TableSync::DataError.new(data, target_keys, "Duplicate rows found!")
+    end
+
+    keys_sample = data[0].keys
+    keys_diff = data.each_with_object(Set.new) do |row, set|
+      (row.keys - keys_sample | keys_sample - row.keys).each(&set.method(:add))
+    end
+
+    unless keys_diff.empty?
+      raise TableSync::DataError.new(data, target_keys, <<~MESSAGE)
+        Bad batch structure, check keys: #{keys_diff.to_a}
+      MESSAGE
     end
   end
 

data/lib/table_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TableSync
-  VERSION = "4.1.0"
+  VERSION = "4.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_sync
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.2
 platform: ruby
 authors:
 - Umbrellio
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memery