waldit 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb7ae260f6d1af42f4e6169084c7ba79de48cea93f44ff47be032f5764df23a6
-  data.tar.gz: 7cf9d0c022ffbb457bcac4380ed635cd65d2df1db24faae5fbd169b50b5aa07c
+  metadata.gz: 8b76edf8a202620aff6e09391009e6c00ae0f26a404d1b81741c5cd3e339db66
+  data.tar.gz: f0c7582d6af476ecf536aa4e96846eea620b8c3bd5c215c240d9e68056ade643
 SHA512:
-  metadata.gz: b54045c2265401d420a276efddb20525b7b72e39d27c25e10da6a7a2c357805ea1956aed900d3c265f5cc88096dc402cd53ea52d0989eff8e3dd965d47c2ec75
-  data.tar.gz: 8d86ba10a3c94e7ca87bb90a39957663b305f19b6b5a8bfb7062fdae89879b57c82d230989bfd49b5480738f63ca81bf9db7b1093406b730578498bfc001a862
+  metadata.gz: 5aee8ef8ff8c9f0b6fc636b866a9fe72a08c1ba98e507df1b7d3771339130808c04c9fb32345a07a12416967d386be92bdfe3bfd1f3215dc723f337baf06278b
+  data.tar.gz: e5f139662394131f2bfbe1af5ac3df85fa7b6202756ec67c02f0e679d11c78e2a62ecdb3a5bb188fa20a25ddee23699824266831f86b09e3284c0ad2584e9d6b

data/Rakefile

@@ -3,10 +3,3 @@
 require "bundler/gem_tasks"
 
 task(:test) { sh "bundle exec rspec" }
-
-task default: %i[build]
-
-task("sig/waldit.rbi") { sh "bundle exec parlour" }
-task("rbi/waldit.rbs" => "sig/waldit.rbi") { sh "rbs prototype rbi rbi/waldit.rbi > sig/waldit.rbs" }
-
-Rake::Task["build"].enhance(["sig/waldit.rbi", "rbi/waldit.rbs"])

data/lib/waldit/context.rb

@@ -1,17 +1,7 @@
 # frozen_string_literal: true
-# typed: true
 
 module Waldit
   module Context
-    extend T::Sig
-
-    Context = T.type_alias { T::Hash[T.any(String, Symbol), T.untyped] }
-
-    sig do
-      type_parameters(:U)
-        .params(context: Context, block: T.proc.returns(T.type_parameter(:U)))
-        .returns(T.type_parameter(:U))
-    end
     def with_context(context, &block)
       current_context = self.context || {}
       Thread.current[:waldit_context] ||= []
@@ -21,12 +11,10 @@ module Waldit
       Thread.current[:waldit_context].pop
     end
 
-    sig { returns(T.nilable(Context)) }
     def context
       Thread.current[:waldit_context]&.last
     end
 
-    sig { params(added_context: Context).void }
     def add_context(added_context)
       if (context = self.context)
         context.merge!(added_context.as_json)
@@ -35,7 +23,6 @@ module Waldit
       end
     end
 
-    sig { params(context: Context).void }
     def new_context(context = {})
       Thread.current[:waldit_context] ||= []
       Thread.current[:waldit_context].push(context.as_json)

data/lib/waldit/postgresql_adapter.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: ignore
 
 require "active_record/connection_adapters/postgresql_adapter"
 

data/lib/waldit/railtie.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: false
 
 require "rails/railtie"
 

data/lib/waldit/record.rb

@@ -1,19 +1,7 @@
 # frozen_string_literal: true
-# typed: true
 
 module Waldit
   module Record
-    extend T::Sig
-    extend T::Helpers
-    abstract!
-
-    sig { abstract.returns(T::Hash[T.any(String, Symbol), T.untyped]) }
-    def new; end
-
-    sig { abstract.returns(T::Hash[T.any(String, Symbol), T.untyped]) }
-    def old; end
-
-    sig { returns(T::Hash[T.any(String, Symbol), [T.untyped, T.untyped]]) }
     def diff
       (old.keys | new.keys).reduce({}.with_indifferent_access) do |diff, key|
         old[key] != new[key] ? diff.merge(key => [old[key], new[key]]) : diff

data/lib/waldit/sidekiq.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: false
 
 module Waldit
   module Sidekiq

data/lib/waldit/version.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
-# typed: true
 
 module Waldit
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/waldit/watcher.rb

@@ -1,124 +1,133 @@
 # frozen_string_literal: true
-# typed: true
 
 require "wal"
 
 module Waldit
   class Watcher < Wal::StreamingWatcher
-    extend T::Sig
+    include Wal
 
-    sig { params(event: T.any(InsertEvent, UpdateEvent, DeleteEvent)).void }
     def audit_event(event)
       return unless event.primary_key
 
-      audit = {
-        transaction_id: event.transaction_id,
-        lsn: event.lsn,
-        context: event.context,
-        table_name: event.table,
-        primary_key: event.primary_key,
-      }
-
-      unique_by = %i[table_name primary_key transaction_id]
+      audit = [event.transaction_id, event.lsn, event.table, event.primary_key, event.context.to_json]
 
       case event
       when InsertEvent
-        record.upsert(
-          audit.merge(action: "insert", new: event.new),
-          unique_by:,
-          on_duplicate: :update,
-        )
+        @connection.exec_prepared("waldit_insert", audit + [event.new.to_json])
 
       when UpdateEvent
         return if event.diff.without(ignored_columns(event.table)).empty?
-        record.upsert(
-          audit.merge(action: "update", old: event.old, new: event.new),
-          unique_by:,
-          on_duplicate: :update,
-          update_only: %w[new],
-        )
+        @connection.exec_prepared("waldit_update", audit + [event.old.to_json, event.new.to_json])
 
       when DeleteEvent
-        case record.where(audit.slice(*unique_by)).pluck(:action, :old).first
-        in ["insert", _]
-          # We are deleting a record that was inserted on this transaction, which means we don't need to audit anything,
-          # as the record was never commited
-          record.where(audit.slice(*unique_by)).delete_all
-
-        in ["update", old]
-          # We are deleting a record we updated on this transaction. Here we are making sure we keep the correct previous
-          # state, and not the state at the moment of the deletion
-          record.upsert(
-            audit.merge(action: "delete", old:, new: {}),
-            unique_by:,
-            on_duplicate: :update,
-          )
-
-        in ["delete", _]
-          # This should never happend, we wouldn't be able to delete a record that was already deleted on this transaction
-
+        case @connection.exec_prepared("waldit_delete_cleanup", [event.transaction_id, event.table, event.primary_key]).values
+        in [["update", previous_old]]
+          @connection.exec_prepared("waldit_delete", audit + [previous_old])
+        in []
+          @connection.exec_prepared("waldit_delete", audit + [event.old.to_json])
         else
-          # Finally the most common case: just deleting a record not created or updated on this transaction
-          record.upsert(
-            audit.merge(action: "delete", old: event.old),
-            unique_by:,
-            on_duplicate: :update,
-          )
+          # Don't need to audit anything on this case
         end
       end
     end
 
-    sig { override.params(events: T::Enumerator[Event]).void }
     def on_transaction_events(events)
-      counter = 0
-      catch :finish do
-        loop do
-          record.transaction do
-            events.each do |event|
-              case event
-              when CommitTransactionEvent
-                record
-                  .where(transaction_id: event.transaction_id)
-                  .update_all(commited_at: event.timestamp) if counter > 0
-                # Using throw to break the outside loop and finish the thread gracefully
-                throw :finish
-
-              when InsertEvent, UpdateEvent, DeleteEvent
-                audit_event(event)
-
-                counter += 1
-                # We break here to force a commit, so we don't keep a single big transaction pending
-                break if counter % max_transaction_size == 0
-              end
+      record.transaction do
+        @connection = record.connection.raw_connection
+        insert_prepared = false
+        update_prepared = false
+        delete_prepared = false
+
+        events.each do |event|
+          case event
+          when CommitTransactionEvent
+            record.where(transaction_id: event.transaction_id).update_all(commited_at: event.timestamp)
+
+          when InsertEvent
+            unless insert_prepared
+              prepare_insert
+              insert_prepared = true
+            end
+            audit_event(event)
+
+          when UpdateEvent
+            unless update_prepared
+              prepare_update
+              update_prepared = true
             end
+            audit_event(event)
+
+          when DeleteEvent
+            unless delete_prepared
+              prepare_delete
+              prepare_delete_cleanup
+              delete_prepared = true
+            end
+            audit_event(event)
           end
         end
       end
     end
 
-    sig { params(table: String).returns(T::Boolean) }
     def should_watch_table?(table)
       Waldit.watched_tables.call(table)
     end
 
-    sig { params(prefix: String).returns(T::Boolean) }
     def valid_context_prefix?(prefix)
       prefix == Waldit.context_prefix
     end
 
-    sig { params(table: String).returns(T::Array[String]) }
     def ignored_columns(table)
       Waldit.ignored_columns.call(table)
     end
 
-    sig { returns(Integer) }
     def max_transaction_size
       Waldit.max_transaction_size
     end
 
-    sig { returns(T.class_of(ActiveRecord::Base)) }
     def record
       Waldit.model
     end
+
+    private
+
+    def prepare_insert
+      @connection.prepare("waldit_insert", <<~SQL)
+        INSERT INTO #{record.table_name} (transaction_id, lsn, table_name, primary_key, action, context, new)
+        VALUES ($1, $2, $3, $4, 'insert'::waldit_action, $5, $6)
+        ON CONFLICT (table_name, primary_key, transaction_id)
+        DO UPDATE SET new = #{record.table_name}.new
+      SQL
+    end
+
+    def prepare_update
+      @connection.prepare("waldit_update", <<~SQL)
+        INSERT INTO #{record.table_name} (transaction_id, lsn, table_name, primary_key, action, context, old, new)
+        VALUES ($1, $2, $3, $4, 'update'::waldit_action, $5, $6, $7)
+        ON CONFLICT (table_name, primary_key, transaction_id)
+        DO UPDATE SET new = excluded.new
+      SQL
+    end
+
+    def prepare_delete
+      @connection.prepare("waldit_delete", <<~SQL)
+        INSERT INTO #{record.table_name} (transaction_id, lsn, table_name, primary_key, action, context, old, new)
+        VALUES ($1, $2, $3, $4, 'delete'::waldit_action, $5, $6, '{}'::jsonb)
+        ON CONFLICT (table_name, primary_key, transaction_id)
+        DO UPDATE SET old = #{record.table_name}.old
+      SQL
+    end
+
+    def prepare_delete_cleanup
+      @connection.prepare("waldit_delete_cleanup", <<~SQL)
+        DELETE FROM #{record.table_name}
+        WHERE
+          transaction_id = $1
+          AND table_name = $2
+          AND primary_key = $3
+          AND action IN ('insert'::waldit_action, 'update'::waldit_action)
+        RETURNING action, old
+      SQL
+    end
   end
 end

data/lib/waldit.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: true
 
 require_relative "waldit/version"
 require_relative "waldit/context"
@@ -8,19 +7,11 @@ require_relative "waldit/record"
 require_relative "waldit/watcher"
 
 module Waldit
-  extend T::Sig
   extend Waldit::Context
 
   class << self
-    extend T::Sig
-
-    sig { returns(String) }
-    attr_accessor :context_prefix
-
-    sig { returns(T.proc.params(table: String).returns(T::Boolean)) }
     attr_reader :watched_tables
 
-    sig { params(tables: T.any(T::Array[String], T.proc.params(table: String).returns(T::Boolean))).void }
     def watched_tables=(tables)
       case tables
       when Array
@@ -30,17 +21,12 @@ module Waldit
       end
     end
 
-    sig { returns(T.proc.params(table: String).returns(T::Array[String])) }
     attr_accessor :ignored_columns
-
-    sig { returns(Integer) }
     attr_accessor :max_transaction_size
-
-    sig { returns(T.class_of(ActiveRecord::Base)) }
     attr_accessor :model
+    attr_accessor :context_prefix
   end
 
-  sig { params(block: T.proc.params(config: T.class_of(Waldit)).void).void }
   def self.configure(&block)
     yield self
   end

data/rbi/waldit.rbi

@@ -2,7 +2,7 @@
 module Waldit
   extend T::Sig
   extend Waldit::Context
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 
   class << self
     sig { returns(String) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: waldit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Rodrigo Navarro
 bindir: exe
 cert_chain: []
-date: 2025-07-02 00:00:00.000000000 Z
+date: 2025-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wal
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -37,62 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7'
-- !ruby/object:Gem::Dependency
-  name: rbs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sorbet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: tapioca
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: parlour
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement