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-23191 Remove @count from logical file Protect status #13202
HPCC-23191 Remove @count from logical file Protect status #13202
Conversation
https://track.hpccsystems.com/browse/HPCC-23191 |
@wangkx - please review, any implications of the ecm change? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jakesmith 2 comments
esp/scm/ws_dfu.ecm
Outdated
@@ -158,7 +158,7 @@ ESPStruct [nil_remove] DFUFilePartsOnCluster | |||
ESPStruct [nil_remove] DFUFileProtect | |||
{ | |||
string Owner; | |||
int Count; | |||
[depr_ver("1.53")] int Count; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be [depr_ver("1.54")]. The depr_ver means 'not used from this version on'.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok will fix.
Owned<IEspDFUFileProtect> protect= createDFUFileProtect(); | ||
if(owner && *owner) | ||
protect->setOwner(owner); | ||
if(modified && *modified) | ||
protect->setModified(modified); | ||
protect->setCount(count); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if (version < 1.54)
protect->setCount(tree.getPropInt("@count", 0));
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think should probably be:
if (version < 1.54)
protect->setCount(1);
.. since it didn't have any sensible meaning when it was >1 before, and had to be >=1 if present at all.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK for me.
@wangkx - please see changes |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jakesmith the changes look fine.
e7f2ae0
to
888ad66
Compare
Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
888ad66
to
95864de
Compare
Automated Smoketest: ✅ Unit tests result:
Regression test result:
HPCC Stop: OK
|
@richardkchapman - please merge. |
Signed-off-by: Jake Smith jake.smith@lexisnexisrisk.com
Type of change:
Checklist:
Smoketest:
Testing: