Make DDSS Selection Override ForceCopy Directive

This commit is contained in:
W. Felix Handte 2020-09-10 11:33:12 -04:00
parent 2cc2b40a1b
commit 0faefbf1b3

View File

@ -1647,12 +1647,12 @@ static int ZSTD_shouldAttachDict(const ZSTD_CDict* cdict,
{ {
size_t cutoff = attachDictSizeCutoffs[cdict->matchState.cParams.strategy]; size_t cutoff = attachDictSizeCutoffs[cdict->matchState.cParams.strategy];
int const dedicatedDictSearch = cdict->matchState.dedicatedDictSearch; int const dedicatedDictSearch = cdict->matchState.dedicatedDictSearch;
return ( dedicatedDictSearch return dedicatedDictSearch
|| pledgedSrcSize <= cutoff || ( ( pledgedSrcSize <= cutoff
|| pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN || pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN
|| params->attachDictPref == ZSTD_dictForceAttach ) || params->attachDictPref == ZSTD_dictForceAttach )
&& params->attachDictPref != ZSTD_dictForceCopy && params->attachDictPref != ZSTD_dictForceCopy
&& !params->forceWindow; /* dictMatchState isn't correctly && !params->forceWindow ); /* dictMatchState isn't correctly
* handled in _enforceMaxDist */ * handled in _enforceMaxDist */
} }