innodb_ruby 0.7.5 → 0.7.6

data/bin/innodb_space

@@ -5,27 +5,46 @@ require "ostruct"
 require "pp"
 require "innodb"
 
-def space_summary(space, start_page)
-  puts "%-12s%-20s%-12s%-12s%-20s" % [
-    "page",
-    "type",
-    "prev",
-    "next",
-    "lsn",
+def print_lists(lists)
+  puts "%-20s%-12s%-12s%-12s%-12s%-12s" % [
+    "name",
+    "length",
+    "f_page",
+    "f_offset",
+    "l_page",
+    "l_offset",
   ]
 
-  space.each_page(start_page) do |page_number, page|
-    puts "%-12i%-20s%-12i%-12i%-20i" % [
-      page_number,
-      page.type,
-      page.prev || 0,
-      page.next || 0,
-      page.lsn || 0,
+  lists.each do |name, list|
+    puts "%-20s%-12i%-12i%-12i%-12i%-12i" % [
+      name,
+      list.base[:length],
+      list.base[:first] && list.base[:first][:page]   || 0,
+      list.base[:first] && list.base[:first][:offset] || 0,
+      list.base[:last]  && list.base[:last][:page]    || 0,
+      list.base[:last]  && list.base[:last][:offset]  || 0,
     ]
   end
 end
 
-def space_index_pages_summary(space, start_page)
+def print_xdes_list(list)
+  puts "%-12s%-64s" % [
+    "start_page",
+    "page_used_bitmap"
+  ]
+
+  list.each do |entry|
+    puts "%-12i%-64s" % [
+      entry.xdes[:start_page],
+      entry.each_page_status.inject("") { |bitmap, page_status|
+        bitmap += page_status[:free] ? "." : "#"
+        bitmap
+      },
+    ]
+  end
+end
+
+def print_index_page_summary(pages)
   puts "%-12s%-8s%-8s%-8s%-8s%-8s" % [
     "page",
     "index",
@@ -35,7 +54,7 @@ def space_index_pages_summary(space, start_page)
     "records",
   ]
 
-  space.each_page(start_page) do |page_number, page|
+  pages.each do |page_number, page|
     case page.type
     when :INDEX
       puts "%-12i%-8i%-8i%-8i%-8i%-8i" % [
@@ -52,6 +71,30 @@ def space_index_pages_summary(space, start_page)
   end
 end
 
+def space_summary(space, start_page)
+  puts "%-12s%-20s%-12s%-12s%-20s" % [
+    "page",
+    "type",
+    "prev",
+    "next",
+    "lsn",
+  ]
+
+  space.each_page(start_page) do |page_number, page|
+    puts "%-12i%-20s%-12i%-12i%-20i" % [
+      page_number,
+      page.type,
+      page.prev || 0,
+      page.next || 0,
+      page.lsn  || 0,
+    ]
+  end
+end
+
+def space_index_pages_summary(space, start_page)
+  print_index_page_summary(space.each_page(start_page))
+end
+
 def space_page_type_regions(space, start_page)
   puts "%-12s%-12s%-12s%-20s" % [
     "start",
@@ -71,25 +114,28 @@ def space_page_type_regions(space, start_page)
 end
 
 def space_lists(space)
+  print_lists(space.page(0).each_list)
+end
+
+def space_list_iterate(space, list_name)
   fsp = space.page(0).fsp_header
-  puts "%-20s%-12s%-12s%-12s%-12s%-12s" % [
-    "name",
-    "length",
-    "f_page",
-    "f_offset",
-    "l_page",
-    "l_offset",
-  ]
-  fsp.each do |key, list|
-    next unless list.is_a?(Innodb::List)
-    puts "%-20s%-12i%-12i%-12i%-12i%-12i" % [
-      key,
-      list.base[:length],
-      list.base[:first] && list.base[:first][:page],
-      list.base[:first] && list.base[:first][:offset],
-      list.base[:last] && list.base[:last][:page],
-      list.base[:last] && list.base[:last][:offset],
+
+  unless fsp[list_name] && fsp[list_name].is_a?(Innodb::List)
+    raise "List '#{list_name}' doesn't exist"
+  end
+
+  case fsp[list_name]
+  when Innodb::List::Xdes
+    print_xdes_list(fsp[list_name])
+  when Innodb::List::Inode
+    puts "%-12s" % [
+      "page",
     ]
+    fsp[list_name].each do |page|
+      puts "%-12i" % [
+        page.offset,
+      ]
+    end
   end
 end
 
@@ -104,9 +150,7 @@ def space_indexes(space)
   ]
 
   space.each_index do |index|
-    [:internal, :leaf].each do |fseg_name|
-      fseg = index.root.fseg_header[fseg_name]
-
+    index.each_fseg do |fseg_name, fseg|
       fragments =
         fseg[:frag_array].inject(0) { |c, i| c += 1 if i; c }
 
@@ -121,70 +165,20 @@ def space_indexes(space)
         space.pages_per_extent * fseg[:not_full].base[:length] +
         space.pages_per_extent * fseg[:free].base[:length]
 
+      fill_factor = allocated > 0 ? 100.0 * (used.to_f / allocated.to_f) : 0.0
+
       puts "%-12i%-12i%-12s%-12i%-12i%-12s" % [
         index.id,
         index.root.offset,
         fseg_name,
         used,
         allocated,
-        "%.2f%%" % [100.0 * (used.to_f / allocated.to_f)],
-      ]
-    end
-  end
-end
-
-def print_xdes_list(list)
-  puts "%-12s%-64s" % [
-    "start_page",
-    "bitmap"
-  ]
-  list.each do |entry|
-    puts "%-12i%-64s" % [
-      entry.xdes[:start_page],
-      entry.each_page_status.inject("") { |bitmap, page_status|
-        bitmap += page_status[:free] ? "." : "#"
-        bitmap
-      },
-    ]
-  end
-end
-
-def list_summary(space, list_name)
-  fsp = space.page(0).fsp_header
-
-  unless fsp[list_name] && fsp[list_name].is_a?(Innodb::List)
-    raise "List '#{list_name}' doesn't exist"
-  end
-
-  case fsp[list_name]
-  when Innodb::List::Xdes
-    print_xdes_list(fsp[list_name])
-  when Innodb::List::Inode
-    puts "%-12s" % [
-      "page",
-    ]
-    fsp[list_name].each do |page|
-      puts "%-12i" % [
-        page.offset,
+        "%.2f%%" % fill_factor,
       ]
     end
   end
 end
 
-def index_fseg_summary(index, fseg_name, list_name)
-  fseg_header = index.root.fseg_header
-  unless fseg_header[fseg_name]
-    raise "File segment '#{fseg_name}' doesn't exist"
-  end
-
-  fseg = fseg_header[fseg_name]
-  unless fseg[list_name] && fseg[list_name].is_a?(Innodb::List)
-    raise "List '#{list_name}' doesn't exist"
-  end
-
-  print_xdes_list(fseg[list_name])
-end
-
 def space_index_pages_free_plot(space, image, start_page)
   unless require "gnuplot"
     raise "Couldn't load gnuplot. Is it installed?"
@@ -231,6 +225,35 @@ def space_index_pages_free_plot(space, image, start_page)
   end
 end
 
+def index_fseg_lists(index, fseg_name)
+  unless index.fseg(fseg_name)
+    raise "File segment '#{fseg_name}' doesn't exist"
+  end
+
+  print_lists(index.each_fseg_list(index.fseg(fseg_name)))
+end
+
+def index_fseg_list_iterate(index, fseg_name, list_name)
+  unless index.fseg(fseg_name)
+    raise "File segment '#{fseg_name}' doesn't exist"
+  end
+
+  fseg = index.fseg(fseg_name)
+  unless fseg[list_name] && fseg[list_name].is_a?(Innodb::List)
+    raise "List '#{list_name}' doesn't exist"
+  end
+
+  print_xdes_list(fseg[list_name])
+end
+
+def index_fseg_frag_pages(index, fseg_name)
+  unless index.fseg(fseg_name)
+    raise "File segment '#{fseg_name}' doesn't exist"
+  end
+
+  print_index_page_summary(index.each_fseg_frag_page(index.fseg(fseg_name)))
+end
+
 def index_recurse(index)
   index.recurse(
     lambda do |page, depth|
@@ -381,15 +404,15 @@ The following modes are supported:
     provide an overall view of the space and allocations within it. A starting
     page number can be provided with the --page/-p argument.
 
-  space-lists
-    Print the names of all lists in a space.
-
   space-indexes
     Summarize all indexes (actually each segment of the indexes) to show
     the number of pages used and allocated, and the segment fill factor.
 
-  list-summary
-    Summarize the contents of a list.
+  space-lists
+    Print a summary of all lists in a space.
+
+  space-list-iterate
+    Iterate through the contents of a space list.
 
   index-recurse
     Recurse an index, starting at the root (which must be provided in the first
@@ -405,13 +428,23 @@ The following modes are supported:
     Print a summary of all pages at a given level (provided with the --level/-l
     argument) in an index.
 
-  index-fseg-internal-summary
-  index-fseg-leaf-summary
-    Summarize the file segment (whose name is provided in the first --list/-L
+  index-fseg-internal-lists
+  index-fseg-leaf-lists
+    Print a summary of all lists in an index file segment. Index root page must
+    be provided with --page/-p.
+
+  index-fseg-internal-list-iterate
+  index-fseg-leaf-list-iterate
+    Iterate the file segment list (whose name is provided in the first --list/-L
     argument) for internal or leaf pages for a given index (whose root page
     is provided in the first --page/-p argument). The lists used for each
     index are "full", "not_full", and "free".
 
+  index-fseg-internal-frag-pages
+  index-fseg-leaf-frag-pages
+    Print a summary of all fragment pages in an index file segment. Index root
+    page must be provided with --page/-p.
+
 END_OF_USAGE
 
   exit exit_code
@@ -482,7 +515,7 @@ ARGV.each do |mode|
   case mode
   when "page-dump"
     if @options.pages.empty?
-      usage 1, "Page numbers to dump must be provided"
+      usage 1, "Page numbers to dump must be provided with --page/-p"
     end
 
     @options.pages.each do |page|
@@ -499,19 +532,23 @@ ARGV.each do |mode|
     space_page_type_regions(space, @options.pages.first || 0)
   when "space-lists"
     space_lists(space)
-  when "space-indexes"
-    space_indexes(space)
-  when "list-summary"
+  when "space-list-iterate"
+    if @options.lists.empty?
+      usage 1, "A list name must be provided with --list/-L"
+    end
+
     @options.lists.each do |list|
-      list_summary(space, list)
+      space_list_iterate(space, list)
     end
+  when "space-indexes"
+    space_indexes(space)
   when "index-recurse"
     unless space.record_describer
       usage 1, "Record describer necessary for index recursion" 
     end
     
     if @options.pages.empty?
-      usage 1, "Page number of index root must be provided"
+      usage 1, "Page number of index root must be provided with --page/-p"
     end
 
     @options.pages.each do |page|
@@ -523,7 +560,7 @@ ARGV.each do |mode|
     end
     
     if @options.pages.empty?
-      usage 1, "Page number of index root must be provided"
+      usage 1, "Page number of index root must be provided with --page/-p"
     end
 
     @options.pages.each do |page|
@@ -535,18 +572,58 @@ ARGV.each do |mode|
     end
     
     if @options.pages.empty?
-      usage 1, "Page number of index root must be provided"
+      usage 1, "Page number of index root must be provided with --page/-p"
     end
 
     index_level_summary(space.index(@options.pages.first), @options.levels)
-  when "index-fseg-leaf-summary"
+  when "index-fseg-leaf-lists"
+    if @options.pages.empty?
+      usage 1, "Page number of index root must be provided with --page/-p"
+    end
+
+    index_fseg_lists(space.index(@options.pages.first), :leaf)
+  when "index-fseg-internal-lists"
+    if @options.pages.empty?
+      usage 1, "Page number of index root must be provided with --page/-p"
+    end
+
+    index_fseg_lists(space.index(@options.pages.first), :internal)
+  when "index-fseg-leaf-list-iterate"
+    if @options.pages.empty?
+      usage 1, "Page number of index root must be provided with --page/-p"
+    end
+
+    if @options.lists.empty?
+      usage 1, "A list name must be provided with --list/-L"
+    end
+
     @options.lists.each do |list|
-      index_fseg_summary(space.index(@options.pages.first), :leaf, list)
+      index_fseg_list_iterate(space.index(@options.pages.first), :leaf, list)
+    end
+  when "index-fseg-internal-list-iterate"
+    if @options.pages.empty?
+      usage 1, "Page number of index root must be provided with --page/-p"
     end
-  when "index-fseg-internal-summary"
+
+    if @options.lists.empty?
+      usage 1, "A list name must be provided with --list/-L"
+    end
+
     @options.lists.each do |list|
-      index_fseg_summary(space.index(@options.pages.first), :internal, list)
+      index_fseg_list_iterate(space.index(@options.pages.first), :internal, list)
     end
+  when "index-fseg-leaf-frag-pages"
+    if @options.pages.empty?
+      usage 1, "Page number of index root must be provided with --page/-p"
+    end
+
+    index_fseg_frag_pages(space.index(@options.pages.first), :leaf)
+  when "index-fseg-internal-frag-pages"
+    if @options.pages.empty?
+      usage 1, "Page number of index root must be provided with --page/-p"
+    end
+
+    index_fseg_frag_pages(space.index(@options.pages.first), :internal)
   else
     usage 1, "Unknown mode: #{mode}"
   end

data/lib/innodb.rb

@@ -1,6 +1,8 @@
 # A set of classes for parsing and working with InnoDB data files.
 module Innodb; end
 
+require "enumerator"
+
 require "innodb/version"
 require "innodb/page"
 require "innodb/page/fsp_hdr_xdes"

data/lib/innodb/index.rb

@@ -82,10 +82,48 @@ class Innodb::Index
     page if page.level == level
   end
 
+  # Return the file segment with the given name from the fseg header.
+  def fseg(name)
+    @root.fseg_header[name]
+  end
+
+  # Iterate through all file segments in the index.
+  def each_fseg
+    unless block_given?
+      return enum_for(:each_fseg)
+    end
+
+    [:internal, :leaf].each do |fseg_name|
+      yield fseg_name, fseg(fseg_name)
+    end
+  end
+
+  # Iterate through all lists in a given fseg.
+  def each_fseg_list(fseg)
+    unless block_given?
+      return enum_for(:each_fseg_list, fseg)
+    end
+
+    [:full, :not_full, :free].each do |list_name|
+      yield list_name, fseg[list_name] if fseg[list_name].is_a?(Innodb::List)
+    end
+  end
+
+  # Iterate through all frag pages in a given fseg.
+  def each_fseg_frag_page(fseg)
+    unless block_given?
+      return enum_for(:each_fseg_frag_page, fseg)
+    end
+
+    fseg[:frag_array].each do |page_number|
+      yield page_number, @space.page(page_number) if page_number
+    end
+  end
+
   # Iterate through all pages at this level starting with the provided page.
   def each_page_from(page)
     unless block_given?
-      return Enumerable::Enumerator.new(self, :each_page_from, page)
+      return enum_for(:each_page_from, page)
     end
 
     while page && page.type == :INDEX
@@ -98,7 +136,7 @@ class Innodb::Index
   # and following the next pointers in each page.
   def each_page_at_level(level)
     unless block_given?
-      return Enumerable::Enumerator.new(self, :each_page_at_level, level)
+      return enum_for(:each_page_at_level, level)
     end
 
     each_page_from(first_page_at_level(level)) { |page| yield page }
@@ -107,7 +145,7 @@ class Innodb::Index
   # Iterate through all records on all leaf pages in ascending order.
   def each_record
     unless block_given?
-      return Enumerable::Enumerator.new(self, :each_record)
+      return enum_for(:each_record)
     end
 
     each_page_at_level(0) do |page|

data/lib/innodb/list.rb

@@ -106,7 +106,7 @@ class Innodb::List
   # Iterate through all nodes in the list.
   def each
     unless block_given?
-      return Enumerable::Enumerator.new(self)
+      return enum_for(:each)
     end
 
     c = cursor

data/lib/innodb/page/fsp_hdr_xdes.rb

@@ -58,13 +58,24 @@ class Innodb::Page::FspHdrXdes < Innodb::Page
     }
   end
 
+  # Iterate through all lists in the file space.
+  def each_list
+    unless block_given?
+      return enum_for(:each_list)
+    end
+
+    fsp_header.each do |key, value|
+      yield key, value if value.is_a?(Innodb::List)
+    end
+  end
+
   # Iterate through all XDES entries in order. This is useful for debugging,
   # but each of these entries is actually a node in some other list. The state
   # field in the XDES entry indicates which type of list it is present in,
   # although not necessarily which list (e.g. :fseg).
   def each_xdes
     unless block_given?
-      return Enumerable::Enumerator.new(self, :each_xdes)
+      return enum_for(:each_xdes)
     end
 
     c = cursor(pos_xdes_array)

data/lib/innodb/page/index.rb

@@ -450,7 +450,7 @@ class Innodb::Page::Index < Innodb::Page
   # Iterate through all records.
   def each_record
     unless block_given?
-      return Enumerable::Enumerator.new(self, :each_record)
+      return enum_for(:each_record)
     end
 
     c = record_cursor(infimum[:next])
@@ -469,7 +469,7 @@ class Innodb::Page::Index < Innodb::Page
     return nil if level == 0
 
     unless block_given?
-      return Enumerable::Enumerator.new(self, :each_child_page)
+      return enum_for(:each_child_page)
     end
 
     each_record do |rec|

data/lib/innodb/space.rb

@@ -69,7 +69,7 @@ class Innodb::Space
   # files.
   def each_index
     unless block_given?
-      return Enumerable::Enumerator.new(self, :each_index)
+      return enum_for(:each_index)
     end
 
     (3...@pages).each do |page_number|
@@ -86,7 +86,7 @@ class Innodb::Space
   # and an Innodb::Page object for each one.
   def each_page(start_page=0)
     unless block_given?
-      return Enumerable::Enumerator.new(self, :each_page)
+      return enum_for(:each_page)
     end
 
     (start_page...@pages).each do |page_number|
@@ -99,7 +99,7 @@ class Innodb::Space
   # to achieve an overall view of the space.
   def each_page_type_region(start_page=0)
     unless block_given?
-      return Enumerable::Enumerator.new(self, :each_page_type_region)
+      return enum_for(:each_page_type_region)
     end
 
     region = nil

data/lib/innodb/version.rb

@@ -1,3 +1,3 @@
 module Innodb
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

data/lib/innodb/xdes.rb

@@ -1,5 +1,3 @@
-require "enumerator"
-
 # An InnoDB "extent descriptor entry" or "+XDES+". These structures are used
 # in the +XDES+ entry array contained in +FSP_HDR+ and +XDES+ pages.
 #
@@ -85,10 +83,10 @@ class Innodb::Xdes
   #           this bit is unused by InnoDB, and always set true).
   def each_page_status
     unless block_given?
-      return Enumerable::Enumerator.new(self, :each_page_status)
+      return enum_for(:each_page_status)
     end
 
-    bitmap = Enumerable::Enumerator.new(xdes[:bitmap], :each_byte)
+    bitmap = xdes[:bitmap].enum_for(:each_byte)
 
     bitmap.each_with_index do |byte, byte_index|
       (0..3).each_with_index do |page, page_index|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: innodb_ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
-  requirement: &70358166884520 !ruby/object:Gem::Requirement
+  requirement: &70346481414780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70358166884520
+  version_requirements: *70346481414780
 description: Library for parsing InnoDB data files in Ruby
 email: jeremy@jcole.us
 executables: