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

Jump to bottom

HPCC-20090 Return partition/bloom information in WsDfu.DFUInfo #11420

Merged
merged 3 commits into from Aug 6, 2018
Merged

HPCC-20090 Return partition/bloom information in WsDfu.DFUInfo #11420

merged 3 commits into from Aug 6, 2018

Conversation

wangkx
Copy link
Member

@wangkx wangkx commented Jul 16, 2018

Signed-off-by: wangkx kevin.wang@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-20090 Return partition/bloom information in WsDfu.DFUInfo
9b8c1e1 
Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
@hpcc-jirabot
Copy link

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

@wangkx
Copy link
Member Author

wangkx commented Jul 16, 2018

@afishbeck please review.

afishbeck
afishbeck reviewed Jul 25, 2018
View reviewed changes
Copy link
Member

@afishbeck afishbeck left a comment

Choose a reason for hiding this comment

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

@wangkx looks good, a couple questions.

esp/scm/ws_dfu.ecm Outdated
@@ -160,6 +174,8 @@ ESPStruct [nil_remove] DFUFileDetail
[min_ver("1.37"), json_inline(1)] string jsonInfo;
[min_ver("1.37")] binary binInfo;
[min_ver("1.38")] string PackageID;
[min_ver("1.39")] ESPstruct DFUFilePartition Partitions;
Copy link
Member

Choose a reason for hiding this comment

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

Since this isn't an array should it be Partition instead of Partitions?

esp/services/ws_dfu/ws_dfuService.cpp Outdated
return;

fieldCount++;
if (fieldMask % 2)
Copy link
Member

Choose a reason for hiding this comment

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

Not sure if this is the most efficient way, but probably doesn't make much difference.

HPCC-19607 Revise based on review
69999f7 
Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
richardkchapman
richardkchapman reviewed Jul 27, 2018
View reviewed changes
esp/scm/ws_dfu.ecm Outdated
@@ -174,8 +174,8 @@ ESPStruct [nil_remove] DFUFileDetail
[min_ver("1.37"), json_inline(1)] string jsonInfo;
[min_ver("1.37")] binary binInfo;
[min_ver("1.38")] string PackageID;
[min_ver("1.39")] ESPstruct DFUFilePartition Partitions;
[min_ver("1.39")] ESPstruct DFUFileBloom Blooms;
[min_ver("1.39")] ESPstruct DFUFilePartition Partition;
Copy link
Member

Choose a reason for hiding this comment

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

There can only be one PARTITION attribute, but there can be several BLOOM attributes. I'm not sure the code below handles this

Copy link
Member Author

Choose a reason for hiding this comment

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

@richardkchapman for testing, I am trying to create an index with multiple BLOOM attributes using the following ECL code. The eclagent throws an exception: 'Published record size 22 for file thor::fred, does not match coded record size 13'. Please advise how to fix the ECL code.

rec := RECORD
string1 a;
string3 b;
string1 c;
unsigned d;
END;

boolean useBloom := true : stored('useBloom');

d := dataset('fred', rec, FLAT);

i1 := index(d, {a,b,c,d}, 'kw_ix_bloom_a_b_1');
buildindex(i1, overwrite, BLOOM(a, LIMIT(10), PROBABILITY(0.1)), BLOOM(b, LIMIT(12), PROBABILITY(0.2)));

Copy link
Member Author

Choose a reason for hiding this comment

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

Never mind. The problem is in my data file. I fixed it and just creates an index with multiple BLOOM attributes. @wangkx

richardkchapman
richardkchapman reviewed Jul 27, 2018
View reviewed changes
esp/scm/ws_dfu.ecm Outdated
@@ -160,6 +174,8 @@ ESPStruct [nil_remove] DFUFileDetail
[min_ver("1.37"), json_inline(1)] string jsonInfo;
[min_ver("1.37")] binary binInfo;
[min_ver("1.38")] string PackageID;
[min_ver("1.39")] ESPstruct DFUFilePartition Partition;
[min_ver("1.39")] ESPstruct DFUFileBloom Bloom;
Copy link
Member

Choose a reason for hiding this comment

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

There can only be one PARTITION on an index but there can be several BLOOM attributes.

@richardkchapman
Copy link
Member

@wangkx

HPCC-20090 Support multiple Blooms
76177d1 
Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
@HPCCSmoketest
Copy link
Contributor

Automated Smoketest: ✅
OS: centos 7.4.1708 (Linux 3.10.0-327.28.3.el7.x86_64)
Sha: 76177d1
Build: success
Install hpccsystems-platform-community_7.0.0-trunk0.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 89 89 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) 804 804 0
test (thor) 729 729 0
test (roxie) 878 878 0

HPCC Stop: OK
HPCC Uninstall: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
11 sec (00:00:11) 174 sec (00:02:54) 61 sec (00:01:01) 9 sec (00:00:09) 29 sec (00:00:29) 1273 sec (00:21:13) 20 sec (00:00:20) 1577 sec (00:26:17)

@wangkx
Copy link
Member Author

wangkx commented Jul 31, 2018

@richardkchapman @afishbeck please review my last commit.

afishbeck
afishbeck approved these changes Aug 5, 2018
View reviewed changes
Copy link
Member

@afishbeck afishbeck left a comment

Choose a reason for hiding this comment

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

@wangkx looks good.

@richardkchapman richardkchapman merged commit 1da1cb8 into hpcc-systems:master Aug 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richardkchapman richardkchapman richardkchapman left review comments

@afishbeck afishbeck afishbeck approved these changes

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