innodb_ruby 0.9.9 → 0.9.10

data/bin/innodb_space

@@ -756,8 +756,7 @@ def page_account(innodb_system, space, page_number)
   end
 end
 
-def page_directory_summary(page_number)
-  page = space.page(page_number)
+def page_directory_summary(space, page)
   if page.type != :INDEX
     usage 1, "Page must be an index page"
   end
@@ -785,6 +784,16 @@ def page_directory_summary(page_number)
   end
 end
 
+def page_records(space, page)
+  page.each_record do |record|
+    puts "Record %i: %s" % [
+      record.offset,
+      record.string,
+    ]
+    puts if record.header[:type] == :conventional
+  end
+end
+
 def page_illustrate(page)
   width = 64
   blocks = Array.new(page.size, " ")
@@ -859,6 +868,38 @@ def page_illustrate(page)
   puts
 end
 
+def record_dump(page, record_offset)
+  unless record = page.record(record_offset)
+    raise "Record at offset #{record_offset} not found"
+  end
+
+  record.dump
+end
+
+def record_history(page, record_offset)
+  unless page.leaf?
+    raise "Record is not located on a leaf page; no history available"
+  end
+
+  unless record = page.record(record_offset)
+    raise "Record at offset #{record_offset} not found"
+  end
+
+  puts "%-14s%-20s%s" % [
+    "Transaction",
+    "Type",
+    "Undo record",
+  ]
+
+  record.each_undo_record do |undo|
+    puts "%-14s%-20s%s" % [
+      undo.trx_id || "(n/a)",
+      undo.header[:type],
+      undo.string,
+    ]
+  end
+end
+
 def index_fseg_lists(index, fseg_name)
   unless index.fseg(fseg_name)
     raise "File segment '#{fseg_name}' doesn't exist"
@@ -1170,9 +1211,20 @@ The following modes are supported:
     Summarize the record contents of the page directory in a page. If a record
     describer is available, the key of each record will be printed.
 
+  page-records
+    Summarize all records within a page.
+
   page-illustrate
     Produce an illustration of the contents of a page.
 
+  record-dump
+    Dump a detailed description of a record and the data it contains. A record
+    offset must be provided with -R/--record.
+
+  record-history
+    Summarize the history (undo logs) for a record. A record offset must be
+    provided with -R/--record.
+
 END_OF_USAGE
 
   exit exit_code
@@ -1188,6 +1240,7 @@ Signal.trap("PIPE") { exit }
 @options.table_name             = nil
 @options.index_name             = nil
 @options.page                   = nil
+@options.record                 = nil
 @options.level                  = nil
 @options.list                   = nil
 @options.describer              = nil
@@ -1200,6 +1253,7 @@ getopt_options = [
   [ "--table-name",             "-T",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--index-name",             "-I",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--page",                   "-p",     GetoptLong::REQUIRED_ARGUMENT ],
+  [ "--record",                 "-R",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--level",                  "-l",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--list",                   "-L",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--require",                "-r",     GetoptLong::REQUIRED_ARGUMENT ],
@@ -1224,6 +1278,8 @@ getopt.each do |opt, arg|
     @options.index_name = arg
   when "--page"
     @options.page = arg.to_i
+  when "--record"
+    @options.record = arg.to_i
   when "--level"
     @options.level = arg.to_i
   when "--list"
@@ -1247,16 +1303,23 @@ if @options.trace > 1
   BufferCursor.trace!
 end
 
+# A few globals that we'll try to populate from the command-line arguments.
 innodb_system = nil
+space = nil
+index = nil
+page = nil
+
 if @options.system_space_file
   innodb_system = Innodb::System.new(@options.system_space_file)
 end
 
-space = innodb_system ? innodb_system.system_space : nil
 if innodb_system and @options.table_name
-  space = innodb_system.space_by_table_name(@options.table_name)
+  table_tablespace = innodb_system.space_by_table_name(@options.table_name)
+  space = table_tablespace || innodb_system.system_space
 elsif @options.space_file
   space = Innodb::Space.new(@options.space_file)
+else
+  space = innodb_system.system_space
 end
 
 if @options.describer
@@ -1267,9 +1330,13 @@ if @options.describer
   space.record_describer = describer.new
 end
 
-index = nil
 if innodb_system and @options.table_name and @options.index_name
   index = innodb_system.index_by_name(@options.table_name, @options.index_name)
+  if @options.page
+    page = space.page(@options.page)
+  else
+    page = index.root
+  end
 elsif @options.page
   if page = space.page(@options.page) and page.type == :INDEX and page.root?
     index = space.index(@options.page)
@@ -1296,10 +1363,14 @@ if /^index-/.match(mode) and !index
   usage 1, "Index must be specified using a combination of either -f/--space-file and -p/--page or -s/--system-space-file, -T/--table-name, and -I/--index-name"
 end
 
-if /^page-/.match(mode) and !@options.page
+if /^page-/.match(mode) and !page
   usage 1, "Page number must be specified using -p/--page"
 end
 
+if /^record-/.match(mode) and !@options.record
+  usage 1, "Record offset must be specified using -R/--record"
+end
+
 if /-list-iterate$/.match(mode) and !@options.list
   usage 1, "List name must be specified using -L/--list"
 end
@@ -1376,13 +1447,19 @@ when "index-fseg-leaf-frag-pages"
 when "index-fseg-internal-frag-pages"
   index_fseg_frag_pages(index, :internal)
 when "page-dump"
-  space.page(@options.page).dump
+  page.dump
 when "page-account"
   page_account(innodb_system, space, @options.page)
 when "page-directory-summary"
-  page_directory_summary(@options.page)
+  page_directory_summary(space, page)
+when "page-records"
+  page_records(space, page)
 when "page-illustrate"
-  page_illustrate(space.page(@options.page))
+  page_illustrate(page)
+when "record-dump"
+  record_dump(page, @options.record)
+when "record-history"
+  record_history(page, @options.record)
 else
   usage 1, "Unknown mode: #{mode}"
 end

data/lib/innodb/data_type.rb

@@ -331,7 +331,7 @@ class Innodb::DataType
     end
 
     def read(c)
-      c.name("transaction_id") { c.get_hex(6) }
+      c.name("transaction_id") { c.get_uint48 }
     end
   end
 

data/lib/innodb/page/index.rb

@@ -253,6 +253,11 @@ class Innodb::Page::Index < Innodb::Page
     self.prev.nil? && self.next.nil?
   end
 
+  # A helper function to identify leaf index pages.
+  def leaf?
+    level == 0
+  end
+
   # A helper function to return the offset to the first free record.
   def garbage_offset
     page_header && page_header[:garbage_offset]
@@ -730,6 +735,12 @@ class Innodb::Page::Index < Innodb::Page
     RecordCursor.new(self, offset, direction)
   end
 
+  def record_if_exists(offset)
+    each_record do |rec|
+      return rec if rec.offset == offset
+    end
+  end
+
   # Return the minimum record on this page.
   def min_record
     min = record(infimum.next)

data/lib/innodb/record.rb

@@ -13,6 +13,30 @@ class Innodb::Record
     record[:header]
   end
 
+  def next
+    header[:next]
+  end
+
+  def type
+    header[:type]
+  end
+
+  def heap_number
+    header[:heap_number]
+  end
+
+  def n_owned
+    header[:n_owned]
+  end
+
+  def deleted?
+    header[:deleted]
+  end
+
+  def min_rec?
+    header[:min_rec]
+  end
+
   def offset
     record[:offset]
   end
@@ -50,6 +74,8 @@ class Innodb::Record
   end
 
   def undo
+    return nil unless roll_pointer
+
     if innodb_system = @page.space.innodb_system
       undo_space = innodb_system.system_space
       if undo_page = undo_space.page(roll_pointer[:undo_log][:page])
@@ -122,4 +148,53 @@ class Innodb::Record
 
     return 0
   end
+
+  def dump
+    puts "Record at offset %i" % offset
+    puts
+
+    puts "Header:"
+    puts "  %-20s: %i" % ["Next record offset", header[:next]]
+    puts "  %-20s: %i" % ["Heap number", header[:heap_number]]
+    puts "  %-20s: %s" % ["Type", header[:type]]
+    puts "  %-20s: %s" % ["Deleted", header[:deleted]]
+    puts "  %-20s: %s" % ["Length", header[:length]]
+    puts
+
+    if page.leaf?
+      puts "System fields:"
+      puts "  Transaction ID: %s" % transaction_id
+      puts "  Roll Pointer:"
+      puts "    Undo Log: page %i, offset %i" % [
+        roll_pointer[:undo_log][:page],
+        roll_pointer[:undo_log][:offset],
+      ]
+      puts "    Rollback Segment ID: %i" % roll_pointer[:rseg_id]
+      puts "    Insert: %s" % roll_pointer[:is_insert]
+      puts
+    end
+
+    puts "Key fields:"
+    key.each do |field|
+      puts "  %s: %s" % [
+        field[:name],
+        field[:value].inspect,
+      ]
+    end
+    puts
+
+    if page.leaf?
+      puts "Non-key fields:"
+      row.each do |field|
+        puts "  %s: %s" % [
+          field[:name],
+          field[:value].inspect,
+        ]
+      end
+      puts
+    else
+      puts "Child page number: %i" % child_page_number
+      puts
+    end
+  end
 end

data/lib/innodb/undo_log.rb

@@ -20,8 +20,8 @@ class Innodb::UndoLog
     @header ||= page.cursor(@position).name("header") do |c|
       xid_flag = nil
       {
-        :trx_id => c.name("trx_id") { c.get_hex(8) },
-        :trx_no => c.name("trx_no") { c.get_hex(8) },
+        :trx_id => c.name("trx_id") { c.get_uint64 },
+        :trx_no => c.name("trx_no") { c.get_uint64 },
         :delete_mark_flag => c.name("delete_mark_flag") { (c.get_uint16 != 0) },
         :log_start_offset => c.name("log_start_offset") { c.get_uint16 },
         :xid_flag => c.name("xid_flag") { xid_flag = (c.get_uint8 != 0) },

data/lib/innodb/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module Innodb
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: innodb_ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata