mysql_binlog 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a369e0a06cfbe3cd3d5f0fff501e0956e7138abc
-  data.tar.gz: 45dd1afcf6a14152aa63c03cc4d79175babab607
+  metadata.gz: 7b81a85e5ebc8ed76b5152df02001e8a2dd6df87
+  data.tar.gz: d74e28a964473c50e1120c3f52fd61333aad8c99
 SHA512:
-  metadata.gz: 3dd3c45cfa72070a7ac471d7c9ccf33c408f8103b697cf2cbf852be01f4fbc48f7f04095193603327b7ce2b1bfd50916eb6658c8b391659be5bc7ad650738545
-  data.tar.gz: bb698d2f9fd0865f137158b132381ad95eb8434f0d79efbe048399a52b528f38c4e94e508f198c1a99547f776b16b1468b729a1fd50e972c3dbae357cfaa1030
+  metadata.gz: ba05cac9a92cf9e2ad05c37625a25e4d6c506b7ba473b321b8d7536c81e4c299e1060192304fdf8c639abc554b6ed0927fa5ac850d33c8a0a9f4d6ec371e9151
+  data.tar.gz: 1fe544bbc944267de7479316ab0a3a497737e57fe51754cf9e6c1e52e670940097c48780f635d473948b928645705630a19920000f2015fe676bb10758ee7b80

data/lib/mysql_binlog/binlog_event_parser.rb

@@ -31,17 +31,17 @@ module MysqlBinlog
     :delete_rows_event_v1       => 25,  #
     :incident_event             => 26,  #
     :heartbeat_log_event        => 27,  #
-    :ignorable_log_event        => 28,
-    :rows_query_log_event       => 29,
-    :write_rows_event_v2        => 30,
-    :update_rows_event_v2       => 31,
-    :delete_rows_event_v2       => 32,
-    :gtid_log_event             => 33,
-    :anonymous_gtid_log_event   => 34,
-    :previous_gtids_log_event   => 35,
-    :transaction_context_event  => 36,
-    :view_change_event          => 37,
-    :xa_prepare_log_event       => 38,
+    :ignorable_log_event        => 28,  #
+    :rows_query_log_event       => 29,  #
+    :write_rows_event_v2        => 30,  #
+    :update_rows_event_v2       => 31,  #
+    :delete_rows_event_v2       => 32,  #
+    :gtid_log_event             => 33,  #
+    :anonymous_gtid_log_event   => 34,  #
+    :previous_gtids_log_event   => 35,  #
+    :transaction_context_event  => 36,  #
+    :view_change_event          => 37,  #
+    :xa_prepare_log_event       => 38,  #
 
     :table_metadata_event       => 50,  # Only in Twitter MySQL
   }
@@ -59,6 +59,9 @@ module MysqlBinlog
     :write_rows_event_v1,
     :update_rows_event_v1,
     :delete_rows_event_v1,
+    :write_rows_event_v2,
+    :update_rows_event_v2,
+    :delete_rows_event_v2,
   ]
 
   # Values for the +flags+ field that may appear in binary logs. There are
@@ -174,6 +177,10 @@ module MysqlBinlog
     :complete_rows          => 1 << 3,  # COMPLETE_ROWS_F
   }
 
+  GENERIC_ROWS_EVENT_VH_FIELD_TYPES = [
+    :extra_rows_info,                   # ROWS_V_EXTRAINFO_TAG
+  ]
+
   # Parse binary log events from a provided binary log. Must be driven
   # externally, but handles all the details of parsing an event header
   # and the content of the various event types.
@@ -488,7 +495,7 @@ module MysqlBinlog
     # Parse a single row image, which is comprised of a series of columns. Not
     # all columns are present in the row image, the columns_used array of true
     # and false values identifies which columns are present.
-    def _generic_rows_event_row_image_v1(header, fields, columns_used)
+    def _generic_rows_event_row_image(header, fields, columns_used)
       row_image = []
       start_position = reader.position
       columns_null = parser.read_bit_array(fields[:table][:columns].size)
@@ -512,7 +519,7 @@ module MysqlBinlog
         size: end_position-start_position
       }
     end
-    private :_generic_rows_event_row_image_v1
+    private :_generic_rows_event_row_image
 
     def diff_row_images(before, after)
       diff = {}
@@ -530,19 +537,19 @@ module MysqlBinlog
     # Parse the row images present in a row-based replication row event. This
     # is rather incomplete right now due missing support for many MySQL types,
     # but can parse some basic events.
-    def _generic_rows_event_row_images_v1(header, fields, columns_used)
+    def _generic_rows_event_row_images(header, fields, columns_used)
       row_images = []
       end_position = reader.position + reader.remaining(header)
       while reader.position < end_position
         row_image = {}
         case header[:event_type]
-        when :write_rows_event_v1
-          row_image[:after]  = _generic_rows_event_row_image_v1(header, fields, columns_used[:after])
-        when :delete_rows_event_v1
-          row_image[:before] = _generic_rows_event_row_image_v1(header, fields, columns_used[:before])
-        when :update_rows_event_v1
-          row_image[:before] = _generic_rows_event_row_image_v1(header, fields, columns_used[:before])
-          row_image[:after]  = _generic_rows_event_row_image_v1(header, fields, columns_used[:after])
+        when :write_rows_event_v1, :write_rows_event_v2
+          row_image[:after]  = _generic_rows_event_row_image(header, fields, columns_used[:after])
+        when :delete_rows_event_v1, :delete_rows_event_v1
+          row_image[:before] = _generic_rows_event_row_image(header, fields, columns_used[:before])
+        when :update_rows_event_v1, :update_rows_event_v2
+          row_image[:before] = _generic_rows_event_row_image(header, fields, columns_used[:before])
+          row_image[:after]  = _generic_rows_event_row_image(header, fields, columns_used[:after])
           row_image[:diff] = diff_row_images(row_image[:before][:image], row_image[:after][:image])
         end
         row_images << row_image
@@ -557,7 +564,17 @@ module MysqlBinlog
 
       row_images
     end
-    private :_generic_rows_event_row_images_v1
+    private :_generic_rows_event_row_images
+
+    # Parse the variable header from a v2 rows event. This is only used for
+    # ROWS_V_EXTRAINFO_TAG which is used by NDB. Ensure it can be skipped
+    # properly but don't bother parsing it.
+    def _generic_rows_event_vh
+      vh_payload_len = parser.read_uint16 - 2
+      return unless vh_payload_len > 0
+
+      reader.read(vh_payload_len)
+    end
 
     # Parse fields for any of the row-based replication row events:
     # * +Write_rows+ which is used for +INSERT+.
@@ -567,30 +584,48 @@ module MysqlBinlog
     # Implemented in sql/log_event.cc line ~8039
     # in Rows_log_event::write_data_header
     # and Rows_log_event::write_data_body
-    def generic_rows_event_v1(header)
+    def _generic_rows_event(header, contains_vh: false)
       fields = {}
       table_id = parser.read_uint48
       fields[:table] = @table_map[table_id]
       fields[:flags] = parser.read_uint_bitmap_by_size_and_name(2, GENERIC_ROWS_EVENT_FLAGS)
+
+      # Rows_log_event v2 events contain a variable-sized header. Only NDB
+      # uses it right now, so let's just make sure it's skipped properly.
+      _generic_rows_event_vh if contains_vh
+
       columns = parser.read_varint
       columns_used = {}
       case header[:event_type]
-      when :write_rows_event_v1
+      when :write_rows_event_v1, :write_rows_event_v2
         columns_used[:after]  = parser.read_bit_array(columns)
-      when :delete_rows_event_v1
+      when :delete_rows_event_v1, :delete_rows_event_v2
         columns_used[:before] = parser.read_bit_array(columns)
-      when :update_rows_event_v1
+      when :update_rows_event_v1, :update_rows_event_v2
         columns_used[:before] = parser.read_bit_array(columns)
         columns_used[:after]  = parser.read_bit_array(columns)
       end
-      fields[:row_image] = _generic_rows_event_row_images_v1(header, fields, columns_used)
+      fields[:row_image] = _generic_rows_event_row_images(header, fields, columns_used)
       fields
     end
+    private :_generic_rows_event
+
+    def generic_rows_event_v1(header)
+      _generic_rows_event(header, contains_vh: false)
+    end
 
     alias :write_rows_event_v1  :generic_rows_event_v1
     alias :update_rows_event_v1 :generic_rows_event_v1
     alias :delete_rows_event_v1 :generic_rows_event_v1
 
+    def generic_rows_event_v2(header)
+      _generic_rows_event(header, contains_vh: true)
+    end
+
+    alias :write_rows_event_v2  :generic_rows_event_v2
+    alias :update_rows_event_v2 :generic_rows_event_v2
+    alias :delete_rows_event_v2 :generic_rows_event_v2
+
     def rows_query_log_event(header)
       reader.read(1) # skip useless byte length which is unused
       { query: reader.read(header[:payload_length]-1) }

data/lib/mysql_binlog/version.rb

@@ -1,3 +1,3 @@
 module MysqlBinlog
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_binlog
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Jeremy Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-10 00:00:00.000000000 Z
 dependencies: []
 description: Library for parsing MySQL binary logs in Ruby
 email: jeremy@jcole.us