innodb_ruby 0.8.1 → 0.8.5

data/lib/innodb/page/index.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "innodb/fseg_entry"
 
 # A specialized class for handling INDEX pages, which contain a portion of
@@ -335,22 +336,22 @@ class Innodb::Page::Index < Innodb::Page
 
   # Return an array indicating which fields are null.
   def record_header_compact_null_bitmap(cursor)
-    columns = (record_format[:key] + record_format[:row])
+    fields = (record_format[:key] + record_format[:row])
 
     # The number of bits in the bitmap is the number of nullable fields.
-    size = columns.count { |c| c[:field].type.nullable? }
+    size = fields.count { |f| f.nullable? }
 
     # There is no bitmap if there are no nullable fields.
     return nil unless size > 0
 
     # To simplify later checks, expand bitmap to one for each field.
-    bitmap = Array.new(columns.last[:field].position + 1, false)
+    bitmap = Array.new(fields.last.position + 1, false)
 
     null_bit_array = cursor.get_bit_array(size).reverse!
 
     # For every nullable field, set whether the field is actually null.
-    columns.each do |c|
-      bitmap[c[:field].position] = c[:field].type.nullable? ? (null_bit_array.shift == 1) : false
+    fields.each do |f|
+      bitmap[f.position] = f.nullable? ? (null_bit_array.shift == 1) : false
     end
 
     return bitmap
@@ -359,23 +360,22 @@ class Innodb::Page::Index < Innodb::Page
   # Return an array containing an array of the length of each variable-length
   # field and an array indicating which fields are stored externally.
   def record_header_compact_variable_lengths_and_externs(cursor, null_bitmap)
-    columns = (record_format[:key] + record_format[:row])
+    fields = (record_format[:key] + record_format[:row])
 
-    len_array = Array.new(columns.last[:field].position + 1, 0)
-    ext_array = Array.new(columns.last[:field].position + 1, false)
+    len_array = Array.new(fields.last.position + 1, 0)
+    ext_array = Array.new(fields.last.position + 1, false)
 
     # For each non-NULL variable-length field, the record header contains
     # the length in one or two bytes.
-    columns.each do |c|
-      f = c[:field]
-      next if !f.type.variable? or (null_bitmap && null_bitmap[f.position])
+    fields.each do |f|
+      next if !f.variable? or (null_bitmap && null_bitmap[f.position])
 
       len = cursor.get_uint8
       ext = false
 
       # Two bytes are used only if the length exceeds 127 bytes and the
       # maximum length exceeds 255 bytes (or the field is a BLOB type).
-      if len > 127 && (f.type.blob? || f.type.length > 255)
+      if len > 127 && (f.blob? || f.data_type.width > 255)
         ext = (0x40 & len) != 0
         len = ((len & 0x3f) << 8) + cursor.get_uint8
       end
@@ -429,12 +429,12 @@ class Innodb::Page::Index < Innodb::Page
   def system_record(offset)
     cursor(offset).name("record[#{offset}]") do |c|
       header = c.peek { record_header(c) }
-      {
+      Innodb::Record.new({
         :offset => offset,
         :header => header,
         :next => header[:next],
         :data => c.name("data") { c.get_bytes(size_mum_record) },
-      }
+      })
     end
   end
 
@@ -456,10 +456,7 @@ class Innodb::Page::Index < Innodb::Page
     fields = {:type => description[:type], :key => [], :row => []}
 
     description[:key].each do |field|
-      fields[:key] << {
-        :name => field[:name],
-        :field => Innodb::Field.new(position, *field[:type]),
-      }
+      fields[:key] << Innodb::Field.new(position, field[:name], *field[:type])
       position += 1
     end
 
@@ -469,10 +466,7 @@ class Innodb::Page::Index < Innodb::Page
     end
 
     description[:row].each do |field|
-      fields[:row] << {
-        :name => field[:name],
-        :field => Innodb::Field.new(position, *field[:type]),
-      }
+      fields[:row] << Innodb::Field.new(position, field[:name], *field[:type])
       position += 1
     end
 
@@ -508,12 +502,13 @@ class Innodb::Page::Index < Innodb::Page
 
         # Read the key fields present in all types of pages.
         this_record[:key] = []
-        record_format[:key].each do |column|
-          c.name("key[#{column[:name]}]") do
+        record_format[:key].each do |f|
+          c.name("key[#{f.name}]") do
             this_record[:key] << {
-              :name => column[:name],
-              :value => column[:field].read(this_record, c),
-              :extern => column[:field].read_extern(this_record, c),
+              :name => f.name,
+              :type => f.data_type.name,
+              :value => f.value(this_record, c),
+              :extern => f.extern(this_record, c),
             }
           end
         end
@@ -543,12 +538,13 @@ class Innodb::Page::Index < Innodb::Page
           (record_format[:type] == :secondary)
           # Read the non-key fields.
           this_record[:row] = []
-          record_format[:row].each do |column|
-            c.name("row[#{column[:name]}]") do
+          record_format[:row].each do |f|
+            c.name("row[#{f.name}]") do
               this_record[:row] << {
-                :name => column[:name],
-                :value => column[:field].read(this_record, c),
-                :extern => column[:field].read_extern(this_record, c),
+                :name => f.name,
+                :type => f.data_type.name,
+                :value => f.value(this_record, c),
+                :extern => f.extern(this_record, c),
               }
             end
           end
@@ -563,7 +559,7 @@ class Innodb::Page::Index < Innodb::Page
         end
       end
 
-      this_record
+      Innodb::Record.new(this_record)
     end
   end
 
@@ -584,13 +580,13 @@ class Innodb::Page::Index < Innodb::Page
       if record == @page.supremum
         # We've reached the end of the linked list at supremum.
         @offset = nil
-      elsif record[:next] == @offset
+      elsif record.next == @offset
         # The record links to itself; go ahead and return it (once), but set
         # the next offset to nil to end the loop.
         @offset = nil
         record
       else
-        @offset = record[:next]
+        @offset = record.next
         record
       end
     end
@@ -603,7 +599,7 @@ class Innodb::Page::Index < Innodb::Page
 
   # Return the first record on this page.
   def first_record
-    first = record(infimum[:next])
+    first = record(infimum.next)
     first if first != supremum
   end
 
@@ -613,7 +609,7 @@ class Innodb::Page::Index < Innodb::Page
       return enum_for(:each_record)
     end
 
-    c = record_cursor(infimum[:next])
+    c = record_cursor(infimum.next)
 
     while rec = c.record
       yield rec
@@ -651,7 +647,7 @@ class Innodb::Page::Index < Innodb::Page
     end
 
     each_record do |rec|
-      yield rec[:child_page_number], rec[:key]
+      yield rec.child_page_number, rec.key
     end
 
     nil
@@ -701,20 +697,20 @@ class Innodb::Page::Index < Innodb::Page
     puts
 
     puts "system records:"
-    pp infimum
-    pp supremum
+    pp infimum.record
+    pp supremum.record
     puts
 
     puts "garbage records:"
     each_garbage_record do |rec|
-      pp rec
+      pp rec.record
       puts
     end
     puts
 
     puts "records:"
     each_record do |rec|
-      pp rec
+      pp rec.record
       puts
     end
     puts

data/lib/innodb/page/index_compressed.rb

@@ -0,0 +1,42 @@
+# -*- encoding : utf-8 -*-
+
+class Innodb::Page::Index::Compressed < Innodb::Page::Index
+  # The number of directory slots in use.
+  def directory_slots
+    page_header[:n_heap] - 2
+  end
+
+  def directory
+    super.map { |n| n & 0x3fff }
+  end
+
+  def uncompressed_columns_size
+    if level == 0
+      if record_format && record_format[:type] == :clustered
+        6 + 7 # Transaction ID + Roll Pointer
+      else
+        0
+      end
+    else
+      4 # Node pointer for non-leaf pages
+    end
+  end
+
+  # Return the amount of free space in the page.
+  def free_space
+    free_space_start = size - size_fil_trailer - directory_space -
+      (uncompressed_columns_size * (page_header[:n_heap] - 2))
+    puts "Free space start == %04x" % [offset * size + free_space_start]
+    c = cursor(free_space_start).backward
+    zero_bytes = 0
+    while (b = c.get_uint8) == 0
+      zero_bytes += 1
+    end
+    zero_bytes
+    #page_header[:garbage] +
+    #  (size - size_fil_trailer - directory_space - page_header[:heap_top])
+  end
+end
+
+Innodb::Page::SPECIALIZED_CLASSES[{:type => :INDEX, :compressed => true}] = Innodb::Page::Index::Compressed
+

data/lib/innodb/page/inode.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "innodb/list"
 
 # A specialized class for handling INODE pages, which contain index FSEG (file

data/lib/innodb/page/sys.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "innodb/page/sys_rseg_header"
 require "innodb/page/sys_data_dictionary_header"
 

data/lib/innodb/page/sys_rseg_header.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Innodb::Page::SysRsegHeader < Innodb::Page
   # The position of the rollback segment header within the page.
   def pos_rseg_header

data/lib/innodb/page/trx_sys.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 # A specialized class for TRX_SYS pages, which contain various information
 # about the transaction system within InnoDB. Only one TRX_SYS page exists in
 # any given InnoDB installation, and it is page 5 of the system tablespace

data/lib/innodb/page.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "innodb/cursor"
 
 # A generic class for any type of page, which handles reading the common

data/lib/innodb/record.rb

