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-18531 Fix issues with IPT::append* and multi value properties #10508

Merged
merged 2 commits into from Oct 20, 2017

Conversation

Projects
None yet
5 participants
@jakesmith
Copy link
Member

commented Oct 17, 2017

Example: tree->appendProp("prop[2]", "text");

This code was spuriously hitting an assert, because it was
incorrectly handling the lookup of the correct qualified multi
value property node.

Signed-off-by: Jake Smith jake.smith@lexisnexisrisk.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:

New IPT unit tests (will be released in separate PR) revealed and validated this fix.
Full regression suite run

Jake Smith
HPCC-18531 Fix issues with IPT::append* and multi value properties
Example: tree->appendProp("prop[2]", "text");

This code was spuriously hitting an assert, because it was
incorrectly handling the lookup of the correct qualified multi
value property node.

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
@hpcc-jirabot

This comment has been minimized.

Copy link

commented Oct 17, 2017

@jakesmith

This comment has been minimized.

Copy link
Member Author

commented Oct 17, 2017

@mckellyln - please review

appendLocal(size, data, true);
IPropertyTree *qualified = queryPropTree(xpath);
if (!qualified)
throw MakeIPTException(-1, "addProp: qualifier unmatched %s", xpath);

This comment has been minimized.

Copy link
@mckellyln

mckellyln Oct 17, 2017

Contributor

addPropBin ?

This comment has been minimized.

Copy link
@mckellyln

mckellyln Oct 17, 2017

Contributor

Still confusing why adddProp/addPropBin instead of appendProp/appendPropBin

This comment has been minimized.

Copy link
@jakesmith

jakesmith Oct 17, 2017

Author Member

will correct.

Jake Smith
HPCC:18531 Correct method name in error message of append* methods.
Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
@jakesmith

This comment has been minimized.

Copy link
Member Author

commented Oct 17, 2017

@mckellyln - corrected error messages.

@HPCCSmoketest

This comment has been minimized.

Copy link
Contributor

commented Oct 17, 2017

Automated Smoketest:
Sha: eaa4ca8
Build: success
Build: success
ECL Watch: Rebuilding Site

errors warnings build time
0 75 42.246 seconds

Install hpccsystems-platform-community_6.5.0-trunk0.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 92 92 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) 744 744 0
test (thor) 639 639 0
test (roxie) 772 772 0

HPCC Stop: OK
HPCC Uninstall: OK

@mckellyln
Copy link
Contributor

left a comment

@jakesmith approved
@richardkchapman ok to merge

@richardkchapman richardkchapman merged commit bd38973 into hpcc-systems:master Oct 20, 2017

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.