8000 gh-132983: Minor fixes and clean up for the _zstd module by serhiy-storchaka · Pull Request #134930 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-132983: Minor fixes and clean up for the _zstd module #134930

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

Merged
merged 9 commits into from
Jun 1, 2025
Merged

gh-132983: Minor fixes and clean up for the _zstd module #134930

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9aec708
gh-132983: Minor fixes and clean up for the _zstd module
serhiy-storchaka May 30, 2025
0251f9e
Remove defensive double checks after releasing the GIL.
serhiy-storchaka May 31, 2025
710a2b3
Apply suggestions from code review
serhiy-storchaka May 31, 2025
88e9c0a
Merge remote-tracking branch 'refs/remotes/origin/zstd-fixes' into zs…
serhiy-storchaka May 31, 2025
cffe18b
Refactor _zstd_load_c_dict and _zstd_load_d_dict.
serhiy-storchaka May 31, 2025
0dd3b2a
ts
serhiy-storchaka May 31, 2025
4877c81
Merge branch 'main' into zstd-fixes
serhiy-storchaka May 31, 2025
b15f2e4
Update Modules/_zstd/_zstdmodule.c
serhiy-storchaka Jun 1, 2025
fe83254
Update tests.
serhiy-storchaka Jun 1, 2025
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
Prev Previous commit
Next Next commit
Remove defensive double checks after releasing the GIL.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed May 31, 2025
commit 0251f9ed11b62a24c68a2d678a7db62494582e57
12 changes: 6 additions & 6 deletions Modules/_zstd/compressor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,16 +200,16 @@ _get_CDict(ZstdDict *self, int compressionLevel)
goto error;
}

/* Add PyCapsule object to self->c_dicts if it is not already present. */
PyObject *result;
ret = PyDict_SetDefaultRef(self->c_dicts, level, capsule, &result);
/* Add PyCapsule object to self->c_dicts */
ret = PyDict_SetItem(self->c_dicts, level, capsule);
if (ret < 0) {
goto error;
}
Py_DECREF(capsule);
capsule = result;
}
cdict = PyCapsule_GetPointer(capsule, NULL);
else {
/* ZSTD_CDict instance already exists */
cdict = PyCapsule_GetPointer(capsule, NULL);
}
goto success;

error:
Expand Down
20 changes: 8 additions & 12 deletions Modules/_zstd/decompressor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,14 @@ _get_DDict(ZstdDict *self)
Py_BEGIN_ALLOW_THREADS
ret = ZSTD_createDDict(self->dict_buffer, self->dict_len);
Py_END_ALLOW_THREADS
if (self->d_dict != NULL) {
ZSTD_freeDDict(ret);
}
else {
self->d_dict = ret;
if (self->d_dict == NULL) {
_zstd_state* mod_state = PyType_GetModuleState(Py_TYPE(self));
if (mod_state != NULL) {
PyErr_SetString(mod_state->ZstdError,
"Failed to create a ZSTD_DDict instance from "
"Zstandard dictionary content.");
}
self->d_dict = ret;

if (self->d_dict == NULL) {
_zstd_state* mod_state = PyType_GetModuleState(Py_TYPE(self));
if (mod_state != NULL) {
PyErr_SetString(mod_state->ZstdError,
"Failed to create a ZSTD_DDict instance from "
"Zstandard dictionary content.");
}
}
}
Expand Down
0