HPCC-31416 CDistributedSuperFile::querySubFile may return incorrect subfile #18385
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
https://track.hpccsystems.com/browse/HPCC-31416 |
jakesmith
reviewed
Mar 13, 2024
| @@ -6271,20 +6271,22 @@ class CDistributedSuperFile: public CDistributedFileBase<IDistributedSuperFile> | |||
| virtual IDistributedFile &querySubFile(unsigned idx,bool sub) override | |||
| { | |||
| CriticalBlock block (sect); | |||
| if (sub) { | |||
| if (sub) | |||
| { | |||
There was a problem hiding this comment.
trivial: formatting change, now inconsistent with other existing code below.
This style is preferred, but if changing, need to make the rest of the function consistently use it.
dali/base/dadfs.cpp
Outdated
| return f; | ||
| } | ||
| // fall through to error | ||
| throw makeStringExceptionV(-1,"CDistributedSuperFile::querySubFile(%u) for superfile %s - subfile doesn't exist ", idx, logicalName.get()); | ||
| } | ||
| return subfiles.item(idx); |
There was a problem hiding this comment.
trivial: let's make it clear that this is an else now, i.e.:
}
else
return subfiles.item(idx);
jakesmith
approved these changes
Mar 20, 2024
There was a problem hiding this comment.
@shamser - looks good
I do wonder whether this should target 9.4, but it's such an old bug.. that has gone unnoticed until now. The only place that hit it, was related to HPCC-31393, that was fixed in 9.4.
I think it's okay to target 9.6.
|
@shamser please rebase to 9.4.x since it is a bugfix. |
…ubfile Querying CDistributedSuperFile for a subfile that doesn't exist returned a subfile instead of throwing an exception. By not throwing an error, incorrect code that calls querySubFile may be appear to work. This fix modifies querySubFile so that it throws an exception when the subfile number is not valid. Signed-off-by: Shamser Ahmed <shamser.ahmed@lexisnexis.com>
jakesmith
approved these changes
Mar 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Querying CDistributedSuperFile for a subfile that doesn't exist returned a subfile instead of throwing an exception. By not throwing an error, incorrect code that calls querySubFile may be appear to work. This fix modifies querySubFile so that it throws an exception when the subfile number is not valid.
Type of change:
Checklist:
Smoketest:
Testing: