Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-19586 Prevent moving filters over joins if it creates an ambiguity #11394

Merged
merged 1 commit into from Jul 18, 2018

Conversation

Projects
None yet
5 participants
@ghalliday
Copy link
Member

commented Jul 10, 2018

Signed-off-by: Gavin Halliday gavin.halliday@lexisnexis.com

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Testing:

HPCC-19586 Prevent moving filters over joins if it creates an ambiguity
Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
@hpcc-jirabot

This comment has been minimized.

Copy link

commented Jul 10, 2018

@ghalliday

This comment has been minimized.

Copy link
Member Author

commented Jul 10, 2018

@shamser please review. Example that illustrates the problem is janderson1.eclxml. Others are also affected (and may have been wrong before) e.g. srao2, aslow4, salini4

@ghalliday

This comment has been minimized.

Copy link
Member Author

commented Jul 10, 2018

(Easiest to compare with ?w=1 to ignore whitespace)

@HPCCSmoketest

This comment has been minimized.

Copy link
Contributor

commented Jul 10, 2018

Automated Smoketest:
OS: centos 7.4.1708 (Linux 3.10.0-327.28.3.el7.x86_64)
Sha: dcd2857
Build: success
Install hpccsystems-platform-community_7.0.0-trunk0.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 89 89 0 0 0
wutoolTest(Dali) 19 19 0 0 0
wutoolTest(Cassandra) 19 19 0 0 0

Regression test result:

phase total pass fail
setup (hthor) 11 11 0
setup (thor) 11 11 0
setup (roxie) 11 11 0
test (hthor) 789 789 0
test (thor) 720 720 0
test (roxie) 860 860 0

HPCC Stop: OK
HPCC Uninstall: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
23 sec (00:00:23) 169 sec (00:02:49) 61 sec (00:01:01) 9 sec (00:00:09) 30 sec (00:00:30) 1319 sec (00:21:59) 19 sec (00:00:19) 1630 sec (00:27:10)
@shamser
Copy link
Contributor

left a comment

@ghalliday Reviewed. One minor comment.

@@ -1166,51 +1166,61 @@ IHqlExpression * CTreeOptimizer::getHoistedFilter(IHqlExpression * transformed,
}
}

if (!matched && !expandMonitor.isComplex())
try

This comment has been minimized.

Copy link
@shamser

shamser Jul 16, 2018

Contributor

It's a little more efficient to have the try block inside the if block below.

This comment has been minimized.

Copy link
@ghalliday

ghalliday Jul 18, 2018

Author Member

try blocks have no cost with modern implementations - so there is no difference in efficiency.

@shamser
Copy link
Contributor

left a comment

@ghalliday

This comment has been minimized.

Copy link
Member Author

commented Jul 18, 2018

@shamser see comment above. @richardkchapman please review.

@richardkchapman richardkchapman merged commit 5c64d77 into hpcc-systems:master Jul 18, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.