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.

Sign up for GitHub

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

Jump to bottom

Fix Window Resizing Edge Case #3345

Merged
merged 3 commits into from
Dec 13, 2022
Merged

Fix Window Resizing Edge Case #3345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69ec75f
fix window resizing edge case
daniellerozenblit Dec 13, 2022
32bb667
added test to cli-tests
daniellerozenblit Dec 13, 2022
9b9ad5a
use .ignore for stderr output in window-resize test case
daniellerozenblit Dec 13, 2022
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
4 changes: 2 additions & 2 deletions lib/compress/zstd_compress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,8 +1370,8 @@ ZSTD_adjustCParams_internal(ZSTD_compressionParameters cPar,
}

/* resize windowLog if input is small enough, to use less memory */
if ( (srcSize < maxWindowResize)
&& (dictSize < maxWindowResize) ) {
if ( (srcSize <= maxWindowResize)
&& (dictSize <= maxWindowResize) ) {
U32 const tSize = (U32)(srcSize + dictSize);
static U32 const hashSizeMin = 1 << ZSTD_HASHLOG_MIN;
U32 const srcLog = (tSize < hashSizeMin) ? ZSTD_HASHLOG_MIN :
Expand Down
9 changes: 9 additions & 0 deletions tests/cli-tests/compression/window-resize.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh
datagen -g1G > file
zstd --long=31 -1 --single-thread --no-content-size -f file
zstd -l -v file.zst

# We want to ignore stderr (its outputting "*** zstd command line interface
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One way to silence stderr could be 2> /dev/null (redirects stderr to /dev/null)

# 64-bits v1.5.3, by Yann Collet ***")

rm file file.zst
Empty file added tests/cli-tests/compression/window-resize.sh.stderr.ignore
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions tests/cli-tests/compression/window-resize.sh.stdout.glob
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
...
Window Size: 1.000 GiB (1073741824 B)
...