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.

Sign up for GitHub

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

Jump to bottom

HPCC-21492 Report an error if embed : activity has an unsupported return type #12283

Merged
merged 1 commit into from Mar 15, 2019
Merged

HPCC-21492 Report an error if embed : activity has an unsupported return type #12283

merged 1 commit into from Mar 15, 2019

Conversation

shamser
Copy link
Contributor

@shamser shamser commented Mar 11, 2019 •
edited

Signed-off-by: Shamser Ahmed shamser.ahmed@lexisnexis.co.uk

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-jirabot
Copy link

https://track.hpccsystems.com/browse/HPCC-21492
Jira updated

@shamser shamser changed the base branch from master to candidate-7.2.x March 11, 2019 15:39
@shamser
Copy link
Contributor Author

shamser commented Mar 11, 2019 •
edited

@ghalliday Please can you review

ghalliday
ghalliday reviewed Mar 13, 2019
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shamser needs more work.

Please can you also add test cases - (in ecl/regress) including where it has more than one attribute.

ecl/hql/hqlgram2.cpp Outdated
@@ -1013,7 +1013,11 @@ IHqlExpression * HqlGram::processEmbedBody(const attribute & errpos, IHqlExpress
}
}
else
{
if (attribs && attribs->queryName()==activityAtom)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is wrong - attribs is a comma list - should be using queryAttributeInList

ecl/hql/hqlgram2.cpp Outdated
@@ -1013,7 +1013,11 @@ IHqlExpression * HqlGram::processEmbedBody(const attribute & errpos, IHqlExpress
}
}
else
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test condition is wrong. Embed, activity

  • does not support transforms, rows
  • does support actions.

@shamser shamser force-pushed the issue21492 branch 3 times, most recently from 5710573 to 6cb459c Compare March 15, 2019 09:29
@HPCCSmoketest
Copy link
Contributor

Automated Smoketest: ✅
OS: centos 7.4.1708 (Linux 3.10.0-327.28.3.el7.x86_64)
Sha: 6cb459c
Build: success
Build: success
Install HPCC Platform
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout elaps
unittest 104 104 0 0 0 33 sec
wutoolTest(Dali) 19 19 0 0 0 3 sec
wutoolTest(Cassandra) 19 19 0 0 0 7 sec

Regression test result:

phase total pass fail elaps
setup (hthor) 11 11 0 24 sec (00:00:24)
setup (thor) 11 11 0 46 sec (00:00:46)
setup (roxie) 11 11 0 26 sec (00:00:26)
test (hthor) 819 819 0 264 sec (00:04:24)
test (thor) 744 744 0 609 sec (00:10:09)
test (roxie) 893 893 0 348 sec (00:05:48)

HPCC Stop: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
31 sec (00:00:31) 196 sec (00:03:16) 0 sec (00:00:00) 2 sec (00:00:02) 17 sec (00:00:17) 1513 sec (00:25:13) 19 sec (00:00:19) 1778 sec (00:29:38)

@shamser
Copy link
Contributor Author

shamser commented Mar 15, 2019

@ghalliday Please can you review (test case added)

ghalliday
ghalliday reviewed Mar 15, 2019
View reviewed changes
ecl/hql/hqlgram2.cpp Outdated
if (type->getTypeCode()!=type_table && type->getTypeCode()!=type_groupedtable && type->getTypeCode()!=type_void)
{
if (attribs && queryAttributeInList(activityAtom,attribs))
reportError(ERR_EMBEDERROR, errpos, "Embedded activities only supports dataset return type or actions");
Copy link
Member

@ghalliday ghalliday Mar 15, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

picky -
Embedded activities only support dataset return types or actions
or
Embedded activity only supports a dataset return type or action

@shamser
HPCC-21492 Report an error if embed : activity has an unsupported ret…
51c019f 
…urn type

Signed-off-by: Shamser Ahmed <shamser.ahmed@lexisnexis.co.uk>
@ghalliday ghalliday merged commit 2b03eef into hpcc-systems:candidate-7.2.x Mar 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ghalliday ghalliday ghalliday left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@shamser @hpcc-jirabot @HPCCSmoketest @ghalliday