mysql_replicator 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8caf562beab557ef33cf471becf5af562c46d13b0613c1dff120b8f6b22f9a3
-  data.tar.gz: 511544da5cda5f94331f08fdead13f100eb233e8810320903ed0343a5be50554
+  metadata.gz: 89139696403c8871f454557357e7aa588ae352e0ba2b1108897614bd3109e103
+  data.tar.gz: d2a3b05f3c6181b4b40c1dcdfcf7be4accfd5d8f785cb6ae1ade5d489de669d4
 SHA512:
-  metadata.gz: 9ca4f3dcba764981ce012d11699eaf740f303e8ecfc649b498eadd59a72cf5c9aaccc470c7db436adb0ec7df39b79ff8312aca6f511f8580722e48066b92b8cf
-  data.tar.gz: ccee5ba75a950ff020314e488b2368460ed16d90aabdba21c0e3023f400c40e4ba8990e9fb7d8077aa0cd1dd42029b79a49c9b03e0a72a8320b7a20971ab7295
+  metadata.gz: e55787771552dfcacf4d697f0190ea07e86d1191fc0dee3b5ddbd04afba80fc81d2df1a321a7fb7ae318682f9c8a1f52613f8fa6dab5fbab968cc569b0def222
+  data.tar.gz: 657517edf37d8c83ede73abf1c5e4619eaccc05861d21e707a341f3bcab42da6d39b231a0cf946fef2f087baeb6dfdf6acdb8fe5e0eee1772b75c460929531f7

data/lib/mysql_replicator/binlog_client.rb

@@ -7,7 +7,7 @@ module MysqlReplicator
     # @rbs @connection: MysqlReplicator::Connection
     # @rbs @server_id: Integer
     # @rbs @checksum_type: String?
-    # @rbs @event_listener: ^(MysqlReplicator::Binlogs::EventParser::binlogEvent) -> untyped | nil
+    # @rbs @event_listener: ^(MysqlReplicator::Binlogs::EventParser::binlogEvent?, Exception?) -> untyped | nil
 
     # @rbs! attr_reader connection: MysqlReplicator::Connection
     attr_reader :connection
@@ -21,7 +21,7 @@ module MysqlReplicator
       @checksum_type = nil
     end
 
-    # @rbs &block: { (MysqlReplicator::Binlogs::EventParser::binlogEvent) -> untyped | nil }
+    # @rbs &block: { (MysqlReplicator::Binlogs::EventParser::binlogEvent?, Exception?) -> untyped | nil }
     # @rbs return: void
     def on(&block)
       @event_listener = block
@@ -35,19 +35,23 @@ module MysqlReplicator
       binlog_file = binlog_info[:file]
       binlog_position = binlog_info[:position]
 
-      configure_binlog_checksum if @checksum_type.nil?
+      configure_binlog_checksum
       register_as_slave
       start_binlog_dump(binlog_file, binlog_position)
 
       begin
         handle_binlog_events
       rescue Interrupt
-        stop_replication
+        # Ctrl+Cによる正常終了
       rescue => e
+        raise e if defined?(::IRB::Abort) && e.is_a?(::IRB::Abort) # steep:ignore UnknownConstant
+
         MysqlReplicator::Logger.error \
           "Unexpected error: #{e.message},\n" \
           "Backtrace: #{e.backtrace.first(5).join("\n")}"
 
+        @event_listener&.call(nil, e)
+      ensure
         stop_replication
       end
     end
@@ -56,6 +60,9 @@ module MysqlReplicator
     def stop_replication
       @connection.flush_socket_buffer
       unregister_as_slave
+    rescue => e
+      MysqlReplicator::Logger.error "Failed to unregister as slave: #{e.message}"
+    ensure
       @connection.close
     end
 
@@ -180,8 +187,8 @@ module MysqlReplicator
           binlog_event = event_parser.execute(payload[1..], @connection, @checksum_type == 'CRC32')
 
           case binlog_event[:event_type]
-          when :QUERY, :WRITE_ROWS, :UPDATE_ROWS, :DELETE_ROWS
-            @event_listener&.call(binlog_event)
+          when :QUERY, :TABLE_MAP, :WRITE_ROWS, :UPDATE_ROWS, :DELETE_ROWS
+            @event_listener&.call(binlog_event, nil)
           end
           MysqlReplicator::Logger.debug "Binlog event: #{binlog_event}"
         when 0xFF

data/lib/mysql_replicator/connection.rb

@@ -186,7 +186,7 @@ module MysqlReplicator
 
       begin
         # Read all unread data in non-blocking mode
-        while @socket.ready?
+        while @socket.wait_readable(0)
           data = @socket.read_nonblock(1024)
           flushed_data += data
           MysqlReplicator::Logger.debug \

data/lib/mysql_replicator/version.rb

@@ -2,5 +2,5 @@
 # rbs_inline: enabled
 
 module MysqlReplicator
-  VERSION = '0.2.0' #: String
+  VERSION = '0.3.0' #: String
 end

data/lib/mysql_replicator.rb

@@ -28,7 +28,7 @@ module MysqlReplicator
   # @rbs user: String
   # @rbs password: String
   # @rbs database: String
-  # @rbs &block: { (MysqlReplicator::Binlogs::EventParser::binlogEvent) -> untyped | nil }?
+  # @rbs &block: { (MysqlReplicator::Binlogs::EventParser::binlogEvent?, Exception?) -> untyped | nil }?
   # @rbs return: void
   def self.run(host: '127.0.0.1', port: 3306, user: 'root', password: 'root', database: '', &block)
     conn = MysqlReplicator::Connection.new(

data/sig/generated/mysql_replicator/binlog_client.rbs

@@ -9,7 +9,7 @@ module MysqlReplicator
 
     @checksum_type: String?
 
-    @event_listener: ^(MysqlReplicator::Binlogs::EventParser::binlogEvent) -> untyped | nil
+    @event_listener: ^(MysqlReplicator::Binlogs::EventParser::binlogEvent?, Exception?) -> untyped | nil
 
     # @rbs! attr_reader connection: MysqlReplicator::Connection
     attr_reader connection: untyped
@@ -19,9 +19,9 @@ module MysqlReplicator
     # @rbs return void
     def initialize: (MysqlReplicator::Connection connection, ?Integer server_id) -> void
 
-    # @rbs &block: { (MysqlReplicator::Binlogs::EventParser::binlogEvent) -> untyped | nil }
+    # @rbs &block: { (MysqlReplicator::Binlogs::EventParser::binlogEvent?, Exception?) -> untyped | nil }
     # @rbs return: void
-    def on: () ?{ (?) -> untyped } -> void
+    def on: () ?{ (MysqlReplicator::Binlogs::EventParser::binlogEvent?, Exception?) -> untyped } -> void
 
     # @rbs return: void
     def start_replication: () -> void

data/sig/generated/mysql_replicator/binlogs/rows_event_parser.rbs

@@ -5,14 +5,14 @@ module MysqlReplicator
     class RowsEventParser
       type rowData = { ordinal_position: Integer, data_type: String, column_name: String, value: String | Integer | bool | nil, primary_key: bool }
 
-      type execution = { table_id: Integer, flags: Integer, extra_data_length: Integer, column_count: Integer, rows: Array[rowData] }
+      type execution = { database: String?, table: String?, table_id: Integer, flags: Integer, extra_data_length: Integer, column_count: Integer, rows: Array[rowData] }
 
       # @rbs event_type: :WRITE_ROWS | :UPDATE_ROWS | :DELETE_ROWS
       # @rbs payload: String
       # @rbs checksum_enabled bool
       # @rbs table_map: Hash[Integer, MysqlReplicator::Binlogs::TableMapEventParser::execution]
       # @rbs return: execution
-      def self.parse: (:WRITE_ROWS | :UPDATE_ROWS | :DELETE_ROWS event_type, String payload, bool checksum_enabled, Hash[Integer, MysqlReplicator::Binlogs::TableMapEventParser::execution] table_map) -> execution
+      def self.parse: (:WRITE_ROWS | :UPDATE_ROWS | :DELETE_ROWS event_type, String payload, bool checksum_enabled, Hash[Integer, MysqlReplicator::Binlogs::TableMapEventParser::execution] table_map) -> { database: String?, table: String?, table_id: Integer, flags: Integer, extra_data_length: Integer, column_count: Integer, rows: Array[untyped] }
 
       # @rbs io: StringIO
       # @rbs column_count: Integer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql_replicator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - yo_waka
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: The MySQL Binlog event handler using MySQL Replication Protocol
 test_files: []