ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporary Commit to Retain Requested Hash and Chain Logs During Dict Attach

Browse Source
This commit is contained in:
W. Felix Handte
2018-09-28 17:12:54 -07:00
parent 34e0193129
commit b3107c7799
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_compress.c
+12 -2
View File
@@ -1351,11 +1351,21 @@ static size_t ZSTD_resetCCtx_byAttachingCDict(ZSTD_CCtx* cctx,
/* Copy only compression parameters related to tables. */ /* Copy only compression parameters related to tables. */
params.cParams = *cdict_cParams; params.cParams = *cdict_cParams;
params.cParams.windowLog = windowLog; params.cParams.windowLog = windowLog;
if (params.cParams.strategy <= ZSTD_fast) {
DEBUGLOG(4, "Overriding hashLog from %d to %d", params.cParams.hashLog, cctx->requestedParams.cParams.hashLog);
DEBUGLOG(4, "Overriding chainLog from %d to %d", params.cParams.chainLog, cctx->requestedParams.cParams.chainLog);
if (cctx->requestedParams.cParams.hashLog)
params.cParams.hashLog = cctx->requestedParams.cParams.hashLog;
if (cctx->requestedParams.cParams.chainLog)
params.cParams.chainLog = cctx->requestedParams.cParams.chainLog;
}
ZSTD_resetCCtx_internal(cctx, params, pledgedSrcSize, ZSTD_resetCCtx_internal(cctx, params, pledgedSrcSize,
ZSTDcrp_continue, zbuff); ZSTDcrp_continue, zbuff);
assert(cctx->appliedParams.cParams.strategy == cdict_cParams->strategy); assert(cctx->appliedParams.cParams.strategy == cdict_cParams->strategy);
assert(cctx->appliedParams.cParams.hashLog == cdict_cParams->hashLog); if (params.cParams.strategy > ZSTD_fast) {
assert(cctx->appliedParams.cParams.chainLog == cdict_cParams->chainLog); assert(cctx->appliedParams.cParams.hashLog == cdict_cParams->hashLog);
assert(cctx->appliedParams.cParams.chainLog == cdict_cParams->chainLog);
}
} }
{ {