innodb_ruby 0.6.4 → 0.6.6

data/bin/innodb_space

@@ -40,11 +40,11 @@ def space_index_pages_summary(space)
     when :INDEX
       puts "%-12i%-8i%-8i%-8i%-8i%-8i" % [
         page_number,
-        page.ph[:index_id],
-        page.ph[:level],
+        page.page_header[:index_id],
+        page.level,
         page.record_space,
         page.free_space,
-        page.ph[:n_recs],
+        page.records,
       ]
     when :ALLOCATED
       puts "%-12i%-8i%-8i%-8i%-8i%-8i" % [ page_number, 0, 0, 0, page.size, 0 ]
@@ -119,11 +119,11 @@ end
 def index_recurse(index)
   index.recurse(
     lambda do |page, depth|
-      puts "%s%s %i: %i records, %i bytes" % [
+      puts "%s%s NODE #%i: %i records, %i bytes" % [
         "  " * depth,
-        page.level == 0 ? "LEAF" : "NODE",
+        index.node_type(page).to_s.upcase,
         page.offset,
-        page.page_header[:n_recs],
+        page.records,
         page.record_space,
       ]
       if page.level == 0
@@ -137,12 +137,10 @@ def index_recurse(index)
       end
     end,
     lambda do |parent_page, child_page, child_min_key, depth|
-      puts "%sLINK %i -> %i: %s records >= (%s)" % [
+      puts "%sNODE POINTER RECORD >= (%s) -> #%i" % [
         "  " * depth,
-        parent_page.offset,
-        child_page.offset,
-        child_page.page_header[:n_recs],
         child_min_key.join(", "),
+        child_page.offset,
       ]
     end
   )
@@ -156,7 +154,7 @@ def index_digraph(index)
     lambda do |page, depth|
       label = "<page>Page %i|(%i records)" % [
         page.offset,
-        page.page_header[:n_recs],
+        page.records,
       ]
       page.each_child_page do |child_page_number, child_key|
         label += "|<dir_%i>(%s)" % [
@@ -197,11 +195,11 @@ def index_level_summary(index, levels)
     index.each_page_at_level(level) do |page|
       puts "%-8i%-8i%-8i%-8i%-8i%-8i%s" % [
         page.offset,
-        page.ph[:index_id],
-        page.ph[:level],
+        page.page_header[:index_id],
+        page.level,
         page.record_space,
         page.free_space,
-        page.ph[:n_recs],
+        page.records,
         page.first_record[:key].join("|"),
       ]
     end

data/lib/innodb.rb

@@ -6,6 +6,7 @@ require "innodb/page"
 require "innodb/page/fsp_hdr_xdes"
 require "innodb/page/inode"
 require "innodb/page/index"
+require "innodb/page/trx_sys"
 require "innodb/record_describer"
 require "innodb/space"
 require "innodb/index"

data/lib/innodb/fseg_entry.rb

@@ -0,0 +1,11 @@
+class Innodb::FsegEntry
+  SIZE = 4 + 4 + 2
+
+  def self.get_entry(cursor)
+    {
+      :space_id     => cursor.get_uint32,
+      :page_number  => cursor.get_uint32,
+      :offset       => cursor.get_uint16,
+    }
+  end
+end

data/lib/innodb/index.rb

@@ -1,5 +1,7 @@
 # An InnoDB index B-tree, given an Innodb::Space and a root page number.
 class Innodb::Index
+  attr_reader :root
+
   def initialize(space, root_page_number)
     @space = space
     @root = @space.page(root_page_number)
@@ -13,11 +15,6 @@ class Innodb::Index
       raise "Page #{root_page_number} is a #{@root.type} page, not an INDEX page"
     end
 
-    # The root page should not be a leaf page.
-    unless @root.level > 0
-      raise "Page #{root_page_number} is a leaf page"
-    end
-
     # The root page should be the only page at its level.
     unless @root.prev.nil? && @root.next.nil?
       raise "Page #{root_page_number} is a node page, but not appear to be the root; it has previous page and next page pointers"
@@ -29,6 +26,17 @@ class Innodb::Index
     @root.page_header[:index_id]
   end
 
+  # Return the type of node that the given page represents in the index tree.
+  def node_type(page)
+    if @root.offset == page.offset
+      :root
+    elsif page.level == 0
+      :leaf
+    else
+      :internal
+    end
+  end
+
   # Internal method used by recurse.
   def _recurse(parent_page, page_proc, link_proc, depth=0)
     if page_proc && parent_page.type == :INDEX
@@ -87,4 +95,56 @@ class Innodb::Index
       end
     end
   end
-end
+
+  # Compare two arrays of fields to determine if they are equal. This follows
+  # the same comparison rules as strcmp and others:
+  #   0 = a is equal to b
+  #   -1 = a is less than b
+  #   +1 = a is greater than b
+  def compare_key(a, b)
+    return -1 if a.size < b.size
+    return +1 if a.size > b.size
+    a.each_index do |i|
+      return -1 if a[i] < b[i]
+      return +1 if a[i] > b[i]
+    end
+    return 0
+  end
+
+  # Search for a record within a single page, and return either a perfect
+  # match for the key, or the last record closest to they key but not greater
+  # than the key. (If an exact match is desired, compare_key must be used to
+  # check if the returned record matches. This makes the function useful for
+  # search in both leaf and non-leaf pages.)
+  def linear_search_in_page(page, key)
+    c = page.record_cursor(page.infimum[:next])
+    this_rec = c.record
+    while next_rec = c.record
+      return this_rec if next_rec == page.supremum
+      if (compare_key(key, this_rec[:key]) >= 0) &&
+        (compare_key(key, next_rec[:key]) < 0)
+        return this_rec
+      end
+      this_rec = next_rec
+    end
+    this_rec
+  end
+
+  # Search for a record within the entire index, walking down the non-leaf
+  # pages until a leaf page is found, and then verifying that the record
+  # returned on the leaf page is an exact match for the key. If a matching
+  # record is not found, nil is returned (either because linear_search_in_page
+  # returns nil breaking the loop, or because compare_key returns non-zero).
+  def linear_search(key)
+    page = @root
+
+    while rec = linear_search_in_page(page, key)
+      if page.level > 0
+        page = @space.page(rec[:child_page_number])
+      else
+        return page, rec if compare_key(key, rec[:key]) == 0
+        break
+      end
+    end
+  end
+end

data/lib/innodb/page.rb

@@ -98,7 +98,6 @@ class Innodb::Page
       :space_id   => c.get_uint32,
     }
   end
-  alias :fh :fil_header
 
   # A helper function to return the page type from the "fil" header, for easier
   # access.

data/lib/innodb/page/index.rb

@@ -1,3 +1,5 @@
+require "innodb/fseg_entry"
+
 class Innodb::Page::Index < Innodb::Page
   attr_accessor :record_describer
 
@@ -20,7 +22,7 @@ class Innodb::Page::Index < Innodb::Page
 
   # The size of the "fseg" header.
   def size_fseg_header
-    2 * 10
+    2 * Innodb::FsegEntry::SIZE
   end
 
   # Return the byte offset of the start of records within the page (the
@@ -69,9 +71,14 @@ class Innodb::Page::Index < Innodb::Page
     pos_user_records
   end
 
+  # The number of directory slots in use.
+  def directory_slots
+    page_header[:n_dir_slots]
+  end
+
   # The amount of space consumed by the page directory.
   def directory_space
-    page_header[:n_dir_slots] * PAGE_DIR_SLOT_SIZE
+    directory_slots * PAGE_DIR_SLOT_SIZE
   end
 
   # The amount of space consumed by the trailers in the page.
@@ -129,7 +136,6 @@ class Innodb::Page::Index < Innodb::Page
       :format       => (n_heap & 1<<15) == 0 ? :redundant : :compact,
     }
   end
-  alias :ph :page_header
 
   # A helper function to return the page level from the "page" header, for
   # easier access.
@@ -137,27 +143,23 @@ class Innodb::Page::Index < Innodb::Page
     page_header && page_header[:level]
   end
 
+  # A helper function to return the number of records.
+  def records
+    page_header && page_header[:n_recs]
+  end
+
   # A helper function to identify root index pages; they must be the only pages
   # at their level.
   def root?
     self.prev.nil? && self.next.nil?
   end
 
-  # Parse an "fseg" header entry.
-  def fseg_entry(cursor)
-    {
-      :space_id     => cursor.get_uint32,
-      :page_number  => cursor.get_uint32,
-      :offset       => cursor.get_uint16,
-    }
-  end
-
   # Return the "fseg" header.
   def fseg_header
     c = cursor(pos_fseg_header)
     @fseg_header ||= {
-      :free_list      => fseg_entry(c),
-      :btree_segment  => fseg_entry(c),
+      :free_list      => Innodb::FsegEntry.get_entry(c),
+      :btree_segment  => Innodb::FsegEntry.get_entry(c),
     }
   end
 
@@ -260,8 +262,8 @@ class Innodb::Page::Index < Innodb::Page
   def record(offset)
     return nil unless offset
     return nil unless type == :INDEX
-    return nil if offset == pos_infimum
-    return nil if offset == pos_supremum
+    return infimum  if offset == pos_infimum
+    return supremum if offset == pos_supremum
 
     c = cursor(offset).forward
 
@@ -269,6 +271,7 @@ class Innodb::Page::Index < Innodb::Page
     header = record_header(offset)
 
     this_record = {
+      :offset => offset,
       :header => header,
       :next => header[:next] == 0 ? nil : (offset + header[:next]),
     }
@@ -311,17 +314,48 @@ class Innodb::Page::Index < Innodb::Page
     this_record
   end
 
+  # A class for cursoring through records starting from an arbitrary point.
+  class RecordCursor
+    def initialize(page, offset)
+      @page   = page
+      @offset = offset
+    end
+
+    # Return the next record, and advance the cursor. Return nil when the
+    # end of records is reached.
+    def record
+      return nil unless @offset
+
+      record = @page.record(@offset)
+
+      if record == @page.supremum
+        @offset = nil
+      else
+        @offset = record[:next]
+        record
+      end
+    end
+  end
+
+  # Return a RecordCursor starting at offset.
+  def record_cursor(offset)
+    RecordCursor.new(self, offset)
+  end
+
   # Return the first record on this page.
   def first_record
-    record(infimum[:next])
+    first = record(infimum[:next])
+    first if first != supremum
   end
 
-  # Iterate through all records. (This is mostly unimplemented.)
+  # Iterate through all records.
   def each_record
-    rec = infimum
-    while rec = record(rec[:next])
+    c = record_cursor(infimum[:next])
+
+    while rec = c.record
       yield rec
     end
+
     nil
   end
 
@@ -330,12 +364,27 @@ class Innodb::Page::Index < Innodb::Page
   # record.
   def each_child_page
     return nil if level == 0
+
     each_record do |rec|
       yield rec[:child_page_number], rec[:key]
     end
+
     nil
   end
 
+  # Return an array of row offsets for all entries in the page directory.
+  def directory
+    return @directory if @directory
+
+    @directory = []
+    c = cursor(pos_directory).backward
+    directory_slots.times do
+      @directory.push c.get_uint16
+    end
+
+    @directory
+  end
+
   # Dump the contents of a page for debugging purposes.
   def dump
     super
@@ -366,6 +415,10 @@ class Innodb::Page::Index < Innodb::Page
     pp supremum
     puts
 
+    puts "page directory:"
+    pp directory
+    puts
+
     puts "records:"
     each_record do |rec|
       pp rec

data/lib/innodb/page/trx_sys.rb

@@ -0,0 +1,76 @@
+class Innodb::Page::TrxSys < Innodb::Page
+  def pos_trx_sys_header
+    pos_fil_header + size_fil_header
+  end
+
+  def pos_mysql_binary_log_info
+    size - 1000
+  end
+
+  def pos_mysql_master_log_info
+    size - 2000
+  end
+
+  def pos_doublewrite_info
+    size - 200
+  end
+
+  MYSQL_LOG_MAGIC_N = 873422344
+
+  def mysql_log_info(offset)
+    c = cursor(offset)
+    if c.get_uint32 == MYSQL_LOG_MAGIC_N
+      {
+        :offset => c.get_uint64,
+        :name => c.get_bytes(100),
+      }
+    end
+  end
+
+  DOUBLEWRITE_MAGIC_N = 536853855
+
+  def doublewrite_page_info(cursor)
+    {
+      :magic_n => cursor.get_uint32,
+      :page_number => [
+        cursor.get_uint32,
+        cursor.get_uint32,
+      ],
+    }
+  end
+
+  DOUBLEWRITE_SPACE_ID_STORED_MAGIC_N = 1783657386
+
+  def doublewrite_info
+    c = cursor(pos_doublewrite_info)
+    {
+      :fseg => Innodb::FsegEntry.get_entry(c),
+      :page_info => [
+        doublewrite_page_info(c),
+        doublewrite_page_info(c),
+      ],
+      :space_id_stored => c.get_uint32 == DOUBLEWRITE_SPACE_ID_STORED_MAGIC_N,
+    }
+  end
+
+  def trx_sys
+    c = cursor(pos_trx_sys_header)
+    @trx_sys ||= {
+      :trx_id            => c.get_uint64,
+      :fseg        => Innodb::FsegEntry.get_entry(c),
+      :binary_log => mysql_log_info(pos_mysql_binary_log_info),
+      :master_log => mysql_log_info(pos_mysql_master_log_info),
+      :doublewrite => doublewrite_info,
+    }
+  end
+
+  def dump
+    super
+
+    puts "trx_sys:"
+    pp trx_sys
+    puts
+  end
+end
+
+Innodb::Page::SPECIALIZED_CLASSES[:TRX_SYS] = Innodb::Page::TrxSys

data/lib/innodb/version.rb

@@ -1,3 +1,3 @@
 module Innodb
-  VERSION = "0.6.4"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: innodb_ruby
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Jeremy Cole
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-05 00:00:00 Z
+date: 2012-12-07 00:00:00 Z
 dependencies: []
 
 description: Library for parsing InnoDB data files in Ruby
@@ -31,6 +31,7 @@ files:
 - lib/innodb.rb
 - lib/innodb/cursor.rb
 - lib/innodb/free_list.rb
+- lib/innodb/fseg_entry.rb
 - lib/innodb/index.rb
 - lib/innodb/log.rb
 - lib/innodb/log_block.rb
@@ -38,6 +39,7 @@ files:
 - lib/innodb/page/fsp_hdr_xdes.rb
 - lib/innodb/page/index.rb
 - lib/innodb/page/inode.rb
+- lib/innodb/page/trx_sys.rb
 - lib/innodb/record_describer.rb
 - lib/innodb/space.rb
 - lib/innodb/version.rb