innodb_ruby 0.7.4 → 0.7.5

data/bin/innodb_space

@@ -5,7 +5,7 @@ require "ostruct"
 require "pp"
 require "innodb"
 
-def space_summary(space)
+def space_summary(space, start_page)
   puts "%-12s%-20s%-12s%-12s%-20s" % [
     "page",
     "type",
@@ -14,18 +14,18 @@ def space_summary(space)
     "lsn",
   ]
 
-  space.each_page do |page_number, page|
+  space.each_page(start_page) do |page_number, page|
     puts "%-12i%-20s%-12i%-12i%-20i" % [
       page_number,
       page.type,
-      page.prev,
-      page.next,
-      page.lsn,
+      page.prev || 0,
+      page.next || 0,
+      page.lsn || 0,
     ]
   end
 end
 
-def space_index_pages_summary(space)
+def space_index_pages_summary(space, start_page)
   puts "%-12s%-8s%-8s%-8s%-8s%-8s" % [
     "page",
     "index",
@@ -35,7 +35,7 @@ def space_index_pages_summary(space)
     "records",
   ]
 
-  space.each_page do |page_number, page|
+  space.each_page(start_page) do |page_number, page|
     case page.type
     when :INDEX
       puts "%-12i%-8i%-8i%-8i%-8i%-8i" % [
@@ -52,7 +52,7 @@ def space_index_pages_summary(space)
   end
 end
 
-def space_page_type_regions(space)
+def space_page_type_regions(space, start_page)
   puts "%-12s%-12s%-12s%-20s" % [
     "start",
     "end",
@@ -60,7 +60,7 @@ def space_page_type_regions(space)
     "type",
   ]
 
-  space.each_page_type_region do |region|
+  space.each_page_type_region(start_page) do |region|
     puts "%-12i%-12i%-12i%-20s" % [
       region[:start],
       region[:end],
@@ -185,14 +185,14 @@ def index_fseg_summary(index, fseg_name, list_name)
   print_xdes_list(fseg[list_name])
 end
 
-def space_index_pages_free_plot(space, image)
+def space_index_pages_free_plot(space, image, start_page)
   unless require "gnuplot"
     raise "Couldn't load gnuplot. Is it installed?"
   end
 
   index_data = {0 => {:x => [], :y => []}}
 
-  space.each_page do |page_number, page|
+  space.each_page(start_page) do |page_number, page|
     case page.type
     when :INDEX
       data = (index_data[page.page_header[:index_id]] ||= {:x => [], :y => []})
@@ -360,22 +360,26 @@ The following modes are supported:
     Dump the contents of the page, using the Ruby pp ("pretty-print") module.
 
   space-summary
-    Summarize all pages within a tablespace.
+    Summarize all pages within a tablespace. A starting page number can be
+    provided with the --page/-p argument.
 
   space-index-pages-summary
     Summarize all "INDEX" pages within a tablespace. This is useful to analyze
     page fill rates and record counts per page. In addition to "INDEX" pages,
     "ALLOCATED" pages are also printed and assumed to be completely empty.
+    A starting page number can be provided with the --page/-p argument.
 
   space-index-pages-free-plot
     Use Ruby's gnuplot module to produce a scatterplot of page free space for
     all "INDEX" and "ALLOCATED" pages in a tablespace. More aesthetically
     pleasing plots can be produced with space-index-pages-summary output,
-    but this is a quick and easy way to produce a passable plot.
+    but this is a quick and easy way to produce a passable plot. A starting
+    page number can be provided with the --page/-p argument.
 
   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.
+    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.
@@ -485,14 +489,14 @@ ARGV.each do |mode|
       space.page(page).dump
     end
   when "space-summary"
-    space_summary(space)
+    space_summary(space, @options.pages.first || 0)
   when "space-index-pages-summary"
-    space_index_pages_summary(space)
+    space_index_pages_summary(space, @options.pages.first || 0)
   when "space-index-pages-free-plot"
     name = File.basename(@options.file).sub(".ibd", "")
-    space_index_pages_free_plot(space, name)
+    space_index_pages_free_plot(space, name, @options.pages.first || 0)
   when "space-page-type-regions"
-    space_page_type_regions(space)
+    space_page_type_regions(space, @options.pages.first || 0)
   when "space-lists"
     space_lists(space)
   when "space-indexes"

data/lib/innodb/page/index.rb

@@ -380,7 +380,15 @@ class Innodb::Page::Index < Innodb::Page
       # fields, a transaction ID and roll pointer.
       if level == 0 && record_format[:type] == :clustered
         this_record[:transaction_id] = c.get_hex(6)
-        this_record[:roll_pointer]   = c.get_hex(7)
+        first_byte = c.get_uint8
+        this_record[:roll_pointer]   = {
+          :is_insert  => (first_byte & 0x80) == 0x80,
+          :rseg_id    => first_byte & 0x7f,
+          :undo_log => {
+            :page       => c.get_uint32,
+            :offset     => c.get_uint16,
+          }
+        }
       end
 
       # If this is a leaf page of the clustered index, or any page of a

data/lib/innodb/space.rb

@@ -84,12 +84,12 @@ class Innodb::Space
 
   # Iterate through all pages in a tablespace, returning the page number
   # and an Innodb::Page object for each one.
-  def each_page
+  def each_page(start_page=0)
     unless block_given?
       return Enumerable::Enumerator.new(self, :each_page)
     end
 
-    (0...@pages).each do |page_number|
+    (start_page...@pages).each do |page_number|
       current_page = page(page_number)
       yield page_number, current_page if current_page
     end
@@ -97,13 +97,13 @@ class Innodb::Space
 
   # 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
+  def each_page_type_region(start_page=0)
     unless block_given?
       return Enumerable::Enumerator.new(self, :each_page_type_region)
     end
 
     region = nil
-    each_page do |page_number, page|
+    each_page(start_page) do |page_number, page|
       if region && region[:type] == page.type
         region[:end] = page_number
         region[:count] += 1

data/lib/innodb/version.rb

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

data/lib/innodb/xdes.rb

@@ -1,3 +1,5 @@
+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.
 #
@@ -86,7 +88,9 @@ class Innodb::Xdes
       return Enumerable::Enumerator.new(self, :each_page_status)
     end
 
-    xdes[:bitmap].bytes.each_with_index do |byte, byte_index|
+    bitmap = Enumerable::Enumerator.new(xdes[:bitmap], :each_byte)
+
+    bitmap.each_with_index do |byte, byte_index|
       (0..3).each_with_index do |page, page_index|
         page_number = xdes[:start_page] + (byte_index * 4) + page_index
         page_bits = ((byte >> (page * BITS_PER_PAGE)) & BITMAP_BV_ALL)
@@ -125,4 +129,4 @@ class Innodb::Xdes
   def next_address
     xdes[:list][:next]
   end
-end
+end

metadata

@@ -1,48 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: innodb_ruby
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.7.5
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 4
-  version: 0.7.4
 platform: ruby
-authors: 
+authors:
 - Jeremy Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bindata
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70358166884520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 4
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70358166884520
 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
@@ -65,37 +52,27 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: InnoDB data file parser
 test_files: []
-
 has_rdoc: