Ensure journal is empty #463
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sergey-kintsel
force-pushed
the
ensure_journal_is_empty
branch
4 times, most recently
from
284a784
to
aafb78f
Compare
|
The code looks ok. I sent you a few small remarks in DM. Let's |
after green build.
sergey-kintsel
force-pushed
the
ensure_journal_is_empty
branch
3 times, most recently
from
08f78fa
to
416c816
Compare
pr0d1r2
suggested changes
Dec 15, 2016
| else | ||
| compose_children(result, *objects) | ||
| end if children.present? && !multi_field? | ||
| if children.present? && !multi_field? |
There was a problem hiding this comment.
Please consider splitting whole compose method as my eyes are bleeding:
def compose(object, *parent_objects)
{ name => compose_result(object, parent_objects) }
end
def compose_result(object, *parent_objects)
objects = ([object] + parent_objects.flatten).uniq
result = base_result(object, objects)
return compose_result_with_children(result, objects) if children.present? && !multi_field?
result
end
def base_result(object, objects)
if value && value.is_a?(Proc)
result_from_proc(object, objects)
elsif object.is_a?(Hash)
result_from_hash(object)
else
object.send(name)
end
end
def result_from_proc(object, objects)
if value.arity.zero?
object.instance_exec(&value)
elsif value.arity < 0
value.call(*object)
else
value.call(*objects.first(value.arity))
end
end
def result_from_hash(object)
if object.key?(name)
object[name]
else
object[name.to_s]
end
end
def compose_result_with_children(result, objects)
if result.respond_to?(:to_ary)
result.to_ary.map { |item| compose_children(item, *objects) }
else
compose_children(result, *objects)
end
endThere was a problem hiding this comment.
it is not connected to my changes) this was changed to make Rubocop happy
There was a problem hiding this comment.
Can you please prepare follow-up PR after merging this one?
| return if respond_to?(type_class.type_name) | ||
| class_eval <<-METHOD, __FILE__, __LINE__ + 1 | ||
| def self.#{type_class.type_name} | ||
| ActiveSupport::Deprecation.warn("`#{self}.#{type_class.type_name}` accessor is deprecated and will be removed soon. Use `#{type_class}` directly instead.") |
There was a problem hiding this comment.
Please break this long line by using heredoc:
ActiveSupport::Deprecation.warn(<<WARNING.sqish)
`#{self}.#{type_class.type_name}` accessor is deprecated and will be removed soon.
Use `#{type_class}` directly instead.
WARNINGThere was a problem hiding this comment.
it is not connected to my changes) this was changed to make Rubocop happy
There was a problem hiding this comment.
Can you please prepare follow-up PR after merging this one?
| def until(time) | ||
| query = Query.new(time, :lte, nil, false).to_h | ||
| search_query = query.merge(fields: ['_id'], size: DELETE_BATCH_SIZE) | ||
| index_name = Journal.index_name |
There was a problem hiding this comment.
We can use delegation:
included do
delegate :index_name, to: Journal
endThere was a problem hiding this comment.
actually, I think that explicit calls are easier) longer, but easier)
| end | ||
| end | ||
|
|
||
| Chewy.massacre |
pr0d1r2
approved these changes
Dec 15, 2016
sergey-kintsel
force-pushed
the
ensure_journal_is_empty
branch
from
3158ecb
to
442d015
Compare
sergey-kintsel
force-pushed
the
ensure_journal_is_empty
branch
from
7b9f420
to
3162659
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactor
Chewy::JournalAdd multiple retries to apply the journal