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-16870 Add method to rebuild a query from its ECL archive #10392

Merged
merged 1 commit into from Sep 25, 2017

Conversation

Projects
None yet
5 participants
@afishbeck
Copy link
Member

commented Sep 2, 2017

This will be really usefull when upgrading the ECL compiler, allowing
the user to rebuild their query from the exact same code.

Signed-off-by: Anthony Fishbeck anthony.fishbeck@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-jirabot

This comment has been minimized.

Copy link

commented Sep 2, 2017

@richardkchapman

This comment has been minimized.

Copy link
Member

commented Sep 5, 2017

Typos (rebuid usefull) in commit message

@afishbeck afishbeck force-pushed the afishbeck:recreateQuery branch from aa8fff4 to 92345ab Sep 15, 2017

@afishbeck

This comment has been minimized.

Copy link
Member Author

commented Sep 15, 2017

@richardkchapman Fixed typos.

@richardkchapman

This comment has been minimized.

Copy link
Member

commented Sep 18, 2017

There's another typo (should be "its" not "it's")

@afishbeck afishbeck force-pushed the afishbeck:recreateQuery branch from 92345ab to 1b0fe15 Sep 18, 2017

@afishbeck

This comment has been minimized.

Copy link
Member Author

commented Sep 18, 2017

Ok fixed. That was a bad day for grammar.

@richardkchapman richardkchapman changed the title HPCC-16870 Add method to rebuid a query from it's ECL archive HPCC-16870 Add method to rebuild a query from its ECL archive Sep 19, 2017

"\n"
"The ECL archive must be available within the workunit of the query.\n"
"\n"
"ecl recreate <target> <query> [options]\n\n"

This comment has been minimized.

Copy link
@richardkchapman

richardkchapman Sep 19, 2017

Member

Should this say "ecl queries recreate" (and line below) ?

@richardkchapman

This comment has been minimized.

Copy link
Member

commented Sep 19, 2017

@wangkx Can you look too please

@wangkx
Copy link
Member

left a comment

@afishbeck a few comments.

ESPEnum WUQueryActivationMode Activate;
bool NoReload(0);

string memoryLimit;

This comment has been minimized.

Copy link
@wangkx

wangkx Sep 19, 2017

Member

Minor: capitalize the variable name

string QueryName;
string QueryId;

string memoryLimit;

This comment has been minimized.

Copy link
@wangkx
throw MakeStringException(ECLWATCH_CANNOT_OPEN_WORKUNIT,"Cannot open workunit %s.", srcWuid);
WsWuInfo info(context, src);
StringBuffer archiveText;
info.getWorkunitArchiveQuery(archiveText); //archive required, fail otherwise

This comment has been minimized.

Copy link
@wangkx

wangkx Sep 19, 2017

Member

Should we check the archiveText and throw an exception if empty here?

const char* srcQueryId = srcQueryTree->queryProp("@id");
const char* srcQueryName = srcQueryTree->queryProp("@name");

PROGLOG("WURecreateQuery: QuerySet %s, query %s, wuid %s", srcTarget, srcQueryId, wuid.str());

This comment has been minimized.

Copy link
@wangkx

wangkx Sep 19, 2017

Member

Is the wuid empty?

if (jobname.length())
{
StringBuffer name;
if (notEmpty(jobname))

This comment has been minimized.

Copy link
@wangkx

wangkx Sep 19, 2017

Member

The jobname is not empty by line 1741.

@afishbeck afishbeck force-pushed the afishbeck:recreateQuery branch from 1b0fe15 to 62f4bed Sep 21, 2017

HPCC-16870 Add method to rebuild a query from its ECL archive
This will be really useful when upgrading the ECL compiler, allowing
the user to rebuild their query from the exact same code.

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>

@afishbeck afishbeck force-pushed the afishbeck:recreateQuery branch from 62f4bed to 3f2fe5c Sep 21, 2017

@afishbeck

This comment has been minimized.

Copy link
Member Author

commented Sep 21, 2017

@wangkx updated, please review

@HPCCSmoketest

This comment has been minimized.

Copy link
Contributor

commented Sep 21, 2017

Automated Smoketest:
Sha: 3f2fe5c
Build: success
Build: success
ECL Watch: Rebuilding Site

errors warnings build time
0 75 41.342 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

@wangkx

This comment has been minimized.

Copy link
Member

commented Sep 22, 2017

@afishbeck looks fine.

@richardkchapman richardkchapman merged commit 1d65298 into hpcc-systems:master Sep 25, 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.