innodb_ruby 0.6.0 → 0.6.1

data/bin/innodb_space

@@ -52,6 +52,24 @@ def space_index_pages_summary(space)
   end
 end
 
+def space_page_type_regions(space)
+  puts "%-12s%-12s%-12s%-20s" % [
+    "start",
+    "end",
+    "count",
+    "type",
+  ]
+
+  space.each_page_type_region do |region|
+    puts "%-12i%-12i%-12i%-20s" % [
+      region[:start],
+      region[:end],
+      region[:count],
+      region[:type],
+    ]
+  end
+end
+
 def index_recurse(index)
   index.recurse(
     lambda do |page, depth|
@@ -183,6 +201,10 @@ The following modes are supported:
     page fill rates and record counts per page. In addition to "INDEX" pages,
     "ALLOCATED" pages are also printed and assumed to be completely empty.
 
+  space-page-type-regions
+    Summarize all contiguous regions of the same page type. This is useful to
+    provide an overall view of the space and allocations within it.
+
   index-recurse
     Recurse an index, starting at the root (which must be provided in the first
     --page/-p argument), printing the node pages, node pointers (links), leaf
@@ -266,6 +288,8 @@ ARGV.each do |mode|
     space_summary(space)
   when "space-index-pages-summary"
     space_index_pages_summary(space)
+  when "space-page-type-regions"
+    space_page_type_regions(space)
   when "index-recurse"
     unless space.record_describer
       usage 1, "Record describer necessary for index recursion" 

data/lib/innodb/index.rb

@@ -24,6 +24,11 @@ class Innodb::Index
     end
   end
 
+  # A helper function to access the index ID in the page header.
+  def id
+    @root.page_header[:index_id]
+  end
+
   # Internal method used by recurse.
   def _recurse(parent_page, page_proc, link_proc, depth=0)
     if page_proc && parent_page.type == :INDEX

data/lib/innodb/page/index.rb

@@ -139,6 +139,12 @@ class Innodb::Page::Index < Innodb::Page
     page_header && page_header[:level]
   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
+
   RECORD_BITS_SIZE  = 3
   RECORD_NEXT_SIZE  = 2
 

data/lib/innodb/space.rb

@@ -35,6 +35,20 @@ class Innodb::Space
     Innodb::Index.new(self, root_page_number)
   end
 
+  # Iterate through each index by guessing that the root pages will be
+  # present starting at page 3, and walking forward until we find a non-
+  # root page. This should work fine for IBD files, but not for ibdata
+  # files.
+  def each_index
+    (3...@pages).each do |page_number|
+      if page(page_number).root?
+        yield index(page_number)
+      else
+        break
+      end
+    end
+  end
+
   # Iterate through all pages in a tablespace, returning the page number
   # and an Innodb::Page object for each one.
   def each_page
@@ -43,4 +57,25 @@ class Innodb::Space
       yield page_number, current_page if current_page
     end
   end
+
+  # Iterate through unique regions in the space by page type. This is useful
+  # to achieve an overall view of the space.
+  def each_page_type_region
+    region = nil
+    each_page do |page_number, page|
+      if region && region[:type] == page.type
+        region[:end] = page_number
+        region[:count] += 1
+      else
+        yield region if region
+        region = {
+          :start => page_number,
+          :end   => page_number,
+          :type  => page.type,
+          :count => 1,
+        }
+      end
+    end
+    yield region if region
+  end
 end

data/lib/innodb/version.rb

@@ -1,3 +1,3 @@
 module Innodb
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: innodb_ruby
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Jeremy Cole
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-01 00:00:00 Z
+date: 2012-12-04 00:00:00 Z
 dependencies: []
 
 description: Library for parsing InnoDB data files in Ruby