innodb_ruby 0.8.7 → 0.8.8

data/bin/innodb_space

@@ -388,7 +388,7 @@ def page_directory_summary(page)
     record = page.record(offset)
     key = if [:conventional, :node_pointer].include? record.header[:type]
       if record.key
-        "(%s)" % record.key.map { |r| "%s=%s" % [r[:name], r[:value]] }.join(", ")
+        "(%s)" % record.key_string,
       end
     end
     puts "%-8i%-8i%-14s%-8i%s" % [
@@ -443,8 +443,8 @@ def index_recurse(index)
         page.each_record do |record|
           puts "%sRECORD: (%s) -> (%s)" % [
             "  " * (depth+1),
-            record.key.map { |r| "%s=%s" % [r[:name], r[:value]] }.join(", "),
-            record.row.map { |r| "%s=%s" % [r[:name], r[:value]] }.join(", "),
+            record.key_string,
+            record.row_string,
           ]
         end
       end
@@ -533,7 +533,7 @@ def index_level_summary(index, levels)
         page.record_space,
         page.free_space,
         page.records,
-        page.first_record.key.map { |r| r[:value] }.join("|"),
+        page.first_record.key_string,
       ]
     end
   end

data/lib/innodb/index.rb

@@ -87,7 +87,7 @@ class Innodb::Index
     page = @root
     record = @root.first_record
     while record && page.level > level
-      page = page(record[:child_page_number])
+      page = page(record.child_page_number)
       record = page.first_record
     end
     page if page.level == level
@@ -185,8 +185,8 @@ class Innodb::Index
 
     a.each_index do |i|
       @stats[:compare_key_field_comparison] += 1
-      return -1 if a[i] < b[i]
-      return +1 if a[i] > b[i]
+      return -1 if a[i] < b[i][:value]
+      return +1 if a[i] > b[i][:value]
     end
 
     return 0
@@ -206,7 +206,7 @@ class Innodb::Index
       puts "linear_search_from_cursor: page=%i, level=%i, start=(%s)" % [
         page.offset,
         page.level,
-        this_rec && this_rec[:key].map { |r| r[:value] }.join(", "),
+        this_rec && this_rec.key_string,
       ]
     end
 
@@ -219,19 +219,19 @@ class Innodb::Index
         puts "linear_search_from_cursor: page=%i, level=%i, current=(%s)" % [
           page.offset,
           page.level,
-          this_rec && this_rec[:key].map { |r| r[:value] }.join(", "),
+          this_rec && this_rec.key_string,
         ]
       end
 
       # If we reach supremum, return the last non-system record we got.
-      return this_rec if next_rec[:header][:type] == :supremum
+      return this_rec if next_rec.header[:type] == :supremum
 
-      if compare_key(key, this_rec[:key][:value]) < 0
+      if compare_key(key, this_rec.key) < 0
         return this_rec
       end
 
-      if (compare_key(key, this_rec[:key][:value]) >= 0) &&
-        (compare_key(key, next_rec[:key][:value]) < 0)
+      if (compare_key(key, this_rec.key) >= 0) &&
+        (compare_key(key, next_rec.key) < 0)
         # The desired key is either an exact match for this_rec or is greater
         # than it but less than next_rec. If this is a non-leaf page, that
         # will mean that the record will fall on the leaf page this node
@@ -268,7 +268,7 @@ class Innodb::Index
         page.level,
         dir.size,
         mid,
-        rec[:key] && rec[:key].map { |r| r[:value] }.join(", "),
+        rec.key_string,
       ]
     end
 
@@ -276,12 +276,12 @@ class Innodb::Index
     # compare_key, so we need to just linear scan from here. If the mid-point
     # is the beginning of the page there can't be many records left to check
     # anyway.
-    if rec[:header][:type] == :infimum
-      return linear_search_from_cursor(page, page.record_cursor(rec[:next]), key)
+    if rec.header[:type] == :infimum
+      return linear_search_from_cursor(page, page.record_cursor(rec.next), key)
     end
 
     # Compare the desired key to the mid-point record's key.
-    case compare_key(key, rec[:key][:value])
+    case compare_key(key, rec.key)
     when 0
       # An exact match for the key was found. Return the record.
       @stats[:binary_search_by_directory_exact_match] += 1
@@ -297,16 +297,16 @@ class Innodb::Index
         binary_search_by_directory(page, dir[mid...dir.size], key)
       else
         next_rec = page.record(dir[mid+1])
-        next_key = next_rec && compare_key(key, next_rec[:key][:value])
+        next_key = next_rec && compare_key(key, next_rec.key)
         if dir.size == 1 || next_key == -1 || next_key == 0
           # This is the last entry remaining from the directory, or our key is
           # greater than rec and less than rec+1's key. Use linear search to
           # find the record starting at rec.
           @stats[:binary_search_by_directory_linear_search] += 1
-          linear_search_from_cursor(page, page.record_cursor(rec[:offset]), key)
+          linear_search_from_cursor(page, page.record_cursor(rec.offset), key)
         elsif next_key == +1
           @stats[:binary_search_by_directory_linear_search] += 1
-          linear_search_from_cursor(page, page.record_cursor(next_rec[:offset]), key)
+          linear_search_from_cursor(page, page.record_cursor(next_rec.offset), key)
         else
           nil
         end
@@ -346,16 +346,16 @@ class Innodb::Index
     end
 
     while rec =
-      linear_search_from_cursor(page, page.record_cursor(page.infimum[:next]), key)
+      linear_search_from_cursor(page, page.record_cursor(page.infimum.next), key)
       if page.level > 0
         # If we haven't reached a leaf page yet, move down the tree and search
         # again using linear search.
-        page = page(rec[:child_page_number])
+        page = page(rec.child_page_number)
       else
         # We're on a leaf page, so return the page and record if there is a
         # match. If there is no match, break the loop and cause nil to be
         # returned.
-        return page, rec if compare_key(key, rec[:key][:value]) == 0
+        return page, rec if compare_key(key, rec.key) == 0
         break
       end
     end
@@ -383,12 +383,12 @@ class Innodb::Index
       if page.level > 0
         # If we haven't reached a leaf page yet, move down the tree and search
         # again using binary search.
-        page = page(rec[:child_page_number])
+        page = page(rec.child_page_number)
       else
         # We're on a leaf page, so return the page and record if there is a
         # match. If there is no match, break the loop and cause nil to be
         # returned.
-        return page, rec if compare_key(key, rec[:key][:value]) == 0
+        return page, rec if compare_key(key, rec.key) == 0
         break
       end
     end

data/lib/innodb/record.rb

@@ -23,10 +23,18 @@ class Innodb::Record
     record[:key]
   end
 
+  def key_string
+    key && key.map { |r| "%s=%s" % [r[:name], r[:value]] }.join(", ")
+  end
+
   def row
     record[:row]
   end
 
+  def row_string
+    key && key.map { |r| "%s=%s" % [r[:name], r[:value]] }.join(", ")
+  end
+
   def child_page_number
     record[:child_page_number]
   end

data/lib/innodb/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module Innodb
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: innodb_ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
   prerelease: 
 platform: ruby
 authors: