innodb_ruby 0.9.11 → 0.9.12

data/README.md

@@ -13,7 +13,9 @@ Various parts of this library and the tools included may have wildly differing m
 
 # 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_space

@@ -1100,8 +1100,12 @@ The following options are supported:
     tracing (including reads during opening of the tablespace) which can
     be quite noisy.
 
-  --system-space-file, -s <file>
-    Load the system tablespace file <file> (normally ibdata1).
+  --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
+    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
+    load the system tablespace.
 
   --table-name, -T <name>
     Use the table name <name>.
@@ -1309,9 +1313,9 @@ getopt.each do |opt, arg|
   when "--trace"
     @options.trace += 1
   when "--system-space-file"
-    @options.system_space_file = arg
+    @options.system_space_file = arg.split(",")
   when "--space-file"
-    @options.space_file = arg
+    @options.space_file = arg.split(",")
   when "--table-name"
     @options.table_name = arg
   when "--index-name"

data/lib/innodb/page/fsp_hdr_xdes.rb

@@ -52,7 +52,7 @@ class Innodb::Page::FspHdrXdes < Innodb::Page
       :compressed => compressed_page_size ? false : true,
       :page_size => compressed_page_size || system_page_size,
       :post_antelope => read_bits_at_offset(flags, 1, 0) == 1,
-      :atomic_blogs => read_bits_at_offset(flags, 1, 5) == 1,
+      :atomic_blobs => read_bits_at_offset(flags, 1, 5) == 1,
       :data_directory => read_bits_at_offset(flags, 1, 10) == 1,
       :value => flags,
     }

data/lib/innodb/space.rb

@@ -20,11 +20,39 @@ class Innodb::Space
     7 => :SYS,
   }
 
+  class DataFile
+    attr_reader :file
+    attr_reader :size
+    attr_reader :offset
+
+    def initialize(filename, offset)
+      @file = File.open(filename)
+      @size = @file.stat.size
+      @offset = offset
+    end
+
+    def name
+      prefix = ""
+      if File.extname(file.path) == ".ibd"
+        prefix = File.basename(File.dirname(file.path)) + "/"
+      end
+
+      prefix + File.basename(file.path)
+    end
+  end
+
   # Open a space file, optionally providing the page size to use. Pages
   # that aren't 16 KiB may not be supported well.
-  def initialize(file)
-    @file = File.open(file)
-    @size = @file.stat.size
+  def initialize(filenames)
+    filenames = [filenames] unless filenames.is_a?(Array)
+
+    @data_files = []
+    @size = 0
+    filenames.each do |filename|
+      file = DataFile.new(filename, @size)
+      @size += file.size
+      @data_files << file
+    end
 
     @system_page_size = fsp_flags[:system_page_size]
     @page_size        = fsp_flags[:page_size]
@@ -58,14 +86,7 @@ class Innodb::Space
   # to do anything which could instantiate a BufferCursor so that we can use
   # this method in cursor initialization.
   def name
-    return @name if @name
-
-    prefix = ""
-    if File.extname(@file.path) == ".ibd"
-      prefix = File.basename(File.dirname(@file.path)) + "/"
-    end
-
-    @name = prefix + File.basename(@file.path)
+    @name ||= @data_files.map { |f| f.name }.join(",")
   end
 
   def inspect
@@ -184,18 +205,25 @@ class Innodb::Space
     xdes_array[xdes_entry_for_page(page_number)]
   end
 
+  def data_file_for_offset(offset)
+    @data_files.each do |file|
+      return file if offset < file.size
+      offset -= file.size
+    end
+    nil
+  end
+
   # Get the raw byte buffer of size bytes at offset in the file.
   def read_at_offset(offset, size)
-    @file.seek(offset)
-    @file.read(size)
+    return nil unless offset < @size && (offset + size) <= @size
+    data_file = data_file_for_offset(offset)
+    data_file.file.seek(offset - data_file.offset)
+    data_file.file.read(size)
   end
 
   # Get the raw byte buffer for a specific page by page number.
   def page_data(page_number)
-    offset = page_number.to_i * page_size
-    return nil unless offset < @size
-    return nil unless (offset + page_size) <= @size
-    read_at_offset(offset, page_size)
+    read_at_offset(page_number * page_size, page_size)
   end
 
   # Get an Innodb::Page object for a specific page by page number.

data/lib/innodb/system.rb

@@ -18,14 +18,28 @@ class Innodb::System
   # The space ID of the system space, always 0.
   SYSTEM_SPACE_ID = 0
 
-  def initialize(system_space_file)
+  def initialize(arg)
+    if arg.is_a?(Array) && arg.size > 1
+      data_filenames = arg
+    else
+      arg = arg.first if arg.is_a?(Array)
+      if File.directory?(arg)
+        data_filenames = Dir.glob(arg + "/ibdata?").sort
+        if data_filenames.empty?
+          raise "Couldn't find any ibdata files in #{arg}"
+        end
+      else
+        data_filenames = [arg]
+      end
+    end
+
     @spaces = {}
     @orphans = []
     @config = {
-      :datadir => File.dirname(system_space_file),
+      :datadir => File.dirname(data_filenames.first),
     }
 
-    add_space_file(system_space_file)
+    add_space_file(data_filenames)
 
     @data_dictionary = Innodb::DataDictionary.new(system_space)
   end
@@ -45,8 +59,8 @@ class Innodb::System
   end
 
   # Add a space by filename.
-  def add_space_file(space_file)
-    space = Innodb::Space.new(space_file)
+  def add_space_file(space_filenames)
+    space = Innodb::Space.new(space_filenames)
     space.innodb_system = self
     add_space(space)
   end

data/lib/innodb/version.rb

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

metadata

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