innodb_ruby 0.9.14 → 0.12.0

data/lib/innodb/record.rb

@@ -1,199 +1,156 @@
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 
-class Innodb::Record
-  attr_reader :page
-  attr_accessor :record
+require "forwardable"
 
-  def initialize(page, record)
-    @page = page
-    @record = record
-  end
-
-  def header
-    record[:header]
-  end
-
-  def next
-    header[:next]
-  end
-
-  def type
-    header[:type]
-  end
+module Innodb
+  class Record
+    extend Forwardable
 
-  def heap_number
-    header[:heap_number]
-  end
-
-  def n_owned
-    header[:n_owned]
-  end
-
-  def deleted?
-    header[:deleted]
-  end
-
-  def min_rec?
-    header[:min_rec]
-  end
+    attr_reader :page
+    attr_accessor :record
 
-  def offset
-    record[:offset]
-  end
-
-  def length
-    record[:length]
-  end
-
-  def next
-    record[:next]
-  end
-
-  def key
-    record[:key]
-  end
+    def initialize(page, record)
+      @page = page
+      @record = record
+    end
 
-  def key_string
-    key && key.map { |r| "%s=%s" % [r[:name], r[:value].inspect] }.join(", ")
-  end
+    def_delegator :record, :header
+    def_delegator :record, :offset
+    def_delegator :record, :length
+    def_delegator :record, :next
+    def_delegator :record, :key
+    def_delegator :record, :row
+    def_delegator :record, :transaction_id
+    def_delegator :record, :roll_pointer
+    def_delegator :record, :child_page_number
+
+    def_delegator :header, :type
+    def_delegator :header, :heap_number
+    def_delegator :header, :n_owned
+    def_delegator :header, :heap_number
+    def_delegator :header, :deleted?
+    def_delegator :header, :min_rec?
+
+    def key_string
+      key&.map { |r| "%s=%s" % [r.name, r.value.inspect] }&.join(", ")
+    end
 
-  def row
-    record[:row]
-  end
+    def row_string
+      row&.map { |r| "%s=%s" % [r.name, r.value.inspect] }&.join(", ")
+    end
 
-  def row_string
-    row && row.map { |r| "%s=%s" % [r[:name], r[:value].inspect] }.join(", ")
-  end
+    def undo
+      return nil unless roll_pointer
+      return unless (innodb_system = @page.space.innodb_system)
 
-  def transaction_id
-    record[:transaction_id]
-  end
+      undo_page = innodb_system.system_space.page(roll_pointer.undo_log.page)
+      return unless undo_page
 
-  def roll_pointer
-    record[:roll_pointer]
-  end
+      new_undo_record = Innodb::UndoRecord.new(undo_page, roll_pointer.undo_log.offset)
+      new_undo_record.index_page = page
+      new_undo_record
+    end
 
-  def undo
-    return nil unless roll_pointer
+    def each_undo_record
+      return enum_for(:each_undo_record) unless block_given?
 
-    if innodb_system = @page.space.innodb_system
-      undo_space = innodb_system.system_space
-      if undo_page = undo_space.page(roll_pointer[:undo_log][:page])
-        new_undo_record = Innodb::UndoRecord.new(undo_page, roll_pointer[:undo_log][:offset])
-        new_undo_record.index_page = page
-        new_undo_record
+      undo_record = undo
+      while undo_record
+        yield undo_record
+        undo_record = undo_record.prev_by_history
       end
-    end
-  end
-
-  def each_undo_record
-    unless block_given?
-      return enum_for(:each_undo_record)
-    end
 
-    undo_record = undo
-    while undo_record
-      yield undo_record
-      undo_record = undo_record.prev_by_history
+      nil
     end
 
-    nil
-  end
-
-  def child_page_number
-    record[:child_page_number]
-  end
-
-  def string
-    if child_page_number
-      "(%s) → #%s" % [key_string, child_page_number]
-    else
-      "(%s) → (%s)" % [key_string, row_string]
+    def string
+      if child_page_number
+        "(%s) → #%s" % [key_string, child_page_number]
+      else
+        "(%s) → (%s)" % [key_string, row_string]
+      end
     end
-  end
 
-  def uncached_fields
-    fields_hash = {}
-    [:key, :row].each do |group|
-      if record[group]
-        record[group].each do |column|
-          fields_hash[column[:name]] = column[:value]
+    def uncached_fields
+      fields_hash = {}
+      %i[key row].each do |group|
+        record[group]&.each do |column|
+          fields_hash[column.name] = column.value
         end
       end
+      fields_hash
     end
-    fields_hash
-  end
 
-  def fields
-    @fields ||= uncached_fields
-  end
+    def fields
+      @fields ||= uncached_fields
+    end
+
+    # Compare two arrays of fields to determine if they are equal. This follows
+    # the same comparison rules as strcmp and others:
+    #   0 = a is equal to b
+    #   -1 = a is less than b
+    #   +1 = a is greater than b
+    def compare_key(other_key)
+      Innodb::Stats.increment :compare_key
+
+      return 0 if other_key.nil? && key.nil?
+      return -1 if other_key.nil? || (!key.nil? && other_key.size < key.size)
+      return +1 if key.nil? || (!other_key.nil? && other_key.size > key.size)
+
+      key.each_index do |i|
+        Innodb::Stats.increment :compare_key_field_comparison
+        return -1 if other_key[i] < key[i].value
+        return +1 if other_key[i] > key[i].value
+      end
 
-  # Compare two arrays of fields to determine if they are equal. This follows
-  # the same comparison rules as strcmp and others:
-  #   0 = a is equal to b
-  #   -1 = a is less than b
-  #   +1 = a is greater than b
-  def compare_key(other_key)
-    Innodb::Stats.increment :compare_key
-
-    return 0 if other_key.nil? && key.nil?
-    return -1 if other_key.nil? || (!key.nil? && other_key.size < key.size)
-    return +1 if key.nil? || (!other_key.nil? && other_key.size > key.size)
-
-    key.each_index do |i|
-      Innodb::Stats.increment :compare_key_field_comparison
-      return -1 if other_key[i] < key[i][:value]
-      return +1 if other_key[i] > key[i][:value]
+      0
     end
 
-    return 0
-  end
+    def dump
+      puts "Record at offset %i" % offset
+      puts
 
-  def dump
-    puts "Record at offset %i" % offset
-    puts
-
-    puts "Header:"
-    puts "  %-20s: %i" % ["Next record offset", header[:next]]
-    puts "  %-20s: %i" % ["Heap number", header[:heap_number]]
-    puts "  %-20s: %s" % ["Type", header[:type]]
-    puts "  %-20s: %s" % ["Deleted", header[:deleted]]
-    puts "  %-20s: %s" % ["Length", header[:length]]
-    puts
-
-    if page.leaf?
-      puts "System fields:"
-      puts "  Transaction ID: %s" % transaction_id
-      puts "  Roll Pointer:"
-      puts "    Undo Log: page %i, offset %i" % [
-        roll_pointer[:undo_log][:page],
-        roll_pointer[:undo_log][:offset],
-      ]
-      puts "    Rollback Segment ID: %i" % roll_pointer[:rseg_id]
-      puts "    Insert: %s" % roll_pointer[:is_insert]
+      puts "Header:"
+      puts "  %-20s: %i" % ["Next record offset", header.next]
+      puts "  %-20s: %i" % ["Heap number", header.heap_number]
+      puts "  %-20s: %s" % ["Type", header.type]
+      puts "  %-20s: %s" % ["Deleted", header.deleted?]
+      puts "  %-20s: %s" % ["Length", header.length]
       puts
-    end
 
-    puts "Key fields:"
-    key.each do |field|
-      puts "  %s: %s" % [
-        field[:name],
-        field[:value].inspect,
-      ]
-    end
-    puts
+      if page.leaf?
+        puts "System fields:"
+        puts "  Transaction ID: %s" % transaction_id
+        puts "  Roll Pointer:"
+        puts "    Undo Log: page %i, offset %i" % [
+          roll_pointer.undo_log.page,
+          roll_pointer.undo_log.offset,
+        ]
+        puts "    Rollback Segment ID: %i" % roll_pointer.rseg_id
+        puts "    Insert: %s" % roll_pointer.is_insert
+        puts
+      end
 
-    if page.leaf?
-      puts "Non-key fields:"
-      row.each do |field|
+      puts "Key fields:"
+      key.each do |field|
         puts "  %s: %s" % [
-          field[:name],
-          field[:value].inspect,
+          field.name,
+          field.value.inspect,
         ]
       end
       puts
-    else
-      puts "Child page number: %i" % child_page_number
+
+      if page.leaf?
+        puts "Non-key fields:"
+        row.each do |field|
+          puts "  %s: %s" % [
+            field.name,
+            field.value.inspect,
+          ]
+        end
+      else
+        puts "Child page number: %i" % child_page_number
+      end
       puts
     end
   end

data/lib/innodb/record_describer.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 
 #
 # A class to describe record layouts for InnoDB indexes. Designed to be usable
@@ -54,87 +54,85 @@
 #   my_table_clustered.row "age", :INT, :UNSIGNED
 #
 
-class Innodb::RecordDescriber
-  # Internal method to initialize the class's instance variable on access.
-  def self.static_description
-    @static_description ||= {
-      :type => nil,
-      :key => [],
-      :row => []
-    }
-  end
+module Innodb
+  class RecordDescriber
+    # Internal method to initialize the class's instance variable on access.
+    def self.static_description
+      @static_description ||= { type: nil, key: [], row: [] }
+    end
 
-  # A 'type' method to be used from the DSL.
-  def self.type(type)
-    static_description[:type] = type
-  end
+    # A 'type' method to be used from the DSL.
+    def self.type(type)
+      static_description[:type] = type
+    end
 
-  # An internal method wrapped with 'key' and 'row' helpers.
-  def self.add_static_field(group, name, type)
-    static_description[group] << { :name => name, :type => type }
-  end
+    # An internal method wrapped with 'key' and 'row' helpers.
+    def self.add_static_field(group, name, type)
+      static_description[group] << { name: name, type: type }
+    end
 
-  # A 'key' method to be used from the DSL.
-  def self.key(name, *type)
-    add_static_field :key, name, type
-  end
+    # A 'key' method to be used from the DSL.
+    def self.key(name, *type)
+      add_static_field :key, name, type
+    end
 
-  # A 'row' method to be used from the DSL.
-  def self.row(name, *type)
-    add_static_field :row, name, type
-  end
+    # A 'row' method to be used from the DSL.
+    def self.row(name, *type)
+      add_static_field :row, name, type
+    end
 
-  attr_accessor :description
+    attr_accessor :description
 
-  def initialize
-    @description = self.class.static_description.dup
-    @description[:key] = @description[:key].dup
-    @description[:row] = @description[:row].dup
-  end
+    def initialize
+      @description = self.class.static_description.dup
+      @description[:key] = @description[:key].dup
+      @description[:row] = @description[:row].dup
+    end
 
-  # Set the type of this record (:clustered or :secondary).
-  def type(type)
-    description[:type] = type
-  end
+    # Set the type of this record (:clustered or :secondary).
+    def type(type)
+      description[:type] = type
+    end
 
-  # An internal method wrapped with 'key' and 'row' helpers.
-  def add_field(group, name, type)
-    description[group] << { :name => name, :type => type }
-  end
+    # An internal method wrapped with 'key' and 'row' helpers.
+    def add_field(group, name, type)
+      description[group] << { name: name, type: type }
+    end
 
-  # Add a key column to the record description.
-  def key(name, *type)
-    add_field :key, name, type
-  end
+    # Add a key column to the record description.
+    def key(name, *type)
+      add_field :key, name, type
+    end
 
-  # Add a row (non-key) column to the record description.
-  def row(name, *type)
-    add_field :row, name, type
-  end
+    # Add a row (non-key) column to the record description.
+    def row(name, *type)
+      add_field :row, name, type
+    end
 
-  def field_names
-    names = []
-    [:key, :row].each do |group|
-      names += description[group].map { |n| n[:name] }
+    def field_names
+      names = []
+      %i[key row].each do |group|
+        names += description[group].map { |n| n[:name] }
+      end
+      names
     end
-    names
-  end
 
-  def generate_class(name="Describer_#{object_id}")
-    str = "class #{name}\n"
-    str << "  type %s\n" % [
-      description[:type].inspect
-    ]
-    [:key, :row].each do |group|
-      description[group].each do |item|
-        str << "  %s %s, %s\n" % [
-          group,
-          item[:name].inspect,
-          item[:type].map { |s| s.inspect }.join(", "),
-        ]
+    def generate_class(name = "Describer_#{object_id}")
+      str = "class #{name}\n".dup
+      str << "  type %s\n" % [
+        description[:type].inspect,
+      ]
+      %i[key row].each do |group|
+        description[group].each do |item|
+          str << "  %s %s, %s\n" % [
+            group,
+            item[:name].inspect,
+            item[:type].map(&:inspect).join(", "),
+          ]
+        end
       end
+      str << "end\n"
+      str
     end
-    str << "end\n"
-    str
   end
 end