innodb_ruby 0.6.1 → 0.6.2

data/lib/innodb/page/fsp_hdr_xdes.rb

@@ -5,7 +5,7 @@ class Innodb::Page::FspHdrXdes < Innodb::Page
   XDES_BITMAP_SIZE = (64 * XDES_BITS_PER_PAGE) / 8
   XDES_SIZE = 8 + Innodb::FreeList::NODE_SIZE + 4 + XDES_BITMAP_SIZE
 
-  XDES_N_ARRAY_ENTRIES  = 10
+  XDES_N_ARRAY_ENTRIES = 256
 
   def pos_fsp_header
     pos_fil_header + size_fil_header
@@ -28,6 +28,7 @@ class Innodb::Page::FspHdrXdes < Innodb::Page
       :free_limit         => c.get_uint32,
       :flags              => c.get_uint32,
       :frag_n_used        => c.get_uint32,
+      :free               => Innodb::FreeList::get_base_node(c),
       :free_frag          => Innodb::FreeList::get_base_node(c),
       :full_frag          => Innodb::FreeList::get_base_node(c),
       :first_unused_seg   => c.get_uint64,
@@ -46,9 +47,10 @@ class Innodb::Page::FspHdrXdes < Innodb::Page
   def read_xdes(cursor)
     {
       :xdes_id    => cursor.get_uint64,
+      :position   => cursor.position,
       :free_list  => Innodb::FreeList::get_node(cursor),
       :state      => XDES_STATES[cursor.get_uint32],
-      :bitmap     => cursor.get_bytes(XDES_BITMAP_SIZE),
+      :bitmap     => cursor.get_hex(XDES_BITMAP_SIZE),
     }
   end
   

data/lib/innodb/page/inode.rb

@@ -6,37 +6,50 @@ class Innodb::Page::Inode < Innodb::Page
 
   MAGIC_N_VALUE	= 97937874
 
-  def pos_inode_header
+  def pos_inode_list
     pos_fil_header + size_fil_header + Innodb::FreeList::NODE_SIZE
   end
 
-  def size_inode_header
+  def size_inode
     (16 + (3 * Innodb::FreeList::BASE_NODE_SIZE) +
       (FRAG_ARRAY_N_SLOTS * FRAG_SLOT_SIZE))
   end
 
+  def inodes_per_page
+    (size - pos_inode_list - 10) / size_inode
+  end
+
   def uint32_array(size, cursor)
     size.times.map { |n| cursor.get_uint32 }
   end
 
-  def inode_header
-    c = cursor(pos_inode_header)
+  def inode(cursor)
     {
-      :fseg_id            => c.get_uint64,
-      :not_full_n_used    => c.get_uint32,
-      :free               => Innodb::FreeList.get_base_node(c),
-      :not_full           => Innodb::FreeList.get_base_node(c),
-      :full               => Innodb::FreeList.get_base_node(c),
-      :magic_n            => c.get_uint32,
-      :frag_array         => uint32_array(FRAG_ARRAY_N_SLOTS, c),
+      :fseg_id            => cursor.get_uint64,
+      :not_full_n_used    => cursor.get_uint32,
+      :free               => Innodb::FreeList.get_base_node(cursor),
+      :not_full           => Innodb::FreeList.get_base_node(cursor),
+      :full               => Innodb::FreeList.get_base_node(cursor),
+      :magic_n            => cursor.get_uint32,
+      :frag_array         => uint32_array(FRAG_ARRAY_N_SLOTS, cursor),
     }
   end
 
+  def each_inode
+    inode_cursor = cursor(pos_inode_list)
+    inodes_per_page.times do
+      this_inode = inode(inode_cursor)
+      yield this_inode if this_inode[:fseg_id] != 0
+    end
+  end
+
   def dump
     super
 
-    puts "inode header:"
-    pp inode_header
+    puts "inodes:"
+    each_inode do |i|
+      pp i
+    end
     puts
   end
 end

data/lib/innodb/version.rb

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

metadata

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