pg-replication-protocol 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eb14ee3cd0484e8160ed1bc27a841178bb5bb19a35304d46992c8d7accad5be
-  data.tar.gz: 51e43b8bcba5ee2db08b08962418ae0ff6ab6657076ca586984c279fe6603f6e
+  metadata.gz: 72bf40ef6c6c482636553033a8747eec8239f4b10602486376806fd6bff59a91
+  data.tar.gz: 4df39c13ee3b16f7e77114c7ef061e75b33b1f112e6341ce4aeb28898096d703
 SHA512:
-  metadata.gz: 0e86a9fcaa6a3497d6b211004551219fd9080adbca09977de836c53766780088fcb6c42966e461b8517026ef310ab67134c52d20fef396adf1807c06bf004ffe
-  data.tar.gz: 7e21681ae16444dc1a43450074a574ea81edfd554ce6362c13befad60f651c637c887416fd58befdf1bb8e5f604efd946a6e253486c584b562bb790a1e644864
+  metadata.gz: 6b3a4cd7627a4d8229f88ba7d086a95a6fac1ae76fe7d856970ce1dd745272696046f18e55bb551345fa8b431691ac351d3cffcdc809f07ecba5fa78d6f4b67a
+  data.tar.gz: da57dba3124e0c3e8c5832d570f471b2a15ee68c2afc0fd71e0f5c5410ec61585f99dcfb1499059106cf1cb06073552335897035388b45aa884dfc0d757155e0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg-replication-protocol (0.0.3)
+    pg-replication-protocol (0.0.5)
       pg (~> 1.0)
 
 GEM

data/lib/pg/replication/buffer.rb

@@ -19,19 +19,19 @@ module PG
       end
 
       def read_int8
-        read(1).unpack("C").first
+        readbyte
       end
 
       def read_int16
-        read(2).unpack("n").first
+        read_bytes(2).unpack("n").first
       end
 
       def read_int32
-        read(4).unpack("N").first
+        read_bytes(4).unpack("N").first
       end
 
       def read_int64
-        read(8).unpack("Q>").first
+        read_bytes(8).unpack("Q>").first
       end
 
       def read_timestamp
@@ -50,6 +50,14 @@ module PG
           end
         end
       end
+
+      private
+
+      def read_bytes(n)
+        bytes = read(n)
+        raise EOFError if bytes.nil? || bytes.size < n
+        bytes
+      end
     end
   end
 end

data/lib/pg/replication/pg_output.rb

@@ -13,7 +13,19 @@ module PG
       Update = Data.define(:oid, :key, :old, :new)
       Delete = Data.define(:oid, :key, :old)
       Truncate = Data.define(:oid)
-      Tuple = Data.define(:type, :data)
+      Tuple = Data.define(:type, :data) do
+        def text?
+          type == "t"
+        end
+
+        def binary?
+          type == "b"
+        end
+
+        def toast?
+          type == "u"
+        end
+      end
       Column = Data.define(:flags, :name, :oid, :modifier) do
         def key?
           flags == 1
@@ -150,8 +162,10 @@ module PG
       end
 
       def self.read_tuple(buffer)
-        case buffer.read_char
-        in type if type == "n"
+        case (type = buffer.read_char)
+        in "n"
+          Tuple.new(type:, data: nil)
+        in "u"
           Tuple.new(type:, data: nil)
         in type
           size = buffer.read_int32

data/lib/pg/replication/version.rb

@@ -2,6 +2,6 @@
 
 module PG
   module Replication
-    VERSION = "0.0.4"
+    VERSION = "0.0.6"
   end
 end

data/lib/pg/replication.rb

@@ -10,6 +10,7 @@ module PG
   module Replication
     def start_replication_slot(slot, logical: true, auto_keep_alive: true, location: "0/0", **params)
       keep_alive_secs = wal_receiver_status_interval
+      @last_confirmed_lsn = confirmed_slot_lsn(slot) || 0
 
       start_query = "START_REPLICATION SLOT #{slot} #{logical ? "LOGICAL" : "PHYSICAL"} #{location}"
       unless params.empty?
@@ -21,7 +22,6 @@ module PG
       end
       query(start_query)
 
-      @last_confirmed_lsn = 0
       last_keep_alive = Time.now
 
       Enumerator
@@ -47,16 +47,19 @@ module PG
             in data
               case (msg = Protocol.read_message(Buffer.new(StringIO.new(data))))
               in Protocol::XLogData(lsn:, data:) if auto_keep_alive
-                standby_status_update(write_lsn: @last_confirmed_lsn)
-                last_keep_alive = Time.now
                 y << msg
-                @last_confirmed_lsn = lsn
+                standby_status_update(write_lsn: lsn) if lsn > 0
+                last_keep_alive = Time.now
 
-              in Protocol::PrimaryKeepalive(server_time:, asap: true) if auto_keep_alive
-                standby_status_update(write_lsn: @last_confirmed_lsn)
+              in Protocol::PrimaryKeepalive(current_lsn:, server_time:, asap: true) if auto_keep_alive
+                standby_status_update(write_lsn: current_lsn)
                 last_keep_alive = Time.now
                 y << msg
 
+              in Protocol::PrimaryKeepalive(current_lsn:)
+                y << msg
+                @last_confirmed_lsn = [@last_confirmed_lsn, current_lsn].compact.max
+
               else
                 y << msg
               end
@@ -111,6 +114,16 @@ module PG
         SELECT setting FROM pg_catalog.pg_settings WHERE name = 'wal_receiver_status_interval'
       SQL
     end
+
+    def confirmed_slot_lsn(slot)
+      lsn = query(<<~SQL).getvalue(0, 0)
+        SELECT confirmed_flush_lsn FROM pg_replication_slots WHERE slot_name = '#{slot}'
+      SQL
+      high, low = lsn.split("/")
+      (high.to_i(16) << 32) + low.to_i(16)
+    rescue StandardError
+      nil
+    end
   end
 
   Connection.send(:include, Replication)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pg-replication-protocol
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Rodrigo Navarro
 bindir: bin
 cert_chain: []
-date: 2025-06-04 00:00:00.000000000 Z
+date: 2025-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg