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-18006 Couchbase Plugin: Child datasets w/o XPATH #10262

Conversation

@dcamper
Copy link
Contributor

commented Jul 18, 2017

Fix issue with parsing results containing child datasets when those children did not have explicit XPATHs defined for them.

Signed-off-by: Dan S. Camper dan.camper@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:

Against sample code provided in Jira ticket and with other well-known Couchbase data.

Fix issue with parsing results containing child datasets when those children did not have explicit XPATHs defined for them.

Signed-off-by: Dan S. Camper <dan.camper@lexisnexisrisk.com>
@hpcc-jirabot

This comment has been minimized.

Copy link

commented Jul 18, 2017

@dcamper

This comment has been minimized.

Copy link
Contributor Author

commented Jul 18, 2017

@rpastrana Please review

Copy link
Member

left a comment

@dcamper looks good. I had one minor question. Also, can you remind me why the xpathorname is now taking a stringbuffer?

}
else
{
outXPath.append(field->xpath, 0, static_cast<size32_t>(sep - field->xpath));

This comment has been minimized.

Copy link
@rpastrana

rpastrana Jul 18, 2017

Member

is it possible to have more than one xpathCompoundSeparatorChar in field->xpath? Does it matter?

This comment has been minimized.

Copy link
@dcamper

dcamper Jul 19, 2017

Author Contributor

It does not appear that xpathCompoundSeparatorChar will be present more than once. I found the construction for those values in ecl/hqlcpp/hqlhtcpp.cpp and the comment associated with it reads:

//Format of the xpath field is (nested-item 0x01 repeated-item)

Plus, a search through the codebase shows that all other code parsing for that character assumes that there is never more than one present.

@HPCCSmoketest

This comment has been minimized.

Copy link
Contributor

commented Jul 18, 2017

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

errors warnings build time
0 65 92.7 seconds

Install hpccsystems-platform-community_6.4.0-rc6.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 95 95 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) 733 733 0
test (thor) 627 627 0
test (roxie) 760 760 0

HPCC Stop: OK
HPCC Uninstall: OK

@dcamper

This comment has been minimized.

Copy link
Contributor Author

commented Jul 19, 2017

CouchbaseRowBuilder::xpathOrName() used to return a simple const char* because all possible non-null values were already available. With this new version, one of the possible return values is a substring that requires construction. It made sense to pass in a container for the constructed string at that point.

Copy link
Member

left a comment

@dcamper looks good to go.

@richardkchapman richardkchapman changed the base branch from candidate-6.4.0 to candidate-6.4.2 Jul 27, 2017
@richardkchapman richardkchapman merged commit d8f3c3a into hpcc-systems:candidate-6.4.2 Aug 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.