dm-core 0.9.11 → 0.10.0

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '0.9.11'.freeze
+  VERSION = '0.10.0'.freeze
 end

data/script/performance.rb

@@ -1,19 +1,19 @@
-#!/usr/bin/env ruby
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-core')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-core', 'version')
+#!/usr/bin/env ruby -KU
 
 require 'ftools'
 require 'rubygems'
 
-gem 'rbench', '~>0.2.3'
-require 'rbench'
+gem 'activerecord', '~>2.3.2'
+gem 'addressable',  '~>2.0'
+gem 'faker',        '~>0.3.1'
+gem 'rbench',       '~>0.2.3'
 
-gem 'faker', '~>0.3.1'
+require 'active_record'
+require 'addressable/uri'
 require 'faker'
+require 'rbench'
 
-gem 'activerecord', '~>2.3.2'
-require 'active_record'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'dm-core'))
 
 socket_file = Pathname.glob(%w[
   /opt/local/var/run/mysql5/mysqld.sock
@@ -29,7 +29,7 @@ configuration_options = {
   :adapter => 'mysql',
   :username => 'root',
   :password => '',
-  :database => 'data_mapper_1',
+  :database => 'dm_core_test',
 }
 
 configuration_options[:socket] = socket_file unless socket_file.nil?
@@ -38,12 +38,12 @@ log_dir = DataMapper.root / 'log'
 log_dir.mkdir unless log_dir.directory?
 
 DataMapper::Logger.new(log_dir / 'dm.log', :off)
-adapter = DataMapper.setup(:default, "mysql://root@localhost/data_mapper_1?socket=#{socket_file}")
+adapter = DataMapper.setup(:default, "mysql://root@localhost/dm_core_test?socket=#{socket_file}")
 
 if configuration_options[:adapter]
-  sqlfile = File.join(File.dirname(__FILE__),'..','tmp','performance.sql')
-  mysql_bin = %w[mysql mysql5].select{|bin| `which #{bin}`.length > 0 }
-  mysqldump_bin = %w[mysqldump mysqldump5].select{|bin| `which #{bin}`.length > 0 }
+  sqlfile       = File.join(File.dirname(__FILE__), '..', 'tmp', 'performance.sql')
+  mysql_bin     = %w[ mysql mysql5 ].select { |bin| `which #{bin}`.length > 0 }
+  mysqldump_bin = %w[ mysqldump mysqldump5 ].select { |bin| `which #{bin}`.length > 0 }
 end
 
 ActiveRecord::Base.logger = Logger.new(log_dir / 'ar.log')
@@ -61,46 +61,45 @@ class ARUser < ActiveRecord::Base #:nodoc:
   set_table_name 'users'
 
   has_many :exhibits, :foreign_key => 'user_id'
-
 end
 
 ARExhibit.find_by_sql('SELECT 1')
 
-class Exhibit
+class User
   include DataMapper::Resource
 
   property :id,         Serial
   property :name,       String
-  property :zoo_id,     Integer
-  property :user_id,    Integer
-  property :notes,      Text, :lazy => true
+  property :email,      String
+  property :about,      Text,   :lazy => false
   property :created_on, Date
-
-  belongs_to :user
-#  property :updated_at, DateTime
 end
 
-class User
+class Exhibit
   include DataMapper::Resource
 
-  property :id,    Serial
-  property :name,  String
-  property :email, String
-  property :about, Text, :lazy => true
+  property :id,         Serial
+  property :name,       String
+  property :zoo_id,     Integer
+  property :user_id,    Integer
+  property :notes,      Text,    :lazy => false
   property :created_on, Date
 
+  belongs_to :user
 end
 
-touch_attributes = lambda do |exhibits|
-  [*exhibits].each do |exhibit|
+DataMapper.auto_migrate!
+
+def touch_attributes(*exhibits)
+  exhibits.flatten.each do |exhibit|
     exhibit.id
     exhibit.name
     exhibit.created_on
   end
 end
 
-touch_relationships = lambda do |exhibits|
-  [*exhibits].each do |exhibit|
+def touch_relationships(*exhibits)
+  exhibits.flatten.each do |exhibit|
     exhibit.id
     exhibit.name
     exhibit.created_on
@@ -108,7 +107,6 @@ touch_relationships = lambda do |exhibits|
   end
 end
 
-
 c = configuration_options
 
 if sqlfile && File.exists?(sqlfile)
@@ -116,14 +114,7 @@ if sqlfile && File.exists?(sqlfile)
   #adapter.execute("LOAD DATA LOCAL INFILE '#{sqlfile}' INTO TABLE exhibits")
   `#{mysql_bin} -u #{c[:username]} #{"-p#{c[:password]}" unless c[:password].blank?} #{c[:database]} < #{sqlfile}`
 else
-
-  puts "Generating data for benchmarking..."
-
-  User.auto_migrate!
-  Exhibit.auto_migrate!
-
-  users = []
-  exhibits = []
+  puts 'Generating data for benchmarking...'
 
   # pre-compute the insert statements and fake data compilation,
   # so the benchmarks below show the actual runtime for the execute
@@ -131,35 +122,30 @@ else
 
   # Using the same paragraph for all exhibits because it is very slow
   # to generate unique paragraphs for all exhibits.
-  paragraph = Faker::Lorem.paragraphs.join($/)
-
-  10_000.times do |i|
-    users << [
-      'INSERT INTO `users` (`name`,`email`,`created_on`) VALUES (?, ?, ?)',
-      Faker::Name.name,
-      Faker::Internet.email,
-      Date.today
-    ]
-
-    exhibits << [
-      'INSERT INTO `exhibits` (`name`, `zoo_id`, `user_id`, `notes`, `created_on`) VALUES (?, ?, ?, ?, ?)',
-      Faker::Company.name,
-      rand(10).ceil,
-      i,
-      paragraph,#Faker::Lorem.paragraphs.join($/),
-      Date.today
-    ]
+  notes = Faker::Lorem.paragraphs.join($/)
+  today = Date.today
+
+  puts 'Inserting 10,000 users and exhibits...'
+  10_000.times do
+    user = User.create(
+      :created_on => today,
+      :name       => Faker::Name.name,
+      :email      => Faker::Internet.email
+    )
+
+    Exhibit.create(
+      :created_on => today,
+      :name       => Faker::Company.name,
+      :user       => user,
+      :notes      => notes,
+      :zoo_id     => rand(10).ceil
+    )
   end
 
-  puts "Inserting 10,000 users..."
-  10_000.times { |i| adapter.execute(*users.at(i)) }
-  puts "Inserting 10,000 exhibits..."
-  10_000.times { |i| adapter.execute(*exhibits.at(i)) }
-
   if sqlfile
     answer = nil
     until answer && answer[/^$|y|yes|n|no/]
-      print("Would you like to dump data into tmp/performance.sql (for faster setup)? [Yn]");
+      print('Would you like to dump data into tmp/performance.sql (for faster setup)? [Yn]');
       STDOUT.flush
       answer = gets
     end
@@ -171,13 +157,12 @@ else
       puts "File saved\n"
     end
   end
-
 end
 
-TIMES = ENV['x'] ? ENV['x'].to_i : 10_000
+TIMES = ENV.key?('x') ? ENV['x'].to_i : 10_000
 
-puts "You can specify how many times you want to run the benchmarks with rake:perf x=(number)"
-puts "Some tasks will be run 10 and 1000 times less than (number)"
+puts 'You can specify how many times you want to run the benchmarks with rake:perf x=(number)'
+puts 'Some tasks will be run 10 and 1000 times less than (number)'
 puts "Benchmarks will now run #{TIMES} times"
 # Inform about slow benchmark
 # answer = nil
@@ -193,90 +178,98 @@ puts "Benchmarks will now run #{TIMES} times"
 RBench.run(TIMES) do
 
   column :times
-  column :ar, :title => "AR 2.1"
+  column :ar, :title => 'AR 2.3.2'
   column :dm, :title => "DM #{DataMapper::VERSION}"
-  column :diff, :compare => [:ar,:dm]
+  column :diff, :compare => [:ar, :dm]
+
+  report 'Model#id', (TIMES * 100).ceil do
+    ar_obj = ARExhibit.find(1)
+    dm_obj = Exhibit.get(1)
+
+    ar { ar_obj.id }
+    dm { dm_obj.id }
+  end
 
-  report "Model.new (instantiation)" do
+  report 'Model.new (instantiation)' do
     ar { ARExhibit.new }
     dm { Exhibit.new }
   end
 
-  report "Model.new (setting attributes)" do
-    attrs = {:name => 'sam', :zoo_id => 1}
+  report 'Model.new (setting attributes)' do
+    attrs = { :name => 'sam', :zoo_id => 1 }
     ar { ARExhibit.new(attrs) }
     dm { Exhibit.new(attrs) }
   end
 
-  report "Model.get specific (not cached)" do
-    ActiveRecord::Base.uncached { ar { touch_attributes[ARExhibit.find(1)] } }
-    dm { touch_attributes[Exhibit.get(1)] }
+  report 'Model.get specific (not cached)' do
+    ActiveRecord::Base.uncached { ar { touch_attributes(ARExhibit.find(1)) } }
+    dm { touch_attributes(Exhibit.get(1)) }
   end
 
-  report "Model.get specific (cached)" do
-    ActiveRecord::Base.cache    { ar { touch_attributes[ARExhibit.find(1)] } }
-    Exhibit.repository(:default) { dm { touch_attributes[Exhibit.get(1)] } }
+  report 'Model.get specific (cached)' do
+    ActiveRecord::Base.cache     { ar { touch_attributes(ARExhibit.find(1)) } }
+    Exhibit.repository(:default) { dm { touch_attributes(Exhibit.get(1)) } }
   end
 
-  report "Model.first" do
-    ar { touch_attributes[ARExhibit.first] }
-    dm { touch_attributes[Exhibit.first] }
+  report 'Model.first' do
+    ar { touch_attributes(ARExhibit.first) }
+    dm { touch_attributes(Exhibit.first) }
   end
 
-  report "Model.all limit(100)", (TIMES / 10.0).ceil do
-    ar { touch_attributes[ARExhibit.find(:all, :limit => 100)] }
-    dm { touch_attributes[Exhibit.all(:limit => 100)] }
+  report 'Model.all limit(100)', (TIMES / 10).ceil do
+    ar { touch_attributes(ARExhibit.find(:all, :limit => 100)) }
+    dm { touch_attributes(Exhibit.all(:limit => 100)) }
   end
 
-  report "Model.all limit(100) with relationship", (TIMES / 10.0).ceil do
-    ar { touch_relationships[ARExhibit.all(:limit => 100, :include => [:user])] }
-    dm { touch_relationships[Exhibit.all(:limit => 100)] }
+  report 'Model.all limit(100) with relationship', (TIMES / 10).ceil do
+    ar { touch_relationships(ARExhibit.all(:limit => 100, :include => [ :user ])) }
+    dm { touch_relationships(Exhibit.all(:limit => 100)) }
   end
 
-  report "Model.all limit(10,000)", (TIMES / 1000.0).ceil do
-    ar { touch_attributes[ARExhibit.find(:all, :limit => 10_000)] }
-    dm { touch_attributes[Exhibit.all(:limit => 10_000)] }
+  report 'Model.all limit(10,000)', (TIMES / 1000).ceil do
+    ar { touch_attributes(ARExhibit.find(:all, :limit => 10_000)) }
+    dm { touch_attributes(Exhibit.all(:limit => 10_000)) }
   end
 
-  create_exhibit = {
+  exhibit = {
     :name       => Faker::Company.name,
     :zoo_id     => rand(10).ceil,
     :notes      => Faker::Lorem.paragraphs.join($/),
     :created_on => Date.today
   }
 
-  report "Model.create" do
-    ar { ARExhibit.create(create_exhibit) }
-    dm { Exhibit.create(create_exhibit) }
+  report 'Model.create' do
+    ar { ARExhibit.create(exhibit) }
+    dm { Exhibit.create(exhibit) }
   end
 
-  report "Resource#attributes" do
-    attrs_first  = {:name => 'sam', :zoo_id => 1}
-    attrs_second = {:name => 'tom', :zoo_id => 1}
-    ar { e = ARExhibit.new(attrs_first); e.attributes = attrs_second }
-    dm { e = Exhibit.new(attrs_first); e.attributes = attrs_second }
+  report 'Resource#attributes=' do
+    attrs_first  = { :name => 'sam', :zoo_id => 1 }
+    attrs_second = { :name => 'tom', :zoo_id => 1 }
+    ar { exhibit = ARExhibit.new(attrs_first); exhibit.attributes = attrs_second }
+    dm { exhibit = Exhibit.new(attrs_first);   exhibit.attributes = attrs_second }
   end
 
-  report "Resource#update" do
-    ar { e = ARExhibit.find(1); e.name = 'bob'; e.save }
-    dm { e = Exhibit.get(1); e.name = 'bob'; e.save }
+  report 'Resource#update' do
+    ar { ARExhibit.find(1).update_attributes(:name => 'bob') }
+    dm { Exhibit.get(1).update(:name => 'bob') }
   end
 
-  report "Resource#destroy" do
+  report 'Resource#destroy' do
     ar { ARExhibit.first.destroy }
     dm { Exhibit.first.destroy }
   end
 
-  report "Model.transaction" do
+  report 'Model.transaction' do
     ar { ARExhibit.transaction { ARExhibit.new } }
     dm { Exhibit.transaction { Exhibit.new } }
   end
 
-  summary "Total"
+  summary 'Total'
 end
 
-connection = adapter.send(:create_connection)
-command = connection.create_command("DROP TABLE exhibits")
-command = connection.create_command("DROP TABLE users")
+connection = adapter.send(:open_connection)
+command = connection.create_command('DROP TABLE exhibits')
+command = connection.create_command('DROP TABLE users')
 command.execute_non_query rescue nil
 connection.close

data/script/profile.rb

@@ -1,17 +1,21 @@
-#!/usr/bin/env ruby
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-core')
+#!/usr/bin/env ruby -KU
 
+require 'ftools'
 require 'rubygems'
 
-gem 'ruby-prof', '~>0.7.3'
-require 'ruby-prof'
+gem 'addressable', '~>2.0'
+gem 'faker',       '~>0.3.1'
+gem 'ruby-prof',   '~>0.7.3'
 
-gem 'faker', '~>0.3.1'
+require 'addressable/uri'
 require 'faker'
+require 'ruby-prof'
 
-OUTPUT = DataMapper.root / 'profile_results.txt'
-#OUTPUT = DataMapper.root / 'profile_results.html'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'dm-core'))
+
+TEXT_OUTPUT = DataMapper.root / 'profile_results.txt'
+HTML_OUTPUT = DataMapper.root / 'profile_results.html'
+CALL_OUTPUT = DataMapper.root / 'profile_results.prof'
 
 SOCKET_FILE = Pathname.glob(%w[
   /opt/local/var/run/mysql5/mysqld.sock
@@ -21,8 +25,33 @@ SOCKET_FILE = Pathname.glob(%w[
   /var/run/mysqld/mysqld.sock
 ]).find { |path| path.socket? }
 
+configuration_options = {
+  :adapter  => 'mysql',
+  :database => 'dm_core_test',
+  :host     => 'localhost',
+  :username => 'root',
+  :password => '',
+  :socket   => SOCKET_FILE,
+}
+
 DataMapper::Logger.new(DataMapper.root / 'log' / 'dm.log', :debug)
-DataMapper.setup(:default, "mysql://root@localhost/data_mapper_1?socket=#{SOCKET_FILE}")
+adapter = DataMapper.setup(:default, configuration_options)
+
+if configuration_options[:adapter]
+  sqlfile       = File.join(File.dirname(__FILE__), '..', 'tmp', 'performance.sql')
+  mysql_bin     = %w[ mysql mysql5 ].select { |bin| `which #{bin}`.length > 0 }
+  mysqldump_bin = %w[ mysqldump mysqldump5 ].select { |bin| `which #{bin}`.length > 0 }
+end
+
+class User
+  include DataMapper::Resource
+
+  property :id,         Serial
+  property :name,       String
+  property :email,      String
+  property :about,      Text,   :lazy => false
+  property :created_on, Date
+end
 
 class Exhibit
   include DataMapper::Resource
@@ -30,58 +59,160 @@ class Exhibit
   property :id,         Serial
   property :name,       String
   property :zoo_id,     Integer
-  property :notes,      Text, :lazy => true
+  property :user_id,    Integer
+  property :notes,      Text,    :lazy => false
   property :created_on, Date
-#  property :updated_at, DateTime
 
-  auto_migrate!
-  create  # create one row for testing
+  belongs_to :user
+end
+
+DataMapper.auto_migrate!
+
+def touch_attributes(*exhibits)
+  exhibits.flatten.each do |exhibit|
+    exhibit.id
+    exhibit.name
+    exhibit.created_on
+  end
 end
 
-touch_attributes = lambda do |exhibits|
-  [*exhibits].each do |exhibit|
+def touch_relationships(*exhibits)
+  exhibits.flatten.each do |exhibit|
     exhibit.id
     exhibit.name
     exhibit.created_on
-    exhibit.updated_at
+    exhibit.user
   end
 end
 
 # RubyProf, making profiling Ruby pretty since 1899!
 def profile(&b)
-  result  = RubyProf.profile &b
-  printer = RubyProf::FlatPrinter.new(result)
-  #printer = RubyProf::GraphHtmlPrinter.new(result)
-  printer.print(OUTPUT.open('w+'))
+  results = RubyProf.profile(&b)
+
+  TEXT_OUTPUT.open('w+') do |file|
+    RubyProf::FlatPrinter.new(results).print(file)
+  end
+
+  HTML_OUTPUT.open('w+') do |file|
+    RubyProf::GraphHtmlPrinter.new(results).print(file)
+  end
+
+  CALL_OUTPUT.open('w+') do |file|
+    RubyProf::CallTreePrinter.new(results).print(file)
+  end
+end
+
+c = configuration_options
+
+if sqlfile && File.exists?(sqlfile)
+  puts "Found data-file. Importing from #{sqlfile}"
+  #adapter.execute("LOAD DATA LOCAL INFILE '#{sqlfile}' INTO TABLE exhibits")
+  `#{mysql_bin} -u #{c[:username]} #{"-p#{c[:password]}" unless c[:password].blank?} #{c[:database]} < #{sqlfile}`
+else
+  puts 'Generating data for benchmarking...'
+
+  # pre-compute the insert statements and fake data compilation,
+  # so the benchmarks below show the actual runtime for the execute
+  # method, minus the setup steps
+
+  # Using the same paragraph for all exhibits because it is very slow
+  # to generate unique paragraphs for all exhibits.
+  notes = Faker::Lorem.paragraphs.join($/)
+  today = Date.today
+
+  puts 'Inserting 10,000 users and exhibits...'
+  10_000.times do
+    user = User.create(
+      :created_on => today,
+      :name       => Faker::Name.name,
+      :email      => Faker::Internet.email
+    )
+
+    Exhibit.create(
+      :created_on => today,
+      :name       => Faker::Company.name,
+      :user       => user,
+      :notes      => notes,
+      :zoo_id     => rand(10).ceil
+    )
+  end
+
+  if sqlfile
+    answer = nil
+    until answer && answer[/^$|y|yes|n|no/]
+      print('Would you like to dump data into tmp/performance.sql (for faster setup)? [Yn]');
+      STDOUT.flush
+      answer = gets
+    end
+
+    if answer[/^$|y|yes/]
+      File.makedirs(File.dirname(sqlfile))
+      #adapter.execute("SELECT * INTO OUTFILE '#{sqlfile}' FROM exhibits;")
+      `#{mysqldump_bin} -u #{c[:username]} #{"-p#{c[:password]}" unless c[:password].blank?} #{c[:database]} exhibits users > #{sqlfile}`
+      puts "File saved\n"
+    end
+  end
 end
 
+TIMES = 10_000
+
+exhibits = Exhibit.all.to_a
+
 profile do
-#  10_000.times { touch_attributes[Exhibit.get(1)] }
-#
-#  repository(:default) do
-#    10_000.times { touch_attributes[Exhibit.get(1)] }
-#  end
+#  dm_obj = Exhibit.get(1)
+#  puts 'Model#id'
+#  (TIMES * 100).times { dm_obj.id }
 #
-#  1000.times { touch_attributes[Exhibit.all(:limit => 100)] }
+#  puts 'Model.new (instantiation)'
+#  TIMES.times { Exhibit.new }
 #
-#  repository(:default) do
-#    1000.times { touch_attributes[Exhibit.all(:limit => 100)] }
-#  end
+#  puts 'Model.new (setting attributes)'
+#  TIMES.times { Exhibit.new(:name => 'sam', :zoo_id => 1) }
 #
-#  10.times { touch_attributes[Exhibit.all(:limit => 10_000)] }
+#  puts 'Model.get specific (not cached)'
+#  TIMES.times { touch_attributes(Exhibit.get(1)) }
 #
+#  puts 'Model.get specific (cached)'
 #  repository(:default) do
-#    10.times { touch_attributes[Exhibit.all(:limit => 10_000)] }
+#    TIMES.times { touch_attributes(Exhibit.get(1)) }
 #  end
 
-  create_exhibit = {
-    :name       => Faker::Company.name,
-    :zoo_id     => rand(10).ceil,
-    :notes      => Faker::Lorem.paragraphs.join($/),
-    :created_on => Date.today
-  }
+  puts 'Model.first'
+  TIMES.times { touch_attributes(Exhibit.first) }
 
-  1000.times { Exhibit.create(create_exhibit) }
+#  puts 'Model.all limit(100)'
+#  (TIMES / 10).ceil.times { touch_attributes(Exhibit.all(:limit => 100)) }
+#
+#  puts 'Model.all limit(100) with relationship'
+#  (TIMES / 10).ceil.times { touch_relationships(Exhibit.all(:limit => 100)) }
+#
+#  puts 'Model.all limit(10,000)'
+#  (TIMES / 1000).ceil { touch_attributes(Exhibit.all(:limit => 10_000)) }
+#
+#  exhibit = {
+#    :name       => Faker::Company.name,
+#    :zoo_id     => rand(10).ceil,
+#    :notes      => Faker::Lorem.paragraphs.join($/),
+#    :created_on => Date.today
+#  }
+#
+#  puts 'Model.create'
+#  TIMES.times { Exhibit.create(exhibit) }
+#
+#  attrs_first  = { :name => 'sam', :zoo_id => 1 }
+#  attrs_second = { :name => 'tom', :zoo_id => 1 }
+#
+#  puts 'Resource#attributes='
+#  TIMES.times { exhibit = Exhibit.new(attrs_first); exhibit.attributes = attrs_second }
+#
+#  puts 'Resource#update'
+#  TIMES.times { |index| exhibit = exhibits[index]; exhibit.name = 'bob'; exhibit.save }
+#
+#  puts 'Resource#destroy'
+#  TIMES.times { |index| exhibits[index].destroy }
+#
+#  puts 'Model.transaction'
+#  TIMES.times { Exhibit.transaction { Exhibit.new } }
 end
 
 puts "Done!"