innodb_ruby 0.9.15 → 0.9.16

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4fb0470eeceb5fbe16a858c30310c5046a8d2512
+  data.tar.gz: f9396fbc702f8b4be752c8300f9dc7cb47317cc2
+SHA512:
+  metadata.gz: 001c98d6754675ecfa62f6e93562fc3c398ecfe9f18c869a0685816102dc8d37b0001ebbca317c3aaa0da75616fa5e7669eb537afcad548f301ec61329988f02
+  data.tar.gz: 2ea7115e3ca1fabfa606789ca645605feca86a4bedb5b1fc3dc5a8369d6bd46b653990eb35d70f0b5ee785f77e6983ef9609ebc7e508c89cd0174bdffc1523bf

data/bin/innodb_space

@@ -339,6 +339,10 @@ 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",
@@ -413,11 +417,12 @@ def space_list_iterate(space, list_name)
 end
 
 def space_indexes(innodb_system, space)
-  puts "%-12s%-32s%-12s%-12s%-12s%-12s%-12s" % [
+  puts "%-12s%-32s%-12s%-12s%-12s%-12s%-12s%-12s" % [
     "id",
     "name",
     "root",
     "fseg",
+    "fseg_id",
     "used",
     "allocated",
     "fill_factor",
@@ -425,11 +430,12 @@ def space_indexes(innodb_system, space)
 
   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,
@@ -987,6 +993,12 @@ def print_inode_detail(inode)
   ]
 end
 
+def space_inodes_fseg_id(space)
+  space.each_inode do |inode|
+    puts inode.fseg_id
+  end
+end
+
 def space_inodes_summary(space)
   space.each_inode do |inode|
     print_inode_summary(inode)
@@ -1310,7 +1322,8 @@ 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)
@@ -1373,12 +1386,19 @@ def page_illustrate(page)
   ]
   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),
   ]
 
+  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
 
@@ -1639,6 +1659,9 @@ The following options are supported:
   --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
     classes with record describers.
@@ -1673,6 +1696,10 @@ The following modes are supported:
     "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
@@ -1721,6 +1748,9 @@ The following modes are supported:
     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.
 
@@ -1814,6 +1844,7 @@ 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
@@ -1829,6 +1860,7 @@ 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 ],
@@ -1859,6 +1891,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"
@@ -1967,6 +2001,10 @@ if [
   usage 1, "Record describer must be specified using -d/--describer"
 end
 
+if ["space-index-fseg-pages-summary"].include?(mode) and !@options.fseg_id
+  usage 1, "File segment id must be specified using -F/--fseg-id"
+end
+
 if @options.trace > 0
   BufferCursor.trace!
 end
@@ -1986,6 +2024,8 @@ 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)
@@ -2009,6 +2049,8 @@ 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"

data/lib/innodb/checksum.rb

@@ -7,14 +7,14 @@ class Innodb::Checksum
 
   # This is derived from ut_fold_ulint_pair in include/ut0rnd.ic in the
   # InnoDB source code. Since Ruby's Bignum class is *much* slower than its
-  # Fixnum class, we mask back to 32 bits to keep things from overflowing
+  # Integer class, we mask back to 32 bits to keep things from overflowing
   # and being promoted to Bignum.
   def self.fold_pair(n1, n2)
     (((((((n1 ^ n2 ^ MASK2) << 8) & MAX) + n1) & MAX) ^ MASK1) + n2) & MAX
   end
 
   # Iterate through the provided enumerator, which is expected to return a
-  # Fixnum (or something coercible to it), and "fold" them together to produce
+  # Integer (or something coercible to it), and "fold" them together to produce
   # a single value.
   def self.fold_enumerator(enumerator)
     fold = 0

data/lib/innodb/data_type.rb

@@ -129,11 +129,12 @@ class Innodb::DataType
       end
 
       frac << get_digits(stream, mask, @comp_fractional)
+      frac = "0" if frac.empty?
 
       # Convert to something resembling a string representation.
       str = mask.to_s.chop + intg + '.' + frac
 
-      BigDecimal.new(str).to_s('F')
+      BigDecimal(str).to_s('F')
     end
 
     private

data/lib/innodb/inode.rb

@@ -127,9 +127,52 @@ class Innodb::Inode
 
   # Iterate through all lists, yielding the list name and the list itself.
   def each_list
+    unless block_given?
+      return enum_for(:each_list)
+    end
+
     lists.each do |name|
       yield name, list(name)
     end
+
+    nil
+  end
+
+  # Iterate through the fragment array followed by all lists, yielding the
+  # page number. This allows a convenient way to identify all pages that are
+  # part of this inode.
+  def each_page_number
+    unless block_given?
+      return enum_for(:each_page_number)
+    end
+
+    frag_array_pages.each do |page_number|
+      yield page_number
+    end
+
+    each_list do |fseg_name, fseg_list|
+      fseg_list.each do |xdes|
+        xdes.each_page_status do |page_number|
+          yield page_number
+        end
+      end
+    end
+
+    nil
+  end
+
+  # Iterate through the page as associated with this inode using the
+  # each_page_number method, and yield the page number and page.
+  def each_page
+    unless block_given?
+      return enum_for(:each_page)
+    end
+
+    each_page_number do |page_number|
+      yield page_number, space.page(page_number)
+    end
+
+    nil
   end
 
   # Compare one Innodb::Inode to another.

data/lib/innodb/record.rb

@@ -13,10 +13,6 @@ class Innodb::Record
     record[:header]
   end
 
-  def next
-    header[:next]
-  end
-
   def type
     header[:type]
   end

data/lib/innodb/space.rb

@@ -379,6 +379,12 @@ class Innodb::Space
     end
   end
 
+  # Return an Inode by fseg_id. Iterates through the inode list, but it
+  # normally is fairly small, so should be relatively efficient.
+  def inode(fseg_id)
+    each_inode.select { |inode| inode.fseg_id == fseg_id }.first
+  end
+
   # Iterate through the page numbers in the doublewrite buffer.
   def each_doublewrite_page_number
     return nil unless system_space?

data/lib/innodb/version.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: innodb_ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.15
-  prerelease: 
+  version: 0.9.16
 platform: ruby
 authors:
 - Jeremy Cole
@@ -10,38 +9,46 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2019-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: digest-crc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
 description: Library for parsing InnoDB data files in Ruby
@@ -52,9 +59,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - AUTHORS.md
+- LICENSE
 - README.md
+- bin/innodb_log
+- bin/innodb_space
 - lib/innodb.rb
 - lib/innodb/checksum.rb
 - lib/innodb/data_dictionary.rb
@@ -68,12 +77,12 @@ files:
 - lib/innodb/index.rb
 - lib/innodb/inode.rb
 - lib/innodb/list.rb
-- lib/innodb/lsn.rb
 - lib/innodb/log.rb
 - lib/innodb/log_block.rb
 - lib/innodb/log_group.rb
-- lib/innodb/log_record.rb
 - lib/innodb/log_reader.rb
+- lib/innodb/log_record.rb
+- lib/innodb/lsn.rb
 - lib/innodb/page.rb
 - lib/innodb/page/blob.rb
 - lib/innodb/page/fsp_hdr_xdes.rb
@@ -98,31 +107,28 @@ files:
 - lib/innodb/util/read_bits_at_offset.rb
 - lib/innodb/version.rb
 - lib/innodb/xdes.rb
-- bin/innodb_log
-- bin/innodb_space
 homepage: https://github.com/jeremycole/innodb_ruby
 licenses:
-- New BSD (3-clause)
+- BSD-3-Clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.2.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: InnoDB data file parser
 test_files: []