innodb_ruby 0.7.6 → 0.7.7

data/bin/innodb_space

@@ -225,6 +225,10 @@ def space_index_pages_free_plot(space, image, start_page)
   end
 end
 
+def space_extents(space)
+  print_xdes_list(space.each_xdes)
+end
+
 def index_fseg_lists(index, fseg_name)
   unless index.fseg(fseg_name)
     raise "File segment '#{fseg_name}' doesn't exist"
@@ -414,6 +418,9 @@ The following modes are supported:
   space-list-iterate
     Iterate through the contents of a space list.
 
+  space-extents
+    Iterate through all extents, printing the extent descriptor bitmap.
+
   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
@@ -542,6 +549,8 @@ ARGV.each do |mode|
     end
   when "space-indexes"
     space_indexes(space)
+  when "space-extents"
+    space_extents(space)
   when "index-recurse"
     unless space.record_describer
       usage 1, "Record describer necessary for index recursion" 

data/lib/innodb/space.rb

@@ -27,14 +27,25 @@ class Innodb::Space
   # The number of pages in the space.
   attr_reader :pages
 
+  # The size (in bytes) of an extent.
+  def extent_size
+    1048576
+  end
+
   # The number of pages per extent.
   def pages_per_extent
-    64
+    extent_size / page_size
   end
 
-  # The size (in bytes) of an extent.
-  def extent_size
-    page_size * pages_per_extent
+  # The number of pages per FSP_HDR/XDES page. This is crudely mapped to the
+  # page size, and works for pages down to 1KiB.
+  def pages_per_xdes_page
+    page_size
+  end
+
+  # An array of all FSP/XDES page numbers for the space.
+  def xdes_page_numbers
+    (0..(@pages / pages_per_xdes_page)).map { |n| n * pages_per_xdes_page }
   end
 
   # Get an Innodb::Page object for a specific page by page number.
@@ -86,7 +97,7 @@ class Innodb::Space
   # and an Innodb::Page object for each one.
   def each_page(start_page=0)
     unless block_given?
-      return enum_for(:each_page)
+      return enum_for(:each_page, start_page)
     end
 
     (start_page...@pages).each do |page_number|
@@ -95,6 +106,35 @@ class Innodb::Space
     end
   end
 
+  # Iterate through all FSP_HDR/XDES pages, returning an Innodb::Page object
+  # for each one.
+  def each_xdes_page
+    unless block_given?
+      return enum_for(:each_xdes_page)
+    end
+
+    xdes_page_numbers.each do |page_number|
+      current_page = page(page_number)
+      yield current_page if current_page
+    end
+  end
+
+  # Iterate through all extent descriptors for the space, returning an
+  # Innodb::Xdes object for each one.
+  def each_xdes
+    unless block_given?
+      return enum_for(:each_xdes)
+    end
+
+    each_xdes_page do |xdes_page|
+      xdes_page.each_xdes do |xdes|
+        # Only return initialized XDES entries; :state will be nil for extents
+        # that have not been allocated yet.
+        yield xdes if xdes.xdes[:state]
+      end
+    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(start_page=0)

data/lib/innodb/version.rb

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

metadata

@@ -1,35 +1,48 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: innodb_ruby
-version: !ruby/object:Gem::Version
-  version: 0.7.6
+version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 7
+  version: 0.7.7
 platform: ruby
-authors:
+authors: 
 - Jeremy Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-09 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bindata
-  requirement: &70346481414780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 4
+        - 5
         version: 1.4.5
   type: :runtime
-  prerelease: false
-  version_requirements: *70346481414780
+  version_requirements: *id001
 description: Library for parsing InnoDB data files in Ruby
 email: jeremy@jcole.us
-executables:
+executables: 
 - innodb_log
 - innodb_space
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README.md
 - lib/innodb.rb
 - lib/innodb/cursor.rb
@@ -52,27 +65,37 @@ files:
 - bin/innodb_space
 homepage: http://jcole.us/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: InnoDB data file parser
 test_files: []
+
 has_rdoc: