innodb_ruby 0.8.5 → 0.8.6

data/bin/innodb_log

@@ -5,12 +5,37 @@ require "ostruct"
 require "set"
 require "innodb"
 
+def log_summary(log, space_ids)
+  puts "%-10s%-30s%-10s%-10s" % [
+    "block",
+    "type",
+    "space",
+    "page",
+  ]
+  log.each_block do |block_number, block|
+    if block.record
+      space_id = block.record[:space]
+      if @options.space_ids.empty? or @options.space_ids.include?(space_id)
+        puts "%-10i%-30s%-10i%-10i" % [
+          block_number,
+          block.record[:type],
+          space_id,
+          block.record[:page_number],
+        ]
+        if @options.dump
+          block.dump
+        end
+      end
+    end
+  end
+end
+
 def usage(exit_code, message = nil)
   print "Error: #{message}\n" unless message.nil?
 
   print <<'END_OF_USAGE'
 
-Usage: innodb_log [-d] [-s] <file> [block-number]
+Usage: innodb_log [-d] [-s] <file> [<mode>]
 
   --help, -?
     Print this usage text.
@@ -21,6 +46,11 @@ Usage: innodb_log [-d] [-s] <file> [block-number]
   --space-id, -s
     Print only given space id (may provide multiple times).
 
+The following modes are supported:
+
+  log-summary (default)
+    A summary of all blocks within log that contain at least one record.
+
 END_OF_USAGE
 
   exit exit_code
@@ -49,32 +79,18 @@ getopt.each do |opt, arg|
   end
 end
 
-filename, block_number = ARGV.shift(2)
+filename, mode = ARGV.shift(2)
 if filename.nil?
   usage 1
 end
 
 log = Innodb::Log.new(filename)
 
-puts "%-10s%-30s%-10s%-10s" % [
-  "block",
-  "type",
-  "space",
-  "page",
-]
-log.each_block do |block_number, block|
-  if block.record
-    space_id = block.record[:space]
-    if @options.space_ids.empty? or @options.space_ids.include?(space_id)
-      puts "%-10i%-30s%-10i%-10i" % [
-        block_number,
-        block.record[:type],
-        space_id,
-        block.record[:page_number],
-      ]
-      if @options.dump
-        block.dump
-      end
-    end
-  end
+mode ||= "log-summary"
+
+case mode
+when "log-summary"
+  log_summary(log, @options.space_ids)
+else
+  usage 1, "Unknown mode: #{mode}"
 end

data/lib/innodb/inode.rb

@@ -88,7 +88,7 @@ class Innodb::Inode
 
   # Calculate the total number of pages in use (not free) within this fseg.
   def used_pages
-    frag_array_n_used + not_full_n_used
+    frag_array_n_used + not_full_n_used +
       (full.length * @space.pages_per_extent)
   end
 

data/lib/innodb/system.rb

@@ -48,6 +48,36 @@ class Innodb::System
     end
   end
 
+  def object_by_field(method, field, value)
+    send(method).select { |o| o[field] == value }.first
+  end
+
+  def object_by_two_fields(method, f1, v1, f2, v2)
+    send(method).select { |o| o[f1] == v1 && o[f2] == v2 }.first
+  end
+
+  def table_by_id(value)
+    object_by_field(:each_table, "ID", value)
+  end
+
+  def table_by_name(value)
+    object_by_field(:each_table, "NAME", value)
+  end
+
+  def index_by_id(value)
+    object_by_field(:each_index, "ID", value)
+  end
+
+  def index_by_name(table_name, index_name)
+    unless table = table_by_name(table_name)
+      return nil
+    end
+
+    object_by_two_fields(:each_index,
+                         "TABLE_ID", table["ID"],
+                         "NAME", index_name)
+  end
+
   def add_space(space)
     @spaces[space.space_id] = space
   end

data/lib/innodb/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: innodb_ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata