Ancestry Patch updates/fixes #17511
Merged
Ancestry Patch updates/fixes #17511
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
Merged
gmcculloug
approved these changes
Jun 3, 2018
kbrock
reviewed
Jun 4, 2018
app/models/tenant.rb
Outdated
| @@ -184,7 +184,7 @@ def project? | |||
| end | |||
|
|
|||
| def visible_domains | |||
| MiqAeDomain.where(:tenant_id => ancestor_ids.append(id)).joins(:tenant).order('tenants.ancestry DESC NULLS LAST, priority DESC') | |||
| MiqAeDomain.where(:tenant_id => ancestor_ids + [id]).joins(:tenant).order('tenants.ancestry DESC NULLS LAST, priority DESC') | |||
There was a problem hiding this comment.
Didn't know it was a thing. Will change.
|
|
||
| def parent=(parent) | ||
| super | ||
| clear_memoized_instance_variables |
There was a problem hiding this comment.
would feel a little more comfortable returning the original value since people often type x = y = z
def parent=(parent)
super.tap { clear_memoized_instance_variables }
endThere was a problem hiding this comment.
Huh, I guess ruby had my back on this one...
class Foo
attr_reader :bar
def bar= bar_val
@bar = bar_val
puts "IT WORKED!"
end
end
puts (Foo.new.bar = "bar")
puts baz = Foo.new.bar = "baz"
puts "baz = #{baz}"
#=> IT WORKED! <<<<< output from first bar=
#=> bar <<<<< output from first inline puts
#=> IT WORKED! <<<<< output from second bar=
#=> baz <<<<< output from second inline puts
#=> baz = baz <<<<< output from third inline putsApparently ='s methods don't behave the same as normal methods and always return the input? TMYK 🌈✨🌠
There was a problem hiding this comment.
Anyway, adding a test because this could end up going bad if this is ever NOT the case.
The Tenant#visible_domains method was doing the following:
ancestor_ids.append(id)
As part of it's query, which would update the memoized value to be
incorrect and include itself. Switching it to `path_ids`, which
effectively does:
ancestor_ids + [id]
Makes sure that a new array is created instead of appending to the
existing one.
NickLaMuro
force-pushed
the
ancestry_memoization_fixes
branch
from
9dc3839
to
3742661
Compare
Clear out the memoization in the lib/patches/ancestry_patch.rb when the parent= or parent_id= methods are called.
|
@kbrock Should have addressed your comments. Please re-review. |
|
Checked commits NickLaMuro/manageiq@f75a572~...3742661 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 spec/models/tenant_spec.rb
|
simaishi
pushed a commit
that referenced
this pull request
Jun 21, 2018
Ancestry Patch updates/fixes (cherry picked from commit c6a6bed) https://bugzilla.redhat.com/show_bug.cgi?id=1593798
|
Fine backport details: |
simaishi
pushed a commit
that referenced
this pull request
Jun 21, 2018
Ancestry Patch updates/fixes (cherry picked from commit c6a6bed) https://bugzilla.redhat.com/show_bug.cgi?id=1593797
|
Gaprindashvili backport details: |
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.
Fixes the two issues reported in the original PR for the
ancestrypatches and the memoization of certain methods around it:parent/parent_idinmanageiq-ui-classic: Ancestry Patches #17360 (comment)ancestor_idsinmanageiq-automation_engine: Ancestry Patches #17360 (comment)Both issues should be addressed by this PR.
Links
Steps for Testing/QA
Run the specs for both
manageiq-ui-classicandmanageiq-automation_enginewith this branch checked out and make sure there are not any spec failures.