innodb_ruby 0.9.14 → 0.12.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: c2dd793281e3b83403e55c8d4e9104898d5df6099af80dd4453795a524e3fb32
+  data.tar.gz: d6ac28ab11759a618f9a84af611a705644f5f47f9c1cd387360b628bac88f527
+SHA512:
+  metadata.gz: ffb5ba4b9805d4cb78aaecaec92adb4e6064d73a9349fbeb43fcc938b958adeb14f140747dd540f76d31bbf9a38fbde259bd99f3a9cc64f32a1456efc2006997
+  data.tar.gz: 9e98bd61fe4448fdbb15be66975581fe65d97c342685c21f2309ead8b0ed1fc217b08baf2855c336d8ea426e22b7c0556e0926064722e6cc23a95312a6a63ca4

data/README.md

@@ -1,4 +1,7 @@
-# A parser for InnoDB file formats, in Ruby #
+# A parser for InnoDB file formats, in Ruby
+
+[![rspec test status](https://github.com/jeremycole/innodb_ruby/actions/workflows/rspec.yml/badge.svg)](https://github.com/jeremycole/innodb_ruby/actions/workflows/rspec.yml)
+[![rubocop style check status](https://github.com/jeremycole/innodb_ruby/actions/workflows/rubocop.yml/badge.svg)](https://github.com/jeremycole/innodb_ruby/actions/workflows/rubocop.yml)
 
 The purpose for this library and tools is to expose some otherwise hidden internals of InnoDB. This code is not intended for critical production usage. It is definitely buggy, and it may be dangerous. Neither its internal APIs or its output are considered stable and are subject to change at any time.
 
@@ -11,11 +14,7 @@ It is intended as for a few purposes:
 
 Various parts of this library and the tools included may have wildly differing maturity levels, as it is worked on primarily based on immediate needs of the authors.
 
-# Resources #
+# Resources
 
 * The [innodb_ruby wiki](https://github.com/jeremycole/innodb_ruby/wiki) contains some additional references and documentation to help you get started.
-* Visit the [innodb_ruby mailing list on Google Groups](https://groups.google.com/d/forum/innodb_ruby) or email [innodb_ruby@googlegroups.com](mailto:innodb_ruby@googlegroups.com) — If you have questions about `innodb_ruby` or its usage.
 * See the [RubyGems page for innodb_ruby](http://rubygems.org/gems/innodb_ruby) — Gem packaged releases are published regularly to RubyGems.org, which also provides online documentation.
-
-
-[![Build Status](https://travis-ci.org/jeremycole/innodb_ruby.svg?branch=master)](https://travis-ci.org/jeremycole/innodb_ruby)

data/bin/innodb_log

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 
 require "getoptlong"
 require "ostruct"
@@ -7,15 +7,9 @@ require "set"
 require "innodb"
 
 def log_summary(log_group)
-  puts "%-20s%-15s%-10s%-12s%-10s" % [
-    "lsn",
-    "block",
-    "length",
-    "first_rec",
-    "checkpoint",
-  ]
+  puts "%-20s%-15s%-10s%-12s%-10s" % %w[lsn block length first_rec checkpoint]
   lsn = log_group.start_lsn.first
-  log_group.each_block do |block_index, block|
+  log_group.each_block do |_block_index, block|
     header = block.header
     puts "%-20i%-15i%-10i%-12i%-10i" % [
       lsn,
@@ -30,14 +24,7 @@ def log_summary(log_group)
 end
 
 def log_reader_record_summary(reader, follow)
-  puts "%-10s%-10s%-20s%-10s%-10s%-10s" % [
-    "time",
-    "lsn",
-    "type",
-    "size",
-    "space",
-    "page"
-  ]
+  puts "%-10s%-10s%-20s%-10s%-10s%-10s" % %w[time lsn type size space page]
 
   reader.each_record(follow) do |rec|
     preamble = rec.preamble.dup
@@ -72,6 +59,7 @@ end
 def usage(exit_code, message = nil)
   print "Error: #{message}\n" unless message.nil?
 
+  # rubocop:disable Layout/HeredocIndentation
   print <<'END_OF_USAGE'
 
 Usage: innodb_log [-d] [-l <lsn>] -f <log file> <mode>
@@ -103,6 +91,7 @@ The following modes are supported:
     Dump the contents of a log record, using the Ruby pp ("pretty-print") module.
 
 END_OF_USAGE
+  # rubocop:enable Layout/HeredocIndentation
 
   exit exit_code
 end
@@ -112,12 +101,14 @@ end
 @options.dump = false
 @options.lsn = nil
 
+# rubocop:disable Layout/SpaceInsideArrayLiteralBrackets
 getopt_options = [
   [ "--help",                   "-?",     GetoptLong::NO_ARGUMENT ],
   [ "--log-file",               "-f",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--dump-blocks",            "-d",     GetoptLong::NO_ARGUMENT ],
   [ "--lsn",                    "-l",     GetoptLong::REQUIRED_ARGUMENT ],
 ]
+# rubocop:enable Layout/SpaceInsideArrayLiteralBrackets
 
 getopt = GetoptLong.new(*getopt_options)
 
@@ -136,6 +127,8 @@ end
 
 mode = ARGV.shift
 
+# rubocop:disable Style/IfUnlessModifier
+
 unless mode
   usage 1, "At least one mode must be provided"
 end
@@ -144,10 +137,12 @@ if @options.log_files.empty?
   usage 1, "At least one log file (-f) must be specified"
 end
 
-if /^(log-)?record-/.match(mode) and !@options.lsn
+if /^(log-)?record-/.match(mode) && !@options.lsn
   usage 1, "LSN must be specified using -l/--lsn"
 end
 
+# rubocop:enable Style/IfUnlessModifier
+
 log_group = Innodb::LogGroup.new(@options.log_files.sort)
 
 case mode

data/bin/innodb_space

@@ -1,27 +1,36 @@
 #!/usr/bin/env ruby
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 
 require "getoptlong"
 require "ostruct"
+require "histogram/array"
 require "innodb"
 
+class String
+  def squish!
+    gsub!(/[[:space:]]+/, " ")
+    strip!
+    self
+  end
+
+  def squish
+    dup.squish!
+  end
+end
+
 # Convert a floating point RGB array into an ANSI color number approximating it.
 def rgb_to_ansi(rgb)
   rgb_n = rgb.map { |c| (c * 5.0).round }
   16 + (rgb_n[0] * 36) + (rgb_n[1] * 6) + rgb_n[2]
 end
 
-def rgb_to_rgbhex(rgb)
-  rgb.map { |c| "%02x" % [(c * 255.0).round] }.join
-end
-
 # Interpolate intermediate float-arrays between two float-arrays. Do not
 # include the points a and b in the result.
-def interpolate(a, b, count)
-  deltas = a.each_index.map { |i| b[i] - a[i] }
-  steps = a.each_index.map { |i| deltas[i].to_f / (count.to_f + 1) }
+def interpolate(ary_a, ary_b, count)
+  deltas = ary_a.each_index.map { |i| ary_b[i] - ary_a[i] }
+  steps = ary_a.each_index.map { |i| deltas[i].to_f / (count.to_f + 1) }
 
-  count.times.to_a.map { |i| a.each_index.map { |j| a[j] + ((i+1).to_f * steps[j]) } }
+  count.times.to_a.map { |i| ary_a.each_index.map { |j| ary_a[j] + ((i + 1).to_f * steps[j]) } }
 end
 
 # Interpolate intermediate float-arrays between each step in a sequence of
@@ -29,7 +38,7 @@ end
 def interpolate_sequence(sequence, count)
   result = []
   result << sequence.first
-  (sequence.size-1).times.map { |n| [sequence[n], sequence[n+1]] }.each do |from, to|
+  (sequence.size - 1).times.map { |n| [sequence[n], sequence[n + 1]] }.each do |from, to|
     interpolate(from, to, count).each do |step|
       result << step
     end
@@ -48,15 +57,11 @@ HEATMAP_PROGRESSION = [
   [1.0, 1.0, 0.0], # Yellow
   [1.0, 0.0, 0.0], # Red
   [1.0, 0.0, 1.0], # Purple
-]
+].freeze
 
 # Typical heatmap color progression.
 ANSI_COLORS_HEATMAP = interpolate_sequence(HEATMAP_PROGRESSION, 6).map { |rgb| rgb_to_ansi(rgb) }
 
-RGBHEX_COLORS_HEATMAP = interpolate_sequence(HEATMAP_PROGRESSION, 41).map { |rgb| rgb_to_rgbhex(rgb) }
-
-RGBHEX_COLORS_RANDOM = 100.times.inject([]) { |a, x| a << rgb_to_rgbhex([rand * 0.7 + 0.25, rand * 0.7 + 0.25, rand * 0.7 + 0.25]) }
-
 # The 24-step grayscale progression.
 ANSI_COLORS_GRAYSCALE = (0xe8..0xff).to_a
 
@@ -66,69 +71,47 @@ def ansi_color(color, text)
 end
 
 # Zero and 1/8 through 8/8 illustrations.
-BLOCK_CHARS_V = ["░", "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
-BLOCK_CHARS_H = ["░", "▏", "▎", "▍", "▌", "▋", "▊", "▉", "█"]
+BLOCK_CHARS_V = "░▁▂▃▄▅▆▇█".chars.freeze
+BLOCK_CHARS_H = "░▏▎▍▌▋▊▉█".chars.freeze
 
 # A reasonably large prime number to multiply identifiers by in order to
 # space out the colors used for similar identifiers.
-COLOR_SPACING_PRIME = 999983
+COLOR_SPACING_PRIME = 999_983
 
 # Return a string with a possibly colored filled block for use in printing
 # to an ANSI-capable Unicode-enabled terminal.
-def filled_block(fraction, identifier=nil, block_chars=BLOCK_CHARS_V)
-  if fraction == 0.0
+def filled_block(fraction, identifier = nil, block_chars = BLOCK_CHARS_V)
+  if fraction.zero?
     block = block_chars[0]
   else
-    parts = (fraction.to_f * (block_chars.size.to_f-1)).floor
-    block = block_chars[[block_chars.size-1, parts+1].min]
+    parts = (fraction.to_f * (block_chars.size.to_f - 1)).floor
+    block = block_chars[[block_chars.size - 1, parts + 1].min]
   end
   if identifier
     # ANSI 256-color mode, color palette starts at 10 and contains 216 colors.
-    color = 16 + ((identifier * COLOR_SPACING_PRIME)  % 216)
+    color = 16 + ((identifier * COLOR_SPACING_PRIME) % 216)
     ansi_color(color, block)
   else
     block
   end
 end
 
-def svg_join_args(args)
-  args.map { |arg| "%s=\"%s\"" % [ arg[0], arg[1], ] }.join(" ")
-end
+def center(text, width)
+  return text if text.size >= width
 
-def svg(elem, args, content=nil)
-  if content
-    "<" + elem.to_s + " " + svg_join_args(args) + ">" +
-      content.to_s +
-      "</" + elem.to_s + ">"
-  else
-    "<" + elem.to_s + " " + svg_join_args(args) + " />"
-  end
-end
-
-def svg_path_rounded_rect(x, y, w, h, r)
-  [
-    "M%i,%i" % [ x + r, y - r ],
-    "L%i,%i" % [ x + w - r, y - r ],
-    "S%i,%i %i,%i" % [ x + w + r, y - r, x + w + r, y + r ],
-    "L%i,%i" % [ x + w + r, y + h - r ],
-    "S%i,%i %i,%i" % [ x + w + r, y + h + r, x + w - r, y + h + r ],
-    "L%i,%i" % [ x + r, y + h + r ],
-    "S%i,%i %i,%i" % [ x - r, y + h + r, x - r, y + h - r ],
-    "L%i,%i" % [ x - r, y + r ],
-    "S%i,%i %i,%i" % [ x - r, y - r, x + r, y - r ],
-    "Z",
-  ].join(" ")
+  spaces = (width - text.size) / 2
+  (" " * spaces) + text + (" " * spaces)
 end
 
 # Print metadata about each list in an array of InnoDB::List objects.
 def print_lists(lists)
-  puts "%-20s%-12s%-12s%-12s%-12s%-12s" % [
-    "name",
-    "length",
-    "f_page",
-    "f_offset",
-    "l_page",
-    "l_offset",
+  puts "%-20s%-12s%-12s%-12s%-12s%-12s" % %w[
+    name
+    length
+    f_page
+    f_offset
+    l_page
+    l_offset
   ]
 
   lists.each do |name, list|
@@ -146,33 +129,31 @@ end
 # Print a page usage bitmap for each extent descriptor in an array of
 # Innodb::XdesEntry objects.
 def print_xdes_list(space, list)
-  puts "%-12s%-64s" % [
-    "start_page",
-    "page_used_bitmap"
+  puts "%-12s%-64s" % %w[
+    start_page
+    page_used_bitmap
   ]
 
   list.each do |entry|
-    puts "%-12i%-64s" % [
-      entry.xdes[:start_page],
-      entry.each_page_status.inject("") { |bitmap, (page_number, page_status)|
-        if page_number < space.pages
-          bitmap += page_status[:free] ? "." : "#"
-        end
-        bitmap
-      },
-    ]
+    display = entry.each_page_status.inject("") do |bitmap, (page_number, page_status)|
+      if page_number < space.pages
+        bitmap += page_status[:free] ? "." : "#"
+      end
+      bitmap
+    end
+    puts "%-12i%-64s" % [entry.xdes[:start_page], display]
   end
 end
 
 # Print a summary of page usage for all pages in an index.
 def print_index_page_summary(pages)
-  puts "%-12s%-8s%-8s%-8s%-8s%-8s" % [
-    "page",
-    "index",
-    "level",
-    "data",
-    "free",
-    "records",
+  puts "%-12s%-8s%-8s%-8s%-8s%-8s" % %w[
+    page
+    index
+    level
+    data
+    free
+    records
   ]
 
   pages.each do |page_number, page|
@@ -187,17 +168,17 @@ def print_index_page_summary(pages)
         page.records,
       ]
     when :ALLOCATED
-      puts "%-12i%-8i%-8i%-8i%-8i%-8i" % [ page_number, 0, 0, 0, page.size, 0 ]
+      puts "%-12i%-8i%-8i%-8i%-8i%-8i" % [page_number, 0, 0, 0, page.size, 0]
     end
   end
 end
 
 # Print a summary of all spaces in the InnoDB system.
 def system_spaces(innodb_system)
-  puts "%-32s%-12s%-12s" % [
-    "name",
-    "pages",
-    "indexes",
+  puts "%-32s%-12s%-12s" % %w[
+    name
+    pages
+    indexes
   ]
 
   print_space_information = lambda do |name, space|
@@ -213,6 +194,7 @@ def system_spaces(innodb_system)
   innodb_system.each_table_name do |table_name|
     space = innodb_system.space_by_table_name(table_name)
     next unless space
+
     print_space_information.call(table_name, space)
   end
 
@@ -223,15 +205,15 @@ end
 
 # Print the contents of the SYS_TABLES data dictionary table.
 def data_dictionary_tables(innodb_system)
-  puts "%-32s%-12s%-12s%-12s%-12s%-12s%-15s%-12s" % [
-    "name",
-    "id",
-    "n_cols",
-    "type",
-    "mix_id",
-    "mix_len",
-    "cluster_name",
-    "space",
+  puts "%-32s%-12s%-12s%-12s%-12s%-12s%-15s%-12s" % %w[
+    name
+    id
+    n_cols
+    type
+    mix_id
+    mix_len
+    cluster_name
+    space
   ]
 
   innodb_system.data_dictionary.each_table do |record|
@@ -250,14 +232,14 @@ end
 
 # Print the contents of the SYS_COLUMNS data dictionary table.
 def data_dictionary_columns(innodb_system)
-  puts "%-12s%-6s%-32s%-12s%-12s%-6s%-6s" % [
-    "table_id",
-    "pos",
-    "name",
-    "mtype",
-    "prtype",
-    "len",
-    "prec",
+  puts "%-12s%-6s%-32s%-12s%-12s%-6s%-6s" % %w[
+    table_id
+    pos
+    name
+    mtype
+    prtype
+    len
+    prec
   ]
 
   innodb_system.data_dictionary.each_column do |record|
@@ -275,14 +257,14 @@ end
 
 # Print the contents of the SYS_INDEXES data dictionary table.
 def data_dictionary_indexes(innodb_system)
-  puts "%-12s%-12s%-32s%-10s%-6s%-12s%-12s" % [
-    "table_id",
-    "id",
-    "name",
-    "n_fields",
-    "type",
-    "space",
-    "page_no",
+  puts "%-12s%-12s%-32s%-10s%-6s%-12s%-12s" % %w[
+    table_id
+    id
+    name
+    n_fields
+    type
+    space
+    page_no
   ]
 
   innodb_system.data_dictionary.each_index do |record|
@@ -300,10 +282,10 @@ end
 
 # Print the contents of the SYS_FIELDS data dictionary table.
 def data_dictionary_fields(innodb_system)
-  puts "%-12s%-12s%-32s" % [
-    "index_id",
-    "pos",
-    "col_name",
+  puts "%-12s%-12s%-32s" % %w[
+    index_id
+    pos
+    col_name
   ]
 
   innodb_system.data_dictionary.each_field do |record|
@@ -316,12 +298,12 @@ def data_dictionary_fields(innodb_system)
 end
 
 def space_summary(space, start_page)
-  puts "%-12s%-20s%-12s%-12s%-20s" % [
-    "page",
-    "type",
-    "prev",
-    "next",
-    "lsn",
+  puts "%-12s%-20s%-12s%-12s%-20s" % %w[
+    page
+    type
+    prev
+    next
+    lsn
   ]
 
   space.each_page(start_page) do |page_number, page|
@@ -339,12 +321,16 @@ def space_index_pages_summary(space, start_page)
   print_index_page_summary(space.each_page(start_page))
 end
 
+def space_index_fseg_pages_summary(space, fseg_id)
+  print_index_page_summary(space.inode(fseg_id).each_page)
+end
+
 def space_page_type_regions(space, start_page)
-  puts "%-12s%-12s%-12s%-20s" % [
-    "start",
-    "end",
-    "count",
-    "type",
+  puts "%-12s%-12s%-12s%-20s" % %w[
+    start
+    end
+    count
+    type
   ]
 
   space.each_page_type_region(start_page) do |region|
@@ -363,16 +349,16 @@ def space_page_type_summary(space, start_page)
   page_count = 0
   # A Hash of page type => count.
   page_type = Hash.new(0)
-  space.each_page(start_page) do |page_number, page|
+  space.each_page(start_page) do |_page_number, page|
     page_count += 1
     page_type[page.type] += 1
   end
 
-  puts "%-20s%-12s%-12s%-20s" % [
-    "type",
-    "count",
-    "percent",
-    "description",
+  puts "%-20s%-12s%-12s%-20s" % %w[
+    type
+    count
+    percent
+    description
   ]
 
   # Sort the page type Hash by count, descending.
@@ -380,7 +366,7 @@ def space_page_type_summary(space, start_page)
     puts "%-20s%-12i%-12.2f%-20s" % [
       type,
       type_count,
-      100.0 * (type_count.to_f / page_count.to_f),
+      100.0 * (type_count.to_f / page_count),
       Innodb::Page::PAGE_TYPE[type][:description],
     ]
   end
@@ -393,16 +379,14 @@ end
 def space_list_iterate(space, list_name)
   fsp = space.page(0).fsp_header
 
-  unless fsp[list_name] && fsp[list_name].is_a?(Innodb::List)
-    raise "List '#{list_name}' doesn't exist"
-  end
+  raise "List '#{list_name}' doesn't exist" unless fsp[list_name].is_a?(Innodb::List)
 
   case fsp[list_name]
   when Innodb::List::Xdes
     print_xdes_list(space, fsp[list_name])
   when Innodb::List::Inode
-    puts "%-12s" % [
-      "page",
+    puts "%-12s" % %w[
+      page
     ]
     fsp[list_name].each do |page|
       puts "%-12i" % [
@@ -413,23 +397,25 @@ def space_list_iterate(space, list_name)
 end
 
 def space_indexes(innodb_system, space)
-  puts "%-12s%-32s%-12s%-12s%-12s%-12s%-12s" % [
-    "id",
-    "name",
-    "root",
-    "fseg",
-    "used",
-    "allocated",
-    "fill_factor",
+  puts "%-12s%-32s%-12s%-12s%-12s%-12s%-12s%-12s" % %w[
+    id
+    name
+    root
+    fseg
+    fseg_id
+    used
+    allocated
+    fill_factor
   ]
 
   space.each_index do |index|
     index.each_fseg do |fseg_name, fseg|
-      puts "%-12i%-32s%-12i%-12s%-12i%-12i%-12s" % [
+      puts "%-12i%-32s%-12i%-12s%-12i%-12i%-12i%-12s" % [
         index.id,
         innodb_system ? innodb_system.index_name_by_id(index.id) : "",
         index.root.offset,
         fseg_name,
+        fseg.fseg_id,
         fseg.used_pages,
         fseg.total_pages,
         "%.2f%%" % fseg.fill_factor,
@@ -438,17 +424,15 @@ def space_indexes(innodb_system, space)
   end
 end
 
-def space_index_pages_free_plot(space, image, start_page)
-  unless require "gnuplot"
-    raise "Couldn't load gnuplot. Is it installed?"
-  end
+def space_index_pages_free_plot(space, start_page)
+  raise "Could not load gnuplot. Is it installed?" unless require "gnuplot"
 
-  index_data = {0 => {:x => [], :y => []}}
+  index_data = { 0 => { x: [], y: [] } }
 
   space.each_page(start_page) do |page_number, page|
     case page.type
     when :INDEX
-      data = (index_data[page.page_header[:index_id]] ||= {:x => [], :y => []})
+      data = (index_data[page.page_header[:index_id]] ||= { x: [], y: [] })
       data[:x] << page_number
       data[:y] << page.free_space
     when :ALLOCATED
@@ -457,15 +441,17 @@ def space_index_pages_free_plot(space, image, start_page)
     end
   end
 
-  image_file = image + "_free.png"
+  image_name = space.name.sub(".ibd", "").gsub(/[^a-zA-Z0-9_]/, "_").sub(/\A_+/, "")
+  image_file = "#{image_name}_free.png"
+
   # Aim for one horizontal pixel per extent, but min 1k and max 10k width.
-  image_width = [10000, [1000, space.pages / space.pages_per_extent].max].min
+  image_width = [10_000, [1_000, space.pages / space.pages_per_extent].max].min
 
   Gnuplot.open do |gp|
     Gnuplot::Plot.new(gp) do |plot|
       plot.terminal "png size #{image_width}, 800"
       plot.output image_file
-      plot.title image
+      plot.title image_name.gsub("_", " ")
       plot.key "reverse left top box horizontal Left textcolor variable"
       plot.ylabel "free space per page"
       plot.xlabel "page number"
@@ -475,7 +461,7 @@ def space_index_pages_free_plot(space, image, start_page)
       index_data.sort.each do |id, data|
         plot.data << Gnuplot::DataSet.new([data[:x], data[:y]]) do |ds|
           ds.with = "dots"
-          ds.title = id == 0 ? "Unallocated" : "Index #{id}"
+          ds.title = id.zero? ? "Unallocated" : "Index #{id}"
         end
       end
 
@@ -488,279 +474,99 @@ def space_extents(space)
   print_xdes_list(space, space.each_xdes)
 end
 
+# rubocop:disable Metrics/BlockNesting
+def space_extents_illustrate_page_status(space, entry, count_by_identifier, identifiers)
+  entry.each_page_status.each_with_object("".dup) do |(page_number, page_status), bitmap|
+    if page_number >= space.pages
+      bitmap << " "
+      next
+    end
+
+    used_fraction = 1.0
+    identifier = nil
+    if page_status[:free]
+      used_fraction = 0.0
+    else
+      page = space.page(page_number)
+      used_fraction = page.used_space.to_f / page.size if page.respond_to?(:used_space)
+      if page.respond_to?(:index_id)
+        identifier = page.index_id
+        unless identifiers[identifier]
+          identifiers[identifier] = page.ibuf_index? ? "Insert Buffer Index" : "Index #{page.index_id}"
+          if space.innodb_system
+            table, index = space.innodb_system.table_and_index_name_by_id(page.index_id)
+            identifiers[identifier] += " (%s.%s)" % [table, index] if table && index
+          end
+        end
+      end
+    end
+
+    bitmap << filled_block(used_fraction, identifier)
+
+    if used_fraction.zero?
+      count_by_identifier[:free] += 1
+    else
+      count_by_identifier[identifier] += 1
+    end
+  end
+end
+# rubocop:enable Metrics/BlockNesting
+
 # Illustrate the space by printing each extent and for each page, printing a
 # filled block colored based on the index the page is part of. Print a legend
 # for the colors used afterwards.
 def space_extents_illustrate(space)
-  line_width = space.pages_per_extent
+  width = space.pages_per_extent
   puts
-  puts "%12s ╭%-#{line_width}s╮" % [ "Start Page", "─" * line_width ]
+  puts "%12s  %-#{width}s " % ["", center(space.name, width)]
+  puts "%12s ╭%-#{width}s╮" % ["Start Page", "─" * width]
 
   identifiers = {}
   count_by_identifier = Hash.new(0)
 
   space.each_xdes do |entry|
-    puts "%12i │%-#{line_width}s│" % [
+    puts "%12i │%-#{width}s│" % [
       entry.xdes[:start_page],
-      entry.each_page_status.inject("") { |bitmap, (page_number, page_status)|
-        if page_number < space.pages
-          used_fraction = 1.0
-          identifier = nil
-          if page_status[:free]
-            used_fraction = 0.0
-          else
-            page = space.page(page_number)
-            if page.respond_to?(:used_space)
-              used_fraction = page.used_space.to_f / page.size.to_f
-            end
-            if page.respond_to?(:index_id)
-              identifier = page.index_id
-              unless identifiers[identifier]
-                identifiers[identifier] = (page.index_id == Innodb::IbufIndex::INDEX_ID) ?
-                  "Insert Buffer Index" :
-                  "Index #{page.index_id}"
-                if space.innodb_system
-                  table, index = space.innodb_system.table_and_index_name_by_id(page.index_id)
-                  if table && index
-                    identifiers[identifier] += " (%s.%s)" % [table, index]
-                  end
-                end
-              end
-            end
-          end
-          bitmap += filled_block(used_fraction, identifier)
-          if used_fraction != 0.0
-            count_by_identifier[identifier] += 1
-          else
-            count_by_identifier[:free] += 1
-          end
-        else
-          bitmap += " "
-        end
-        bitmap
-      },
+      space_extents_illustrate_page_status(space, entry, count_by_identifier, identifiers),
     ]
   end
   total_pages = count_by_identifier.values.reduce(:+)
 
-  puts "%12s ╰%-#{line_width}s╯" % [ "", "─" * line_width ]
+  puts "%12s ╰%-#{width}s╯" % ["", "─" * width]
 
   puts
   puts "Legend (%s = 1 page):" % [filled_block(1.0, nil)]
   puts "  %-62s %8s %8s" % [
-    "Page Type", "Pages", "Ratio"
+    "Page Type",
+    "Pages",
+    "Ratio",
   ]
   puts "  %s %-60s %8i %7.2f%%" % [
     filled_block(1.0, nil),
     "System",
     count_by_identifier[nil],
-    100.0 * (count_by_identifier[nil].to_f / total_pages.to_f),
+    100.0 * (count_by_identifier[nil].to_f / total_pages),
   ]
   identifiers.sort.each do |identifier, description|
     puts "  %s %-60s %8i %7.2f%%" % [
       filled_block(1.0, identifier),
       description,
       count_by_identifier[identifier],
-      100.0 * (count_by_identifier[identifier].to_f / total_pages.to_f),
+      100.0 * (count_by_identifier[identifier].to_f / total_pages),
     ]
   end
   puts "  %s %-60s %8i %7.2f%%" % [
     filled_block(0.0, nil),
     "Free space",
     count_by_identifier[:free],
-    100.0 * (count_by_identifier[:free].to_f / total_pages.to_f),
+    100.0 * (count_by_identifier[:free].to_f / total_pages),
   ]
   puts
 end
 
-def svg_extent_legend(x, y, block_size, color=nil, description=nil, pages=nil, ratio=nil)
-  [
-    svg("rect", {
-      "y" => y,
-      "x" => x,
-      "width" => block_size,
-      "height" => block_size,
-      "fill" => color ? color : "white",
-      "stroke" => description ? "black" : "none",
-    }),
-    svg("text", {
-      "y" => y + block_size - 4,
-      "x" => x + (description ? block_size + 5 : 0),
-      "font-family" => "monospace",
-      "font-size" => block_size,
-      "font-weight" => description ? "normal" : "bold",
-      "text-anchor" => "start",
-    }, description ? description : "Page Type"),
-    svg("text", {
-      "y" => y + block_size - 4,
-      "x" => x + block_size + 5 + (40 * block_size),
-      "font-family" => "monospace",
-      "font-size" => block_size,
-      "font-weight" => description ? "normal" : "bold",
-      "text-anchor" => "end",
-    }, pages ? pages : "Pages"),
-    svg("text", {
-      "y" => y + block_size - 4,
-      "x" => x + block_size + 5 + (40 * block_size) + (10 * block_size),
-      "font-family" => "monospace",
-      "font-size" => block_size,
-      "font-weight" => description ? "normal" : "bold",
-      "text-anchor" => "end",
-    }, ratio ? ("%7.2f%%" % [ratio]) : "Ratio"),
-  ].join("\n")
-end
-
-# Illustrate the space by printing each extent and for each page, printing a
-# filled block colored based on the index the page is part of. Print a legend
-# for the colors used afterwards.
-def space_extents_illustrate_svg(space)
-  line_width = space.pages_per_extent
-  block_size = @options.illustration_block_size
-
-  puts "<?xml version=\"1.0\"?>"
-  puts "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">"
-
-  identifiers = {}
-  count_by_identifier = Hash.new(0)
-
-  graphic_x = 48
-  graphic_y = 16
-
-  puts svg("text", {
-    "y" => graphic_y - 3,
-    "x" => graphic_x - 7,
-    "font-family" => "monospace",
-    "font-size" => block_size,
-    "font-weight" => "bold",
-    "text-anchor" => "end",
-  }, "Page")
-
-  block_x = 0
-  block_y = 0
-  space.each_xdes do |entry|
-    block_x = 0
-
-    puts svg("text", {
-      "y" => graphic_y + block_y + block_size,
-      "x" => graphic_x - 7,
-      "font-family" => "monospace",
-      "font-size" => block_size,
-      "text-anchor" => "end",
-    }, entry.xdes[:start_page])
-
-    entry.each_page_status do |page_number, page_status|
-      if page_number < space.pages
-        used_fraction = 1.0
-        identifier = nil
-        if page_status[:free]
-          used_fraction = 0.0
-        else
-          page = space.page(page_number)
-          if page.respond_to?(:used_space)
-            used_fraction = page.used_space.to_f / page.size.to_f
-          end
-          if page.respond_to?(:index_id)
-            identifier = page.index_id
-            unless identifiers[identifier]
-              identifiers[identifier] = (page.index_id == Innodb::IbufIndex::INDEX_ID) ?
-                "Insert Buffer Index" :
-                "Index #{page.index_id}"
-              if space.innodb_system
-                table, index = space.innodb_system.table_and_index_name_by_id(page.index_id)
-                if table && index
-                  identifiers[identifier] += " (%s.%s)" % [table, index]
-                end
-              end
-            end
-          end
-        end
-        if used_fraction != 0.0
-          count_by_identifier[identifier] += 1
-        else
-          count_by_identifier[:free] += 1
-        end
-
-        block_height = block_size * used_fraction
-        color = "black"
-        if identifier
-          color = "#" + RGBHEX_COLORS_RANDOM[(identifier * COLOR_SPACING_PRIME) % RGBHEX_COLORS_RANDOM.size]
-        end
-        puts svg("rect", {
-          "x" => graphic_x + block_x,
-          "y" => graphic_y + block_y + (block_size - block_height),
-          "width" => block_size,
-          "height" => block_height,
-          "fill" => color,
-        })
-      end
-      block_x += block_size
-    end
-    block_y += block_size
-  end
-
-  puts svg("path", {
-    "stroke" => "black",
-    "stroke-width" => 1,
-    "fill" => "none",
-    "d" => svg_path_rounded_rect(
-      graphic_x,
-      graphic_y,
-      block_x,
-      block_y,
-      4
-    ),
-  })
-
-  block_x = 0
-  block_y += 10
-  puts svg_extent_legend(
-    graphic_x + block_x,
-    graphic_y + block_y,
-    block_size
-  )
-  block_y += block_size + 2
-
-  puts svg_extent_legend(
-    graphic_x + block_x,
-    graphic_y + block_y,
-    block_size,
-    "black",
-    "System",
-    count_by_identifier[nil],
-    100.0 * (count_by_identifier[nil].to_f / space.pages.to_f)
-  )
-  block_y += block_size + 2
-
-  identifiers.sort.each do |identifier, description|
-    puts svg_extent_legend(
-      graphic_x + block_x,
-      graphic_y + block_y,
-      block_size,
-      "#" + RGBHEX_COLORS_RANDOM[(identifier * COLOR_SPACING_PRIME) % RGBHEX_COLORS_RANDOM.size],
-      description,
-      count_by_identifier[identifier],
-      100.0 * (count_by_identifier[identifier].to_f / space.pages.to_f)
-    )
-    block_y += block_size + 2
-  end
-
-  puts svg_extent_legend(
-    graphic_x + block_x,
-    graphic_y + block_y,
-    block_size,
-    "white",
-    "Free space",
-    count_by_identifier[:free],
-    100.0 * (count_by_identifier[:free].to_f / space.pages.to_f)
-  )
-
-  puts "</svg>"
-end
-
-
 def space_lsn_age_illustrate(space)
   colors = ANSI_COLORS_HEATMAP
-  line_width = @options.illustration_line_width
+  width = @options.illustration_line_width
 
   # Calculate the minimum and maximum LSN in the space. This is pretty
   # inefficient as we end up scanning all pages twice.
@@ -768,70 +574,57 @@ def space_lsn_age_illustrate(space)
 
   lsn_min = lsn_max = space.page(0).lsn
   space.each_page do |page_number, page|
-    if page.lsn != 0
-      page_lsn[page_number] = page.lsn
-      lsn_min = page.lsn < lsn_min ? page.lsn : lsn_min
-      lsn_max = page.lsn > lsn_max ? page.lsn : lsn_max
-    end
+    next if page.lsn.zero?
+
+    page_lsn[page_number] = page.lsn
+    lsn_min = page.lsn < lsn_min ? page.lsn : lsn_min
+    lsn_max = page.lsn > lsn_max ? page.lsn : lsn_max
   end
   lsn_delta = lsn_max - lsn_min
 
   puts
-  puts "%12s ╭%-#{line_width}s╮" % [ "Start Page", "─" * line_width ]
+  puts "%12s  %-#{width}s " % ["", center(space.name, width)]
+  puts "%12s ╭%-#{width}s╮" % ["Start Page", "─" * width]
 
   start_page = 0
-  page_lsn.each_slice(line_width) do |slice|
-    puts "%12i │%-#{line_width}s│" % [
+  page_lsn.each_slice(width) do |slice|
+    puts "%12i │%-#{width}s│" % [
       start_page,
-      slice.inject("") { |line, lsn|
+      slice.inject("") do |line, lsn|
         if lsn
-          age_ratio = (lsn - lsn_min).to_f / lsn_delta.to_f
+          age_ratio = (lsn - lsn_min).to_f / lsn_delta
           color = colors[(age_ratio * colors.size.to_f).floor]
           line += ansi_color(color, filled_block(1.0, nil))
         else
           line += " "
         end
         line
-      },
+      end,
     ]
-    start_page += line_width
+    start_page += width
   end
 
-  puts "%12s ╰%-#{line_width}s╯" % [ "", "─" * line_width ]
+  puts "%12s ╰%-#{width}s╯" % ["", "─" * width]
 
-  lsn_legend = "<" + ("─" * (colors.size - 2)) + ">"
+  _, lsn_freq = page_lsn.reject(&:nil?).histogram(colors.size, min: lsn_min, max: lsn_max)
+  lsn_freq_delta = lsn_freq.max - lsn_freq.min
 
-  begin
-    # Try to optionally replace the boring lsn_legend with a histogram of
-    # page age distribution. If histogram/array is not available, move on.
-
-    require 'histogram/array'
-
-    lsn_bins, lsn_freq = page_lsn.select { |lsn| !lsn.nil? }.
-      histogram(colors.size, :min => lsn_min, :max => lsn_max)
-
-    lsn_freq_delta = lsn_freq.max - lsn_freq.min
-
-    lsn_legend = ""
-    lsn_freq.each do |freq|
-      freq_norm = freq / lsn_freq_delta
-      if freq_norm > 0.0
-        lsn_legend << filled_block(freq_norm)
-      else
-        # Avoid the "empty" block used for 0.0.
-        lsn_legend << " "
-      end
-    end
-  rescue LoadError
-    # That's okay! Leave the legend boring.
+  lsn_age_histogram = "".dup
+  lsn_freq.each do |freq|
+    freq_norm = freq / lsn_freq_delta
+    lsn_age_histogram << (freq_norm > 0.0 ? filled_block(freq_norm) : " ")
   end
 
   puts
-  puts "Legend (%s = 1 page):" % [filled_block(1.0, nil)]
+  puts "LSN Age Histogram (%s = ~%d pages):" % [
+    filled_block(1.0, nil),
+    (space.pages.to_f / colors.size).round,
+  ]
   puts "  %12s %s %-12s" % [
     "Min LSN",
-    lsn_legend,
-    "Max LSN" ]
+    lsn_age_histogram,
+    "Max LSN",
+  ]
   puts "  %12i %s %-12i" % [
     lsn_min,
     colors.map { |c| ansi_color(c, filled_block(1.0, nil)) }.join,
@@ -839,126 +632,6 @@ def space_lsn_age_illustrate(space)
   ]
 end
 
-def space_lsn_age_illustrate_svg(space)
-  colors = RGBHEX_COLORS_HEATMAP
-  line_width = @options.illustration_line_width
-  block_size = @options.illustration_block_size
-
-  puts "<?xml version=\"1.0\"?>"
-  puts "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">"
-
-  # Calculate the minimum and maximum LSN in the space. This is pretty
-  # inefficient as we end up scanning all pages twice.
-  page_lsn = Array.new(space.pages)
-
-  lsn_min = lsn_max = space.page(0).lsn
-  space.each_page do |page_number, page|
-    if page.lsn != 0
-      page_lsn[page_number] = page.lsn
-      lsn_min = page.lsn < lsn_min ? page.lsn : lsn_min
-      lsn_max = page.lsn > lsn_max ? page.lsn : lsn_max
-    end
-  end
-  lsn_delta = lsn_max - lsn_min
-
-  graphic_x = 48
-  graphic_y = 16
-
-  block_x = 0
-  block_y = 0
-
-  puts svg("text", {
-    "y" => graphic_y - 3,
-    "x" => graphic_x - 7,
-    "font-family" => "monospace",
-    "font-size" => block_size,
-    "font-weight" => "bold",
-    "text-anchor" => "end",
-  }, "Page")
-
-  start_page = 0
-  page_lsn.each_slice(line_width) do |slice|
-    block_x = 0
-    slice.each do |lsn|
-      rgbhex = ""
-      if lsn
-        age_ratio = (lsn - lsn_min).to_f / lsn_delta.to_f
-        color = colors[(age_ratio * colors.size.to_f).floor]
-      end
-      puts svg("rect", {
-        "y" => graphic_y + block_y,
-        "x" => graphic_x + block_x,
-        "width" => block_size,
-        "height" => block_size,
-        "fill" => color ? "#" + color : "black",
-      })
-      block_x += block_size
-    end
-    puts svg("text", {
-      "y" => graphic_y + block_y + block_size,
-      "x" => graphic_x - 7,
-      "font-family" => "monospace",
-      "font-size" => block_size,
-      "text-anchor" => "end",
-    }, start_page)
-    block_y += block_size
-    start_page += line_width
-  end
-
-  puts svg("path", {
-    "stroke" => "black",
-    "stroke-width" => 1,
-    "fill" => "none",
-    "d" => svg_path_rounded_rect(
-      graphic_x,
-      graphic_y,
-      line_width * block_size,
-      block_y,
-      4
-    ),
-  })
-
-  block_x = 0
-  block_y += 16
-  puts svg("text", {
-    "y" => graphic_y + block_y + block_size - 4,
-    "x" => graphic_x + block_x,
-    "font-family" => "monospace",
-    "font-size" => block_size,
-    "text-anchor" => "start",
-  }, lsn_min)
-  color_width = ((64.0 * block_size.to_f) / colors.size.to_f).round
-  colors.each do |color|
-    puts svg("rect", {
-      "y" => graphic_y + block_y + block_size,
-      "x" => graphic_x + block_x,
-      "width" => color_width,
-      "height" => block_size,
-      "fill" => "#" + color,
-    })
-    block_x += color_width
-  end
-  puts svg("text", {
-    "y" => graphic_y + block_y + block_size - 4,
-    "x" => graphic_x + block_x,
-    "font-family" => "monospace",
-    "font-size" => block_size,
-    "text-anchor" => "end",
-  }, lsn_max)
-
-  puts svg("text", {
-    "y" => graphic_y + block_y + block_size - 4,
-    "x" => graphic_x + (block_x / 2),
-    "font-family" => "monospace",
-    "font-weight" => "bold",
-    "font-size" => block_size,
-    "text-anchor" => "middle",
-  }, "LSN Age")
-
-
-  puts "</svg>\n"
-end
-
 def print_inode_summary(inode)
   puts "INODE fseg_id=%d, pages=%d, frag=%d, full=%d, not_full=%d, free=%d" % [
     inode.fseg_id,
@@ -971,6 +644,7 @@ def print_inode_summary(inode)
 end
 
 def print_inode_detail(inode)
+  # rubocop:disable Layout/LineLength
   puts "INODE fseg_id=%d, pages=%d, frag=%d pages (%s), full=%d extents (%s), not_full=%d extents (%s) (%d/%d pages used), free=%d extents (%s)" % [
     inode.fseg_id,
     inode.total_pages,
@@ -985,6 +659,13 @@ def print_inode_detail(inode)
     inode.free.length,
     inode.free.each.to_a.map { |x| "#{x.start_page}-#{x.end_page}" }.join(", "),
   ]
+  # rubocop:enable Layout/LineLength
+end
+
+def space_inodes_fseg_id(space)
+  space.each_inode do |inode|
+    puts inode.fseg_id
+  end
 end
 
 def space_inodes_summary(space)
@@ -1015,42 +696,6 @@ def page_account(innodb_system, space, page_number)
     page_type[:usage],
   ]
 
-  if page.corrupt?
-    puts "  Page appears to be corrupt."
-    puts "    Stored checksum is %d, type %s." % [
-      page.checksum,
-      page.checksum_type ? page.checksum_type : "unknown",
-    ]
-    puts "    Calculated checksums:"
-    puts "      crc32  %d" % [page.checksum_crc32]
-    puts "      innodb %d" % [page.checksum_innodb]
-  end
-
-  if page.torn?
-    puts "  Page appears to be torn."
-    puts "    Full LSN from header is %d." % [page.lsn]
-    puts "    Low 32 bits of LSN from header is %d, trailer is %d." % [
-      page.lsn_low32_header,
-      page.lsn_low32_trailer,
-    ]
-  end
-
-  if page.misplaced?
-    puts "  Page appears to be misplaced."
-    if page.misplaced_offset?
-      puts "    Requested page %d but offset stored in page is %d." % [
-        page_number,
-        page.offset,
-      ]
-    end
-    if page.misplaced_space?
-      puts "    Space's ID %d does not match page's stored space ID %d." % [
-        page.space.space_id,
-        page.space_id,
-      ]
-    end
-  end
-
   xdes = space.xdes_for_page(page_number)
   puts "  Extent descriptor for pages %d-%d is at page %d, offset %d." % [
     xdes.start_page,
@@ -1067,25 +712,23 @@ def page_account(innodb_system, space, page_number)
 
   xdes_status = xdes.page_status(page_number)
   puts "  Page is marked as %s in extent descriptor." % [
-    xdes_status[:free] ? 'free' : 'used'
+    xdes_status[:free] ? "free" : "used",
   ]
 
   space.each_xdes_list do |name, list|
-    if list.include? xdes
-      puts "  Extent is in #{name} list of space."
-    end
+    puts "  Extent is in #{name} list of space." if list.include?(xdes)
   end
 
   page_inode = nil
   space.each_inode do |inode|
     inode.each_list do |name, list|
-      if list.include? xdes
+      if list.include?(xdes)
         page_inode = inode
         puts "  Extent is in #{name} list of fseg #{inode.fseg_id}."
       end
     end
 
-    if inode.frag_array.include? page_number
+    if inode.frag_array.include?(page_number) # rubocop:disable Style/Next
       page_inode = inode
       puts "  Page is in fragment array of fseg %d." % [
         inode.fseg_id,
@@ -1095,65 +738,213 @@ def page_account(innodb_system, space, page_number)
 
   space.each_index do |index|
     index.each_fseg do |fseg_name, fseg|
-      if page_inode == fseg
-        puts "  Fseg is in #{fseg_name} fseg of index #{index.id}."
-        puts "  Index root is page #{index.root.offset}."
-        if innodb_system
-          table_name, index_name = innodb_system.table_and_index_name_by_id(index.id)
-          if table_name and index_name
-            puts "  Index is #{table_name}.#{index_name}."
-          end
-        end
+      next unless page_inode == fseg
+
+      puts "  Fseg is in #{fseg_name} fseg of index #{index.id}."
+      puts "  Index root is page #{index.root.offset}."
+      if innodb_system
+        table_name, index_name = innodb_system.table_and_index_name_by_id(index.id)
+        puts "  Index is #{table_name}.#{index_name}." if table_name && index_name
       end
     end
   end
 
-  if space.system_space?
-    if page_inode == space.trx_sys.fseg
-      puts "  Fseg is trx_sys."
-    end
-
-    if page_inode == space.trx_sys.doublewrite[:fseg]
-      puts "  Fseg is doublewrite buffer."
-    end
+  if space.system_space? # rubocop:disable Style/GuardClause
+    puts "  Fseg is trx_sys." if page_inode == space.trx_sys.fseg
+    puts "  Fseg is doublewrite buffer." if page_inode == space.trx_sys.doublewrite[:fseg]
 
-    if innodb_system
-      innodb_system.data_dictionary.each_data_dictionary_index do |table_name, index_name, index|
-        index.each_fseg do |fseg_name, fseg|
-          if page_inode == fseg
-            puts "  Index is #{table_name}.#{index_name} of data dictionary."
-          end
-        end
+    innodb_system.data_dictionary&.each_data_dictionary_index do |table_name, index_name, index|
+      index.each_fseg do |_fseg_name, fseg|
+        puts "  Index is #{table_name}.#{index_name} of data dictionary." if page_inode == fseg
       end
     end
 
     space.trx_sys.rsegs.each_with_index do |rseg_slot, index|
-      if page.fil_header[:space_id] == rseg_slot[:space_id] &&
-        page.fil_header[:offset] == rseg_slot[:page_number]
-          puts "  Page is a rollback segment in slot #{index}."
+      if page.fil_header.space_id == rseg_slot.space_id && page.fil_header.offset == rseg_slot.page_number
+        puts "  Page is a rollback segment in slot #{index}."
       end
     end
   end
 end
 
-def page_directory_summary(space, page)
-  if page.type != :INDEX
-    usage 1, "Page must be an index page"
+def page_validate_index(page)
+  page_is_valid = true
+
+  print "Parsing all records in page... "
+  records = page.each_record.to_a
+  puts "done."
+
+  directory_offsets = page.each_directory_offset.to_a
+  record_offsets = records.map(&:offset)
+
+  invalid_directory_entries = directory_offsets.reject { |n| record_offsets.include?(n) }
+
+  unless invalid_directory_entries.empty?
+    page_is_valid = false
+    puts "Invalid page directory entries (offsets not to valid records):"
+    invalid_directory_entries.each do |offset|
+      puts "  slot %d, offset %d" % [
+        page.offset_is_directory_slot?(offset),
+        offset,
+      ]
+    end
+  end
+
+  # Read all records corresponding to valid directory entries.
+  directory_records = directory_offsets.reject { |o| invalid_directory_entries.include?(o) }.map { |o| page.record(o) }
+
+  misordered_directory_entries = []
+  prev = nil
+  directory_records.each do |rec|
+    unless prev
+      prev = rec
+      next
+    end
+    if rec.compare_key(prev.key.map { |v| v[:value] }) == 1
+      page_is_valid = false
+      misordered_directory_entries << {
+        slot: page.offset_is_directory_slot?(rec.offset),
+        offset: rec.offset,
+        key: rec.key_string,
+        prev_key: prev.key_string,
+      }
+    end
+    prev = rec
+  end
+  unless misordered_directory_entries.empty?
+    puts "Misordered page directory entries (key < prev key):"
+    misordered_directory_entries.each do |entry|
+      puts "  slot %d, offset %d, key %s, prev key %s" % [
+        entry[:slot],
+        entry[:offset],
+        entry[:key],
+        entry[:prev_key],
+      ]
+    end
+  end
+
+  misordered_records = []
+  prev = nil
+  page.each_record do |rec|
+    unless prev
+      prev = rec
+      next
+    end
+    if rec.compare_key(prev.key.map { |v| v[:value] }) == 1
+      page_is_valid = false
+      misordered_records << {
+        offset: rec.offset,
+        key: rec.key_string,
+        prev_key: prev.key_string,
+      }
+    end
+    prev = rec
+  end
+  unless misordered_records.empty?
+    puts "Misordered records in record list (key < prev key):"
+    misordered_records.each do |entry|
+      puts "  offset %d, key %s, prev key %s" % [
+        entry[:offset],
+        entry[:key],
+        entry[:prev_key],
+      ]
+    end
+  end
+
+  page_is_valid
+end
+
+def page_validate(_innodb_system, space, page_number)
+  page_is_valid = true
+  puts "Validating page %d..." % [page_number]
+
+  print "Parsing page... "
+  page = space.page(page_number)
+  puts "done."
+
+  if page.corrupt?
+    page_is_valid = false
+    puts "Page appears to be corrupt:"
+    puts "  Stored checksums:"
+    puts "    header  %10d (0x%08x), type %s" % [
+      page.checksum,
+      page.checksum,
+      page.checksum_type || "unknown",
+    ]
+    puts "    trailer %10d (0x%08x)" % [
+      page.fil_trailer.checksum,
+      page.fil_trailer.checksum,
+    ]
+    puts "  Calculated checksums:"
+    puts "    crc32  %10d (0x%08x)" % [
+      page.checksum_crc32,
+      page.checksum_crc32,
+    ]
+    puts "    innodb %10d (0x%08x)" % [
+      page.checksum_innodb,
+      page.checksum_innodb,
+    ]
+  end
+
+  if page.torn?
+    page_is_valid = false
+    puts "Page appears to be torn:"
+    puts "  Full LSN:"
+    puts "    header  %d (0x%016x)" % [
+      page.lsn,
+      page.lsn,
+    ]
+    puts "  Low 32 bits of LSN:"
+    puts "    header  %10d (0x%08x)" % [
+      page.fil_header.lsn_low32,
+      page.fil_header.lsn_low32,
+    ]
+    puts "    trailer %10d (0x%08x)" % [
+      page.fil_trailer.lsn_low32,
+      page.fil_trailer.lsn_low32,
+    ]
+  end
+
+  if page.misplaced?
+    page_is_valid = false
+    puts "Page appears to be misplaced:"
+    if page.misplaced_offset?
+      puts "  Requested page %d but offset stored in page is %d." % [
+        page_number,
+        page.offset,
+      ]
+    end
+    if page.misplaced_space?
+      puts "  Space ID %d does not match page stored space ID %d." % [
+        page.space.space_id,
+        page.space_id,
+      ]
+    end
   end
 
-  puts "%-8s%-8s%-14s%-8s%s" % [
-    "slot",
-    "offset",
-    "type",
-    "owned",
-    "key",
+  page_is_valid = false if page.type == :INDEX && !page_validate_index(page)
+
+  puts "Page %d appears to be %s!" % [
+    page_number,
+    page_is_valid ? "valid" : "corrupted",
+  ]
+end
+
+def page_directory_summary(_space, page)
+  usage(1, "Page must be an index page") if page.type != :INDEX
+
+  puts "%-8s%-8s%-14s%-8s%s" % %w[
+    slot
+    offset
+    type
+    owned
+    key
   ]
 
   page.directory.each_with_index do |offset, slot|
     record = page.record(offset)
-    key = if [:conventional, :node_pointer].include? record.header[:type]
-      "(%s)" % record.key_string
-    end
+    key = %i[conventional node_pointer].include?(record.header[:type]) ? "(%s)" % record.key_string : ""
+
     puts "%-8i%-8i%-14s%-8i%s" % [
       slot,
       offset,
@@ -1164,57 +955,63 @@ def page_directory_summary(space, page)
   end
 end
 
-def page_records(space, page)
+def page_records(_space, page)
   page.each_record do |record|
     puts "Record %i: %s" % [
       record.offset,
       record.string,
     ]
-    puts if record.header[:type] == :conventional
   end
 end
 
 def page_illustrate(page)
   width = 64
-  blocks = Array.new(page.size, " ")
+  unknown_page_content = page.type == :INDEX && page.record_describer.nil?
+  blocks = Array.new(page.size, unknown_page_content ? "▞" : " ")
   identifiers = {}
   identifier_sort = 0
   count_by_identifier = Hash.new(0)
 
-  page.each_region.sort { |a,b| a[:offset] <=> b[:offset]}.each do |region|
-    region[:length].times do |n|
+  page.each_region.sort_by(&:offset).each do |region|
+    region.length.times do |n|
       identifier = nil
       fraction = 0.0
-      if region[:name] != :garbage
-        if n ==  region[:length] - 1
-          fraction = 0.5
-        else
-          fraction = 1.0
-        end
-        identifier = region[:name].hash.abs
+      if region.name != :garbage
+        fraction = n == region.length - 1 ? 0.5 : 1.0
+        identifier = region.name.hash.abs
         unless identifiers[identifier]
           # Prefix an integer <0123> on each name so that the legend can be
           # sorted by the appearance of each region in the page.
           identifiers[identifier] = "<%04i>%s" % [
             identifier_sort,
-            region[:info]
+            region.info,
           ]
           identifier_sort += 1
         end
       end
-      blocks[region[:offset] + n] = filled_block(fraction, identifier, BLOCK_CHARS_H)
+      blocks[region.offset + n] = filled_block(fraction, identifier, BLOCK_CHARS_H)
       count_by_identifier[identifier] += 1
     end
   end
 
   puts
-  puts "%12s ╭%-#{width}s╮" % [ "Offset", "─" * width ]
+  puts "%12s  %-#{width}s " % ["", center("Page #{page.offset} (#{page.type})", width)]
+  puts "%12s ╭%-#{width}s╮" % ["Offset", "─" * width]
   offset = 0
+  skipped_lines = 0
   blocks.each_slice(width) do |slice|
-    puts "%12i │%-s│" % [offset, slice.join]
+    if slice.any? { |s| s != " " }
+      if skipped_lines.positive?
+        puts "%12s │%-#{width}s│" % ["...", ""]
+        skipped_lines = 0
+      end
+      puts "%12i │%-s│" % [offset, slice.join]
+    else
+      skipped_lines += 1
+    end
     offset += width
   end
-  puts "%12s ╰%-#{width}s╯" % [ "", "─" * width ]
+  puts "%12s ╰%-#{width}s╯" % ["", "─" * width]
 
   puts
   puts "Legend (%s = 1 byte):" % [filled_block(1.0, nil)]
@@ -1223,47 +1020,52 @@ def page_illustrate(page)
     "Bytes",
     "Ratio",
   ]
-  identifiers.sort { |a,b| a[1] <=> b[1] }.each do |identifier, description|
+  identifiers.sort { |a, b| a[1] <=> b[1] }.each do |identifier, description|
     puts "  %s %-30s %8i %7.2f%%" % [
       filled_block(1.0, identifier),
       description.gsub(/^<\d+>/, ""),
       count_by_identifier[identifier],
-      100.0 * (count_by_identifier[identifier].to_f / page.size.to_f),
+      100.0 * (count_by_identifier[identifier].to_f / page.size),
     ]
   end
   puts "  %s %-30s %8i %7.2f%%" % [
     filled_block(0.0, nil),
     "Garbage",
     count_by_identifier[nil],
-    100.0 * (count_by_identifier[nil].to_f / page.size.to_f),
+    100.0 * (count_by_identifier[nil].to_f / page.size),
   ]
-  free_space = page.size - count_by_identifier.inject(0) { |sum,(k,v)| sum + v }
+  free_space = page.size - count_by_identifier.inject(0) { |sum, (_k, v)| sum + v }
   puts "  %s %-30s %8i %7.2f%%" % [
-    " ",
-    "Free",
+    unknown_page_content ? "▞" : " ",
+    unknown_page_content ? "Unknown (no data dictionary)" : "Free",
     free_space,
-    100.0 * (free_space.to_f / page.size.to_f),
+    100.0 * (free_space.to_f / page.size),
   ]
 
+  if unknown_page_content
+    puts
+    puts "Note:"
+    puts "  Records could not be parsed because no data dictionary or record describer"
+    puts "  was available. Use -s instead of -f, or provide a record describer class."
+  end
+
   puts
 end
 
 def record_dump(page, record_offset)
-  unless record = page.record(record_offset)
-    raise "Record at offset #{record_offset} not found"
-  end
+  record = page.record(record_offset)
+  raise "Record at offset #{record_offset} not found" unless record
 
   record.dump
+rescue IOError
+  raise "Record could not be read at offset #{record_offset}; is it a valid record offset?"
 end
 
 def record_history(page, record_offset)
-  unless page.leaf?
-    raise "Record is not located on a leaf page; no history available"
-  end
+  raise "Record is not located on a leaf page; no history available" unless page.leaf?
 
-  unless record = page.record(record_offset)
-    raise "Record at offset #{record_offset} not found"
-  end
+  record = page.record(record_offset)
+  raise "Record at offset #{record_offset} not found" unless record
 
   puts "%-14s%-20s%s" % [
     "Transaction",
@@ -1281,29 +1083,23 @@ def record_history(page, record_offset)
 end
 
 def index_fseg_lists(index, fseg_name)
-  unless index.fseg(fseg_name)
-    raise "File segment '#{fseg_name}' doesn't exist"
-  end
+  raise "File segment '#{fseg_name}' doesn't exist" unless index.fseg(fseg_name)
 
   print_lists(index.each_fseg_list(index.fseg(fseg_name)))
 end
 
 def index_fseg_list_iterate(index, fseg_name, list_name)
-  unless fseg = index.fseg(fseg_name)
-    raise "File segment '#{fseg_name}' doesn't exist"
-  end
+  fseg = index.fseg(fseg_name)
+  raise "File segment '#{fseg_name}' doesn't exist" unless fseg
 
-  unless list = fseg.list(list_name)
-    raise "List '#{list_name}' doesn't exist"
-  end
+  list = fseg.list(list_name)
+  raise "List '#{list_name}' doesn't exist" unless list
 
   print_xdes_list(index.space, list)
 end
 
 def index_fseg_frag_pages(index, fseg_name)
-  unless index.fseg(fseg_name)
-    raise "File segment '#{fseg_name}' doesn't exist"
-  end
+  raise "File segment '#{fseg_name}' doesn't exist" unless index.fseg(fseg_name)
 
   print_index_page_summary(index.each_fseg_frag_page(index.fseg(fseg_name)))
 end
@@ -1318,17 +1114,17 @@ def index_recurse(index)
         page.records,
         page.record_space,
       ]
-      if page.level == 0
+      if page.level.zero?
         page.each_record do |record|
           puts "%sRECORD: (%s) → (%s)" % [
-            "  " * (depth+1),
+            "  " * (depth + 1),
             record.key_string,
             record.row_string,
           ]
         end
       end
     end,
-    lambda do |parent_page, child_page, child_min_key, depth|
+    lambda do |_parent_page, child_page, child_min_key, depth|
       puts "%sNODE POINTER RECORD ≥ (%s) → #%i" % [
         "  " * depth,
         child_min_key.map { |r| "%s=%s" % [r[:name], r[:value].inspect] }.join(", "),
@@ -1339,13 +1135,13 @@ def index_recurse(index)
 end
 
 def index_record_offsets(index)
-  puts "%-20s%-20s" % [
-    "page_offset",
-    "record_offset",
+  puts "%-20s%-20s" % %w[
+    page_offset
+    record_offset
   ]
   index.recurse(
-    lambda do |page, depth|
-      if page.level == 0
+    lambda do |page, _depth|
+      if page.level.zero?
         page.each_record do |record|
           puts "%-20i%-20i" % [
             page.offset,
@@ -1354,7 +1150,7 @@ def index_record_offsets(index)
         end
       end
     end,
-    lambda { |*x| }
+    ->(*_) {}
   )
 end
 
@@ -1374,13 +1170,13 @@ def index_digraph(index)
           child_key.join(", "),
         ]
       end
-      puts "  %spage_%i [ shape = \"record\"; label = \"%s\"; ];" % [
+      puts "  %spage_%i [ shape = 'record'; label = '%s'; ];" % [
         "  " * depth,
         page.offset,
         label,
       ]
     end,
-    lambda do |parent_page, child_page, child_key, depth|
+    lambda do |parent_page, child_page, _child_key, depth|
       puts "  %spage_%i:dir_%i → page_%i:page:nw;" % [
         "  " * depth,
         parent_page.offset,
@@ -1393,14 +1189,14 @@ def index_digraph(index)
 end
 
 def index_level_summary(index, level)
-  puts "%-8s%-8s%-8s%-8s%-8s%-8s%-8s" % [
-    "page",
-    "index",
-    "level",
-    "data",
-    "free",
-    "records",
-    "min_key",
+  puts "%-8s%-8s%-8s%-8s%-8s%-8s%-8s" % %w[
+    page
+    index
+    level
+    data
+    free
+    records
+    min_key
   ]
 
   index.each_page_at_level(level) do |page|
@@ -1417,15 +1213,14 @@ def index_level_summary(index, level)
 end
 
 def undo_history_summary(innodb_system)
-  history = innodb_system.history.each_history_list
-  history_list = history.select { |history| history.list.length > 0 }
-
-  puts "%-8s%-8s%-14s%-20s%s" % [
-    "Page",
-    "Offset",
-    "Transaction",
-    "Type",
-    "Table",
+  history_list = innodb_system.history.each_history_list.reject { |h| h.list.empty? }
+
+  puts "%-8s%-8s%-14s%-20s%s" % %w[
+    Page
+    Offset
+    Transaction
+    Type
+    Table
   ]
 
   history_list.each do |history|
@@ -1455,20 +1250,22 @@ def usage(exit_code, message = nil)
     exit exit_code
   end
 
+  # rubocop:disable Layout/HeredocIndentation
   print <<'END_OF_USAGE'
 
 Usage: innodb_space <options> <mode>
 
 Invocation examples:
 
-  innodb_space -s ibdata1 [-T tname [-I iname]] [options] <mode>
-    Use ibdata1 as the system tablespace and load the tname table (and the
-    iname index for modes that require it) from data located in the system
-    tablespace data dictionary. This will automatically generate a record
-    describer for any indexes.
+  innodb_space -s ibdata1 [-T table-name [-I index-name [-R record-offset]]] [options] <mode>
+    Use ibdata1 as the system tablespace and load the table-name table (and
+    the index-name index for modes that require it) from data located in the
+    system tablespace data dictionary. This will automatically generate a
+    record describer for any indexes using the data dictionary.
 
-  innodb_space -f tname.ibd [-r ./desc.rb -d DescClass] [options] <mode>
-    Use the tname.ibd table (and the DescClass describer where required).
+  innodb_space -f file-name.ibd [-r ./describer.rb -d DescriberClass] [options] <mode>
+    Use the file-name.ibd tablespace file (and the DescriberClass describer
+    where required) to read the tablespace structures or indexes.
 
 The following options are supported:
 
@@ -1482,16 +1279,27 @@ The following options are supported:
 
   --system-space-file, -s <arg>
     Load the system tablespace file or files <arg>: Either a single file e.g.
-    "ibdata1", a comma-delimited list of files e.g. "ibdata1,ibdata1", or a
+    'ibdata1', a comma-delimited list of files e.g. 'ibdata1,ibdata1', or a
     directory name. If a directory name is provided, it will be scanned for all
-    files named "ibdata?" which will then be sorted alphabetically and used to
+    files named 'ibdata?' which will then be sorted alphabetically and used to
     load the system tablespace.
 
-  --table-name, -T <name>
-    Use the table name <name>.
+  If using the --system-space-file option, the following options may also
+  be used:
+
+    --table-name, -T <name>
+      Use the table name <name>.
+
+    --index-name, -I <name>
+      Use the index name <name>.
 
-  --index-name, -I <name>
-    Use the index name <name>.
+    --system-space-tables, -x
+      Allow opening tables from the system space to support system spaces with
+      tables created without innodb-file-per-table enabled.
+
+    --data-directory, -D <directory>
+      Open per-table tablespace files from <directory> rather than from the
+      directory where the system-space-file is located.
 
   --space-file, -f <file>
     Load the tablespace file <file>.
@@ -1499,14 +1307,20 @@ The following options are supported:
   --page, -p <page>
     Operate on the page <page>.
 
+  --record, -R <offset>
+    Operate on the record located at <offset> within the index page.
+
   --level, -l <level>
     Operate on the level <level>.
 
   --list, -L <list>
     Operate on the list <list>.
 
+  --fseg-id, -F <fseg_id>
+      Operate on the file segment (fseg) <fseg_id>.
+
   --require, -r <file>
-    Use Ruby's "require" to load the file <file>. This is useful for loading
+    Use Ruby's 'require' to load the file <file>. This is useful for loading
     classes with record describers.
 
   --describer, -d <describer>
@@ -1534,14 +1348,18 @@ The following modes are supported:
     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.
+    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-fseg-pages-summary
+    The same as space-index-pages-summary but only iterate one fseg, provided
+    with the --fseg-id/-F 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
+    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. A starting
     page number can be provided with the --page/-p argument.
@@ -1573,19 +1391,13 @@ The following modes are supported:
     color and Unicode box drawing characters to show page usage throughout
     the space.
 
-  space-extents-illustrate-svg
-    Iterate through all extents, illustrating the extent usage in SVG format
-    printed to stdout to show page usage throughout the space.
-
   space-lsn-age-illustrate
     Iterate through all pages, producing a heat map colored by the page LSN
     using ANSI color and Unicode box drawing characters, allowing the user to
     get an overview of page modification recency.
 
-  space-lsn-age-illustrate-svg
-    Iterate through all pages, producing a heat map colored by the page LSN
-    producing SVG format output, allowing the user to get an overview of page
-    modification recency.
+  space-inodes-fseg-id
+    Iterate through all inodes, printing only the FSEG ID.
 
   space-inodes-summary
     Iterate through all inodes, printing a short summary of each FSEG.
@@ -1621,7 +1433,7 @@ The following modes are supported:
     Iterate the file segment list (whose name is provided in the first --list/-L
     argument) for internal or leaf pages for a given index (whose root page
     is provided in the first --page/-p argument). The lists used for each
-    index are "full", "not_full", and "free".
+    index are 'full', 'not_full', and 'free'.
 
   index-fseg-internal-frag-pages
   index-fseg-leaf-frag-pages
@@ -1629,11 +1441,14 @@ The following modes are supported:
     page must be provided with --page/-p.
 
   page-dump
-    Dump the contents of a page, using the Ruby pp ("pretty-print") module.
+    Dump the contents of a page, using the Ruby pp ('pretty-print') module.
 
   page-account
     Account for a page's usage in FSEGs.
 
+  page-validate
+    Validate the contents of a page.
+
   page-directory-summary
     Summarize the record contents of the page directory in a page. If a record
     describer is available, the key of each record will be printed.
@@ -1660,16 +1475,20 @@ The following modes are supported:
     A record offset must be provided with -R/--record.
 
 END_OF_USAGE
+  # rubocop:enable Layout/HeredocIndentation
 
   exit exit_code
 end
 
-Signal.trap("INT")  { exit }
-Signal.trap("PIPE") { exit }
+%w[INT PIPE].each do |name|
+  Signal.trap(name) { exit } if Signal.list.include?(name)
+end
 
 @options = OpenStruct.new
 @options.trace                    = 0
 @options.system_space_file        = nil
+@options.system_space_tables      = false
+@options.data_directory           = nil
 @options.space_file               = nil
 @options.table_name               = nil
 @options.index_name               = nil
@@ -1677,14 +1496,18 @@ Signal.trap("PIPE") { exit }
 @options.record                   = nil
 @options.level                    = nil
 @options.list                     = nil
+@options.fseg_id                  = nil
 @options.describer                = nil
 @options.illustration_line_width  = 64
 @options.illustration_block_size  = 8
 
+# rubocop:disable Layout/SpaceInsideArrayLiteralBrackets
 getopt_options = [
   [ "--help",                     "-?",     GetoptLong::NO_ARGUMENT ],
   [ "--trace",                    "-t",     GetoptLong::NO_ARGUMENT ],
   [ "--system-space-file",        "-s",     GetoptLong::REQUIRED_ARGUMENT ],
+  [ "--system-space-tables",      "-x",     GetoptLong::NO_ARGUMENT ],
+  [ "--data-directory",           "-D",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--space-file",               "-f",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--table-name",               "-T",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--index-name",               "-I",     GetoptLong::REQUIRED_ARGUMENT ],
@@ -1692,11 +1515,13 @@ getopt_options = [
   [ "--record",                   "-R",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--level",                    "-l",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--list",                     "-L",     GetoptLong::REQUIRED_ARGUMENT ],
+  [ "--fseg-id",                  "-F",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--require",                  "-r",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--describer",                "-d",     GetoptLong::REQUIRED_ARGUMENT ],
   [ "--illustration-line-width",            GetoptLong::REQUIRED_ARGUMENT ],
   [ "--illustration-block-size",            GetoptLong::REQUIRED_ARGUMENT ],
 ]
+# rubocop:enable Layout/SpaceInsideArrayLiteralBrackets
 
 getopt = GetoptLong.new(*getopt_options)
 
@@ -1708,6 +1533,10 @@ getopt.each do |opt, arg|
     @options.trace += 1
   when "--system-space-file"
     @options.system_space_file = arg.split(",")
+  when "--system-space-tables"
+    @options.system_space_tables = true
+  when "--data-directory"
+    @options.data_directory = arg
   when "--space-file"
     @options.space_file = arg.split(",")
   when "--table-name"
@@ -1722,6 +1551,8 @@ getopt.each do |opt, arg|
     @options.level = arg.to_i
   when "--list"
     @options.list = arg.to_sym
+  when "--fseg-id"
+    @options.fseg_id = arg.to_i
   when "--require"
     require File.expand_path(arg)
   when "--describer"
@@ -1733,18 +1564,31 @@ getopt.each do |opt, arg|
   end
 end
 
-unless @options.system_space_file or @options.space_file
-  usage 1, "System space file (-s) or space file (-f) must be specified"
+# rubocop:disable Style/IfUnlessModifier
+
+unless @options.system_space_file || @options.space_file
+  usage(1, "Either the --system-space-file (-s) or --space-file (-f) must be specified")
 end
 
-if @options.system_space_file and @options.space_file
-  usage 1, "Only one of system space or space file may be specified"
+if @options.system_space_file && @options.space_file
+  usage(1, "Only one of --system-space-file (-s) or --space-file (-f) may be specified")
 end
 
-if @options.trace > 1
-  BufferCursor.trace!
+system_space_options =
+  @options.table_name || @options.index_name || @options.system_space_tables || @options.data_directory
+
+if !@options.system_space_file && system_space_options
+  usage(
+    1,
+    %{
+      The --table-name (-T), --index-name (-I), --system-space-tables (-x), and --data-directory (-D)
+      options can only be used with the --system-space-file (-s) option
+    }.squish
+  )
 end
 
+BufferCursor.trace! if @options.trace > 1
+
 # A few globals that we'll try to populate from the command-line arguments.
 innodb_system = nil
 space = nil
@@ -1752,12 +1596,18 @@ index = nil
 page = nil
 
 if @options.system_space_file
-  innodb_system = Innodb::System.new(@options.system_space_file)
+  innodb_system = Innodb::System.new(@options.system_space_file, data_directory: @options.data_directory)
 end
 
-if innodb_system and @options.table_name
+if innodb_system && @options.table_name
   table_tablespace = innodb_system.space_by_table_name(@options.table_name)
-  space = table_tablespace || innodb_system.system_space
+  if table_tablespace
+    space = table_tablespace
+  elsif @options.system_space_tables
+    space = innodb_system.system_space
+  else
+    raise "Tablespace file not found and --system-space-tables (-x) is not enabled"
+  end
 elsif @options.space_file
   space = Innodb::Space.new(@options.space_file)
 else
@@ -1765,24 +1615,17 @@ else
 end
 
 if @options.describer
-  describer = eval(@options.describer)
-  unless describer
-    describer = Innodb::RecordDescriber.const_get(@options.describer)
-  end
+  describer = eval(@options.describer) # rubocop:disable Security/Eval
+  describer ||= Innodb::RecordDescriber.const_get(@options.describer)
   space.record_describer = describer.new
 end
 
-if innodb_system and @options.table_name and @options.index_name
+if innodb_system && @options.table_name && @options.index_name
   index = innodb_system.index_by_name(@options.table_name, @options.index_name)
-  if @options.page
-    page = space.page(@options.page)
-  else
-    page = index.root
-  end
+  page = @options.page ? space.page(@options.page) : index.root
 elsif @options.page
-  if page = space.page(@options.page) and page.type == :INDEX and page.root?
-    index = space.index(@options.page)
-  end
+  page = space.page(@options.page)
+  index = space.index(@options.page) if page&.type == :INDEX && page&.root?
 end
 
 # The non-option argument on the command line is the mode (usually the last,
@@ -1790,50 +1633,82 @@ end
 mode = ARGV.shift
 
 unless mode
-  usage 1, "At least one mode must be provided"
+  usage(1, "At least one mode must be provided")
 end
 
-if /^(system-|data-dictionary-)/.match(mode) and !innodb_system
-  usage 1, "System tablespace must be specified using -s/--system-space-file"
+if /^(system-|data-dictionary-)/.match(mode) && !innodb_system
+  usage(1, "System tablespace must be specified using --system-space-file (-s)")
 end
 
-if /^space-/.match(mode) and !space
-  usage 1, "Tablespace must be specified using either -f/--space-file or a combination of -s/--system-space-file and -T/--table"
+if /^space-/.match(mode) && !space
+  usage(
+    1,
+    %{
+      Tablespace must be specified using either --space-file (-f)
+      or a combination of --system-space-file (-s) and --table (-T)
+    }.squish
+  )
 end
 
-if /^index-/.match(mode) and !index
-  usage 1, "Index must be specified using a combination of either -f/--space-file and -p/--page or -s/--system-space-file, -T/--table-name, and -I/--index-name"
+if /^index-/.match(mode) && !index
+  usage(
+    1,
+    %{
+      Index must be specified using a combination of either --space-file (-f) and --page (-p)
+      or --system-space-file (-s), --table-name (-T), and --index-name (-I)
+    }.squish
+  )
 end
 
-if /^page-/.match(mode) and !page
-  usage 1, "Page number must be specified using -p/--page"
+if /^page-/.match(mode) && !page
+  usage(1, "Page number must be specified using --page (-p)")
 end
 
-if /^record-/.match(mode) and !@options.record
-  usage 1, "Record offset must be specified using -R/--record"
+if /^record-/.match(mode) && !@options.record
+  usage(1, "Record offset must be specified using --record (-R)")
 end
 
-if /-list-iterate$/.match(mode) and !@options.list
-  usage 1, "List name must be specified using -L/--list"
+if /^record-/.match(mode) && !page
+  usage(
+    1,
+    %{
+      An index page must be available when using --record (-R); specify either
+      --page (-p) or --table-name (-T) and --index-name (-I) for the index root page.
+    }
+  )
 end
 
-if /-level-/.match(mode) and !@options.level
-  usage 1, "Level must be specified using -l/--level"
+if /^record-/.match(mode) && page.type != :INDEX
+  usage(1, "Mode #{mode} may be used only with index pages")
 end
 
-if [
-  "index-recurse",
-  "index-record-offsets",
-  "index-digraph",
-  "index-level-summary",
-].include?(mode) and !index.record_describer
-  usage 1, "Record describer must be specified using -d/--describer"
+if /-list-iterate$/.match(mode) && !@options.list
+  usage(1, "List name must be specified using --list (-L)")
 end
 
-if @options.trace > 0
-  BufferCursor.trace!
+if /-level-/.match(mode) && !@options.level
+  usage(1, "Level must be specified using --level (-l)")
 end
 
+if %w[
+  index-recurse
+  index-record-offsets
+  index-digraph
+  index-level-summary
+].include?(mode) && !index.record_describer
+  usage(1, "Record describer must be specified using --describer (-d)")
+end
+
+if %w[
+  space-index-fseg-pages-summary
+].include?(mode) && !@options.fseg_id
+  usage(1, "File segment id must be specified using --fseg-id (-F)")
+end
+
+# rubocop:enable Style/IfUnlessModifier
+
+BufferCursor.trace! if @options.trace.positive?
+
 case mode
 when "system-spaces"
   system_spaces(innodb_system)
@@ -1849,9 +1724,10 @@ when "space-summary"
   space_summary(space, @options.page || 0)
 when "space-index-pages-summary"
   space_index_pages_summary(space, @options.page || 0)
+when "space-index-fseg-pages-summary"
+  space_index_fseg_pages_summary(space, @options.fseg_id)
 when "space-index-pages-free-plot"
-  file_name = space.name.sub(".ibd", "").sub(/[^a-zA-Z0-9_]/, "_")
-  space_index_pages_free_plot(space, file_name, @options.page || 0)
+  space_index_pages_free_plot(space, @options.page || 0)
 when "space-page-type-regions"
   space_page_type_regions(space, @options.page || 0)
 when "space-page-type-summary"
@@ -1866,12 +1742,10 @@ when "space-extents"
   space_extents(space)
 when "space-extents-illustrate"
   space_extents_illustrate(space)
-when "space-extents-illustrate-svg"
-  space_extents_illustrate_svg(space)
 when "space-lsn-age-illustrate"
   space_lsn_age_illustrate(space)
-when "space-lsn-age-illustrate-svg"
-  space_lsn_age_illustrate_svg(space)
+when "space-inodes-fseg-id"
+  space_inodes_fseg_id(space)
 when "space-inodes-summary"
   space_inodes_summary(space)
 when "space-inodes-detail"
@@ -1900,6 +1774,8 @@ when "page-dump"
   page.dump
 when "page-account"
   page_account(innodb_system, space, @options.page)
+when "page-validate"
+  page_validate(innodb_system, space, @options.page)
 when "page-directory-summary"
   page_directory_summary(space, page)
 when "page-records"