mysql_binlog 0.1.3 → 0.1.4

data/bin/mysql_binlog_dump

@@ -5,8 +5,10 @@ require 'mysql_binlog'
 
 include MysqlBinlog
 
-b = Binlog.new(BinlogFileReader, ARGV.first)
+reader = BinlogFileReader.new(ARGV.first)
+#reader = DebuggingReader.new(reader, :data => true, :calls => true)
+binlog = Binlog.new(reader)
 
-b.each_event do |event|
+binlog.each_event do |event|
   pp event
 end

data/lib/mysql_binlog/binlog_event_field_parser.rb

@@ -107,7 +107,8 @@ module MysqlBinlog
       end
     end
 
-    def _table_map_event_metadata(columns_type)
+    # Parse column metadata within a table map event.
+    def _table_map_event_column_metadata(columns_type)
       length = parser.read_varint
       columns_type.map do |c|
         parser.read_mysql_type_metadata(c)
@@ -123,7 +124,7 @@ module MysqlBinlog
       map_entry[:table] = parser.read_lpstringz
       columns = parser.read_varint
       columns_type = parser.read_uint8_array(columns).map { |c| MYSQL_TYPES[c] }
-      columns_metadata = _table_map_event_metadata(columns_type)
+      columns_metadata = _table_map_event_column_metadata(columns_type)
       columns_nullable = parser.read_bit_array(columns)
 
       map_entry[:columns] = columns.times.map do |c|
@@ -137,29 +138,44 @@ module MysqlBinlog
       fields[:map_entry] = map_entry
     end
 
+    # 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(header, fields, columns_used)
+      row_image = []
+      columns_null = parser.read_bit_array(fields[:table][:columns].size)
+      fields[:table][:columns].each_with_index do |column, column_index|
+        if !columns_used[column_index]
+          row_image << nil
+        elsif columns_null[column_index]
+          row_image << { column => nil }
+        else
+          row_image << {
+            column => parser.read_mysql_type(column[:type], column[:metadata])
+          }
+        end
+      end
+      row_image
+    end
+
     # 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(header, fields, columns_used)
-      row_image_index = 0
       row_images = []
       end_position = reader.position + reader.remaining(header)
       while reader.position < end_position
-        row_image = []
-        columns_null = parser.read_bit_array(fields[:table][:columns].size)
-        fields[:table][:columns].each_with_index do |column, column_index|
-          if !columns_used[row_image_index][column_index]
-            row_image << nil
-          elsif columns_null[column_index]
-            row_image << { column => nil }
-          else
-            row_image << {
-              column => parser.read_mysql_type(column[:type], column[:metadata])
-            }
-          end
+        row_image = {}
+        case EVENT_TYPES[header[:event_type]]
+        when :write_rows_event
+          row_image[:after]  = _generic_rows_event_row_image(header, fields, columns_used[:after])
+        when :delete_rows_event
+          row_image[:before] = _generic_rows_event_row_image(header, fields, columns_used[:before])
+        when :update_rows_event
+          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])
         end
         row_images << row_image
-        row_image_index += 1
       end
       row_images
     end
@@ -173,10 +189,15 @@ module MysqlBinlog
       fields[:table] = @table_map[table_id]
       fields[:flags] = parser.read_uint16
       columns = parser.read_varint
-      columns_used = []
-      columns_used[0] = parser.read_bit_array(columns)
-      if EVENT_TYPES[header[:event_type]] == :update_rows_event
-        columns_used[1] = parser.read_bit_array(columns)
+      columns_used = {}
+      case EVENT_TYPES[header[:event_type]]
+      when :write_rows_event
+        columns_used[:after]  = parser.read_bit_array(columns)
+      when :delete_rows_event
+        columns_used[:before] = parser.read_bit_array(columns)
+      when :update_rows_event
+        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(header, fields, columns_used)
     end

data/lib/mysql_binlog/binlog_parser.rb

@@ -218,10 +218,10 @@ module MysqlBinlog
         }
       when :blob
         { :length_size => read_uint8 }
-      when :var_string, :string
+      when :string, :var_string
         {
           :real_type   => read_uint8,
-          :length_size => read_uint8,
+          :max_length  => read_uint8,
         }
       when :geometry
         { :length_size => read_uint8 }
@@ -248,7 +248,9 @@ module MysqlBinlog
         read_double
       when :string, :var_string
         read_varstring
-      when :varchar, :blob
+      when :varchar
+        read_lpstring(2)
+      when :blob
         read_lpstring(metadata[:length_size])
       when :timestamp
         read_uint32

data/lib/mysql_binlog/mysql_binlog.rb

@@ -1,15 +1,4 @@
 module MysqlBinlog
-  # A simple method to print a string as in hex representation per byte,
-  # with no more than 24 bytes per line, and spaces between each byte.
-  # There is probably a better way to do this, but I don't know it.
-  def puts_hex(data)
-    hex = data.bytes.each_slice(24).inject("") do |string, slice|
-      string << slice.map { |b| "%02x" % b }.join(" ") + "\n"
-      string
-    end
-    puts hex
-  end
-
   # An array to quickly map an integer event type to its symbol.
   EVENT_TYPES = [
     :unknown_event,             #  0
@@ -109,8 +98,8 @@ module MysqlBinlog
     attr_accessor :filter_flags
     attr_accessor :max_query_length
 
-    def initialize(reader_class, *args)
-      @reader = reader_class.new(*args)
+    def initialize(reader)
+      @reader = reader
       @parser = BinlogParser.new(self)
       @event_field_parser = BinlogEventFieldParser.new(self)
       @fde = nil

data/lib/mysql_binlog.rb

@@ -1,5 +1,6 @@
 require 'mysql_binlog/mysql_binlog'
 require 'mysql_binlog/binlog_parser'
 require 'mysql_binlog/binlog_event_field_parser'
+require 'mysql_binlog/reader/debugging_reader'
 require 'mysql_binlog/reader/binlog_file_reader'
 require 'mysql_binlog/reader/binlog_stream_reader'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mysql_binlog
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jeremy Cole