projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6074: Use each instead of find_each, so our order() and limit() constraints are respe...
[arvados.git]
/
services
/
api
/
app
/
controllers
/
application_controller.rb
diff --git
a/services/api/app/controllers/application_controller.rb
b/services/api/app/controllers/application_controller.rb
index 6810d91d4cd6c235751365b1e6d1856a5f6a19b8..e91e3ce03ec6369addee5d63964ac10e198e251a 100644
(file)
--- a/
services/api/app/controllers/application_controller.rb
+++ b/
services/api/app/controllers/application_controller.rb
@@
-301,15
+301,20
@@
class ApplicationController < ActionController::Base
return if limit_columns.empty?
model_class.transaction do
limit_query = @objects.
return if limit_columns.empty?
model_class.transaction do
limit_query = @objects.
+ except(:select).
select("(%s) as read_length" %
select("(%s) as read_length" %
- limit_columns.map { |s| "length(#{s})" }.join(" + "))
+ limit_columns.map { |s| "
octet_
length(#{s})" }.join(" + "))
new_limit = 0
read_total = 0
new_limit = 0
read_total = 0
- limit_query.
find_
each do |record|
+ limit_query.each do |record|
new_limit += 1
read_total += record.read_length.to_i
new_limit += 1
read_total += record.read_length.to_i
- break if ((read_total >= Rails.configuration.max_index_database_read) or
- (new_limit >= @limit))
+ if read_total >= Rails.configuration.max_index_database_read
+ new_limit -= 1 if new_limit > 1
+ break
+ elsif new_limit >= @limit
+ break
+ end
end
@limit = new_limit
@objects = @objects.limit(@limit)
end
@limit = new_limit
@objects = @objects.limit(@limit)