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-17491 Add ecl commands to import/export entire querysets #10542

Merged
merged 2 commits into from Oct 26, 2017
Merged

HPCC-17491 Add ecl commands to import/export entire querysets #10542

merged 2 commits into from Oct 26, 2017

Conversation

afishbeck
Copy link
Member

@afishbeck afishbeck commented Oct 23, 2017 •
edited

ecl queries export --output=file
ecl queries import [--clone-active-state][--replace]

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

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

@afishbeck afishbeck force-pushed the eximqs branch 2 times, most recently from 3fd0afb to 41c42b1 Compare October 23, 2017 15:05
@afishbeck
HPCC-17491 Add ecl commands to import/export entire querysets
f76eb50 
ecl queries export <target> --output=file
ecl queries import <target> <file> [--clone-active-state][--replace]

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
@richardkchapman
Copy link
Member

@afishbeck Who can review this?

@afishbeck
Copy link
Member Author

Perhaps @wangkx, can you review?

wangkx
wangkx reviewed Oct 25, 2017
View reviewed changes
Copy link
Member

@wangkx wangkx left a comment

Choose a reason for hiding this comment

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

@afishbeck a few minor comments

ecl/eclcmd/queries/ecl-queries.cpp
name.append("_activeonly_");
CDateTime dt;
dt.setNow();
dt.getString(name, true);
Copy link
Member

Choose a reason for hiding this comment

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

Where do you use the name?

Copy link
Member Author

Choose a reason for hiding this comment

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

oops forgot to set it to optFIlename. Will change.

ecl/eclcmd/queries/ecl-queries.cpp Outdated
if (optDestQuerySet.isEmpty())
optDestQuerySet.set(arg);
else if (optFilename.isEmpty())
optFilename.set(arg);
Copy link
Member

Choose a reason for hiding this comment

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

minor: wrong indent

esp/scm/ws_workunits.ecm Outdated
@@ -1997,6 +2053,8 @@ ESPservice [
ESPmethod [cache_seconds(60), resp_xsl_default("/esp/xslt/WUQuerysetQueries.xslt")] WUQuerysetDetails(WUQuerySetDetailsRequest, WUQuerySetDetailsResponse);
ESPmethod [cache_seconds(60), resp_xsl_default("/esp/xslt/WUQueryDetails.xslt")] WUQueryDetails(WUQueryDetailsRequest, WUQueryDetailsResponse);
ESPmethod [cache_seconds(60)] WUMultiQuerysetDetails(WUMultiQuerySetDetailsRequest, WUMultiQuerySetDetailsResponse);
ESPmethod WUQuerysetImport(WUQuerysetImportRequest, WUQuerysetImportResponse);
ESPmethod WUQuerysetExport(WUQuerysetExportRequest, WUQuerysetExportResponse);
Copy link
Member

Choose a reason for hiding this comment

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

Should we add the min_ver so that we can trace the change?

esp/services/ws_workunits/ws_workunitsQuerySets.cpp Outdated
updateFlags |= DALI_UPDATEF_APPEND_CLUSTER;

cloner.enableFileCloning(updateFlags, req.getDfsServer(), process.str(), req.getSourceProcess(), req.getAllowForeignFiles());
}
Copy link
Member

Choose a reason for hiding this comment

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

Should we throw an exception if the target is not a roxie?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll move some code around and validate at the top of the method

@afishbeck
HPCC-17491 Updated for review
c360f74 
Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
@afishbeck
Copy link
Member Author

@wangkx updated please review

@afishbeck
Copy link
Member Author

@AttilaVamos could the above build errors be an anomaly? Nothing I changed should affect javaembed.cpp.

@AttilaVamos
Copy link
Contributor

@afishbeck It is not your fault. Master is fixed and your PR rescheduled.

@HPCCSmoketest
Copy link
Contributor

Automated Smoketest: ✅
Sha: c360f74
Build: success
Build: success
ECL Watch: Rebuilding Site

errors warnings build time
0 75 42.543 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 101 101 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) 745 745 0
test (thor) 640 640 0
test (roxie) 773 773 0

HPCC Stop: OK
HPCC Uninstall: OK

@richardkchapman
Copy link
Member

@wangkx Please review

wangkx
wangkx approved these changes Oct 26, 2017
View reviewed changes
Copy link
Member

@wangkx wangkx left a comment

Choose a reason for hiding this comment

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

@afishbeck looks good.

@richardkchapman richardkchapman merged commit d5c58e9 into hpcc-systems:master Oct 26, 2017
@afishbeck afishbeck deleted the eximqs branch November 7, 2017 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wangkx wangkx wangkx approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
6 participants
@afishbeck @hpcc-jirabot @richardkchapman @AttilaVamos @HPCCSmoketest @wangkx