deac/activerecord-import
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #20 from Empact/drop_sum_sizes

Browse source 
Rely on ActiveSupport #sum rather than #sum_sizes
This commit is contained in:
Zach Dennis 2012-01-06 15:47:53 -08:00
parent 2539a71574 8d20594f12
commit b2c71336ca
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/activerecord-import/adapters/abstract_adapter.rb
View file

@ -3,12 +3,6 @@ module ActiveRecord::Import::AbstractAdapter
QUERY_OVERHEAD = 8 #This was shown to be true for MySQL, but it's not clear where the overhead is from.
module ClassMethods
# Returns the sum of the sizes of the passed in objects. This should
# probably be moved outside this class, but to where?
def sum_sizes( *objects ) # :nodoc:
objects.inject( 0 ){ |sum,o| sum += o.bytesize }
end
def get_insert_value_sets( values, sql_size, max_bytes ) # :nodoc:
value_sets = []
arr, current_arr_values_size, current_size = [], 0, 0
@ -51,7 +45,7 @@ module ActiveRecord::Import::AbstractAdapter
sql_size = QUERY_OVERHEAD + base_sql.size + post_sql.size
# the number of bytes the requested insert statement values will take up
values_in_bytes = self.class.sum_sizes( *values )
values_in_bytes = values.sum {|value| value.bytesize }
# the number of bytes (commas) it will take to comma separate our values
comma_separated_bytes = values.size-1

4
test/support/mysql/import_examples.rb
View file

@ -9,7 +9,7 @@ def should_support_mysql_import_functionality
"('7','8','9')" ]
adapter = ActiveRecord::Base.connection.class
values_size_in_bytes = adapter.sum_sizes( *values )
values_size_in_bytes = values.sum {|value| value.bytesize }
base_sql_size_in_bytes = 15
max_bytes = 30
@ -38,7 +38,7 @@ def should_support_mysql_import_functionality
base_sql_size_in_bytes = 15
max_bytes = 26
values_size_in_bytes = adapter.sum_sizes( *values )
values_size_in_bytes = values.sum {|value| value.bytesize }
value_sets = adapter.get_insert_value_sets( values, base_sql_size_in_bytes, max_bytes )
assert_equal 2, value_sets.size, 'Two value sets were expected!'