@@ -0,0 +1,49 @@
+# -*- encoding : utf-8 -*-
+
+class Innodb::Record
+  attr_accessor :record
+
+  def initialize(record)
+    @record = record
+  end
+
+  def header
+    record[:header]
+  end
+
+  def offset
+    record[:offset]
+  end
+
+  def next
+    record[:next]
+  end
+
+  def key
+    record[:key]
+  end
+
+  def row
+    record[:row]
+  end
+
+  def child_page_number
+    record[:child_page_number]
+  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]
+        end
+      end
+    end
+    fields_hash
+  end
+
+  def fields
+    @fields ||= uncached_fields
+  end
+end

data/lib/innodb/record_describer.rb

@@ -110,6 +110,14 @@ class Innodb::RecordDescriber
     add_field :row, name, type
   end
 
+  def field_names
+    names = []
+    [:key, :row].each do |group|
+      names += description[group].map { |n| n[:name] }
+    end
+    names
+  end
+
   def generate_class(name="Describer_#{object_id}")
     str = "class #{name}\n"
     str << "  type %s\n" % [

data/lib/innodb/space.rb

@@ -1,6 +1,8 @@
 # -*- encoding : utf-8 -*-
+
 # An InnoDB space file, which can be either a multi-table ibdataN file
 # or a single-table "innodb_file_per_table" .ibd file.
+
 class Innodb::Space
   # InnoDB's default page size is 16KiB.
   DEFAULT_PAGE_SIZE = 16384
@@ -175,6 +177,10 @@ class Innodb::Space
     @fsp ||= page(page_fsp_hdr).fsp_header
   end
 
+  def space_id
+    fsp[:space_id]
+  end
+
   # Return the page number for the space's TRX_SYS page.
   def page_trx_sys
     5

data/lib/innodb/system.rb

@@ -0,0 +1,58 @@
+# -*- encoding : utf-8 -*-
+
+class Innodb::System
+  attr_reader :config
+  attr_accessor :spaces
+
+  def initialize(system_space_file)
+    @config = {
+      :datadir => ".",
+    }
+    @spaces = {}
+    @spaces[0] = Innodb::Space.new(system_space_file)
+  end
+
+  def system_space
+    @spaces[0]
+  end
+
+  def each_record_from_data_dictionary_index(table, index)
+    unless block_given?
+      return enum_for(:each_record_from_data_dictionary_index, table, index)
+    end
+
+    index = system_space.data_dictionary.index(table, index)
+    index.each_record do |record|
+      yield record
+    end
+    nil
+  end
+
+  def each_table
+    unless block_given?
+      return enum_for(:each_table)
+    end
+
+    each_record_from_data_dictionary_index(:SYS_TABLES, :PRIMARY) do |record|
+      yield record.fields
+    end
+  end
+
+  def each_index
+    unless block_given?
+      return enum_for(:each_index)
+    end
+
+    each_record_from_data_dictionary_index(:SYS_INDEXES, :PRIMARY) do |record|
+      yield record.fields
+    end
+  end
+
+  def add_space(space)
+    @spaces[space.space_id] = space
+  end
+
+  def add_space_file(space_file)
+    add_space(Innodb::Space.new(space_file))
+  end
+end

data/lib/innodb/undo_log.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 
 class Innodb::UndoLog
   attr_reader :page

data/lib/innodb/version.rb

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

data/lib/innodb/xdes.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 # An InnoDB "extent descriptor entry" or "+XDES+". These structures are used
 # in the +XDES+ entry array contained in +FSP_HDR+ and +XDES+ pages.
 #

data/lib/innodb.rb

@@ -1,5 +1,7 @@
 # -*- encoding : utf-8 -*-
+
 # A set of classes for parsing and working with InnoDB data files.
+
 module Innodb; end
 
 require "enumerator"
@@ -16,8 +18,10 @@ require "innodb/page/index"
 require "innodb/page/trx_sys"
 require "innodb/page/sys"
 require "innodb/page/undo_log"
+require "innodb/record"
 require "innodb/field"
 require "innodb/space"
+require "innodb/system"
 require "innodb/inode"
 require "innodb/index"
 require "innodb/log_block"

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: innodb_ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
 - Jeremy Cole
+- Davi Arnaut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -35,38 +36,45 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- AUTHORS.md
 - README.md
 - lib/innodb.rb
 - lib/innodb/checksum.rb
 - lib/innodb/cursor.rb
 - lib/innodb/data_dictionary.rb
+- lib/innodb/data_type.rb
 - lib/innodb/field.rb
-- lib/innodb/field_type.rb
 - lib/innodb/fseg_entry.rb
 - lib/innodb/index.rb
 - lib/innodb/inode.rb
 - lib/innodb/list.rb
 - lib/innodb/log.rb
 - lib/innodb/log_block.rb
+- lib/innodb/log_group.rb
 - lib/innodb/page.rb
 - lib/innodb/page/blob.rb
 - lib/innodb/page/fsp_hdr_xdes.rb
 - lib/innodb/page/index.rb
+- lib/innodb/page/index_compressed.rb
 - lib/innodb/page/inode.rb
 - lib/innodb/page/sys.rb
 - lib/innodb/page/sys_data_dictionary_header.rb
 - lib/innodb/page/sys_rseg_header.rb
 - lib/innodb/page/trx_sys.rb
 - lib/innodb/page/undo_log.rb
+- lib/innodb/record.rb
 - lib/innodb/record_describer.rb
 - lib/innodb/space.rb
+- lib/innodb/system.rb
 - lib/innodb/undo_log.rb
 - lib/innodb/version.rb
 - lib/innodb/xdes.rb
 - bin/innodb_log
 - bin/innodb_space
-homepage: http://jcole.us/
-licenses: []
+homepage: https://github.com/jeremycole/innodb_ruby
+licenses:
+- New BSD (3-clause)
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/innodb/field_type.rb

@@ -1,124 +0,0 @@
-# -*- encoding : utf-8 -*-
-class Innodb::FieldType
-  class GenericType
-    attr_reader :type
-
-    def initialize(type)
-      @type = type
-    end
-
-    def read(cursor, length)
-      cursor.get_bytes(length)
-    end
-
-    def read_extern(cursor)
-      cursor.name("extern") { get_extern_field(cursor) }
-    end
-
-    # Return an external reference field. An extern field contains the page
-    # address and the length of the externally stored part of the record data.
-    def get_extern_field(cursor)
-      {
-        :space_id     => cursor.name("space_id")    { cursor.get_uint32 },
-        :page_number  => cursor.name("page_number") { cursor.get_uint32 },
-        :offset       => cursor.name("offset")      { cursor.get_uint32 },
-        :length       => cursor.name("length")      { cursor.get_uint64 & 0x3fffffff }
-      }
-    end
-  end
-
-  class IntegerType < GenericType
-    def read(cursor, length)
-      method = type.unsigned? ? :get_uint_by_size : :get_i_sint_by_size
-      cursor.send(method, type.length)
-    end
-  end
-
-  class VariableStringType < GenericType
-    def read(cursor, length)
-      # The SQL standard defines that VARCHAR fields should have end-spaces
-      # stripped off.
-      super.sub(/[ ]+$/, "")
-    end
-  end
-
-  # Maps data type to fixed storage length.
-  TYPES = {
-    :TINYINT    => { :class => IntegerType, :length => 1 },
-    :SMALLINT   => { :class => IntegerType, :length => 2 },
-    :MEDIUMINT  => { :class => IntegerType, :length => 3 },
-    :INT        => { :class => IntegerType, :length => 4 },
-    :INT6       => { :class => IntegerType, :length => 6 },
-    :BIGINT     => { :class => IntegerType, :length => 8 },
-    :CHAR       => { :class => GenericType },
-    :VARCHAR    => { :class => VariableStringType },
-    :BLOB       => { :class => GenericType },
-  }
-
-  def self.parse_base_type_and_modifiers(type_string)
-    if matches = /^([a-zA-Z0-9]+)(\(([0-9, ]+)\))?$/.match(type_string)
-      base_type = matches[1].upcase.to_sym
-      if matches[3]
-        modifiers = matches[3].sub(/[ ]/, "").split(/,/).map { |s| s.to_i }
-      else
-        modifiers = []
-      end
-      [base_type, modifiers]
-    end
-  end
-
-  attr_reader :base_type
-  attr_reader :length
-  attr_reader :reader
-  def initialize(type_string, properties)
-    @base_type, modifiers = self.class.parse_base_type_and_modifiers(type_string)
-    @length = nil
-    @nullable = !properties.include?(:NOT_NULL)
-    @unsigned = properties.include?(:UNSIGNED)
-    @variable = false
-    @blob = false
-    case
-    when TYPES[base_type][:class] == IntegerType
-      @length = TYPES[base_type][:length]
-    when base_type == :CHAR
-      @length = modifiers[0]
-    when base_type == :VARCHAR
-      @length = modifiers[0]
-      @variable = true
-    when base_type == :BLOB
-      @blob = true
-      @variable = true
-    else
-      raise "Data type '#{type_string}' is not supported"
-    end
-    @reader = TYPES[base_type][:class].new(self)
-  end
-
-  def unsigned?
-    @unsigned
-  end
-
-  def nullable?
-    @nullable
-  end
-
-  def variable?
-    @variable
-  end
-
-  def blob?
-    @blob
-  end
-
-  def name_suffix
-    if [:CHAR, :VARCHAR].include?(base_type)
-      "(#{length})"
-    else
-      ""
-    end
-  end
-
-  def name
-    "#{base_type}#{name_suffix}"
-  end
-end