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-33150 Avoid padding logical files with empty parts #19374

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions thorlcr/mfilemanager/thmfilemanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ class CFileManager : public CSimpleInterface, implements IThorFileManager
}
else
{
// NB: it is very unlikely this code has ever been used.
// The whole of fixTotal should be deleted at some point (see HPCC-33150)

// Check options to shrink 'large' tgtfile to this cluster size
const char *wideDestOptStr = globals->queryProp("@wideDestOpt");
if (wideDestOptStr)
Expand Down Expand Up @@ -489,12 +492,16 @@ class CFileManager : public CSimpleInterface, implements IThorFileManager
break;
};
#endif
unsigned offset = 0;
unsigned total;
if (restrictedWidth)
total = restrictedWidth;
else
else if (job.getOptBool("legacyLFNTargetWidth"))
{
unsigned offset; // set by fixTotal (always 0), but never used.
total = fixTotal(job, groups, offset);
}
else
total = job.querySlaves();
if (nonLocalIndex)
++total;
StringBuffer dir;
Expand Down
Loading