Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32k
gh-132983: Clean-ups for_zstd#133670
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
16 commits Select commitHold shift + click to select a range
0c3c667 zstd: replace star import with explicit names
AA-Turnere02f66c zstd: factor common parts of set_zstd_error()
AA-Turner686ae61 zstd: Remove ZSTD_versionString from error messages
AA-Turner7ea1ac1 zstd: Simplify version_info setup
AA-Turner9774338 zstd: Replace _compressionLevel_values with ZSTD_CLEVEL_DEFAULT
AA-Turnerd1dea98 zstd: Remove _ZSTD_CStreamSizes, replace _ZSTD_DStreamSizes with ZSTD…
AA-Turnerac1e39c zstd: Remove _ZSTD_CONFIG
AA-Turner1a54bf3 zstd: Replace add_parameters and ADD_INT_PREFIX_MACRO with PyModule_A…
AA-Turner9cb7a3d Merge branch 'main' into zstd-clean
AA-Turner663e666 Revert "zstd: factor common parts of set_zstd_error()"
AA-Turnerdd1380d Use PyModule_Add
AA-Turnerfcd6561 Check failure cases for int macros
AA-Turner06a4723 Remove ERR_SET_PLEDGED_INPUT_SIZE
AA-Turneref2634d Use PyLong_FromSize_t
AA-Turnerff28bf2 Use runtime version
AA-Turner3d3dbf7 Calculate zstd_version_info in Python
AA-TurnerFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
74 changes: 40 additions & 34 deletionsLib/compression/zstd/__init__.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
8 changes: 3 additions & 5 deletionsLib/compression/zstd/_zstdfile.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletionsLib/test/test_zstd.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
194 changes: 61 additions & 133 deletionsModules/_zstd/_zstdmodule.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -33,9 +33,6 @@ set_zstd_error(const _zstd_state* const state, | ||
| case ERR_COMPRESS: | ||
| msg = "Unable to compress zstd data: %s"; | ||
| break; | ||
| case ERR_LOAD_D_DICT: | ||
| msg = "Unable to load zstd dictionary or prefix for decompression: %s"; | ||
| @@ -151,19 +148,19 @@ set_parameter_error(const _zstd_state* const state, int is_compress, | ||
| } | ||
| if (ZSTD_isError(bounds.error)) { | ||
| PyErr_Format(state->ZstdError, | ||
| "Zstd %s parameter \"%s\" is invalid.", | ||
| type, name); | ||
| return; | ||
| } | ||
| /* Error message */ | ||
| PyErr_Format(state->ZstdError, | ||
| "Error when setting zstd %s parameter \"%s\", it " | ||
| "should %d <= value <= %d, provided value is %d. " | ||
| "(%d-bit build)", | ||
| type, name, | ||
| bounds.lowerBound, bounds.upperBound, value_v, | ||
| 8*(int)sizeof(Py_ssize_t)); | ||
| } | ||
| static inline _zstd_state* | ||
| @@ -558,150 +555,81 @@ static PyMethodDef _zstd_methods[] = { | ||
| }; | ||
| static inline int | ||
| add_vars_to_module(PyObject *m) | ||
| { | ||
| #define ADD_INT_MACRO(MACRO) \ | ||
| if (PyModule_AddIntConstant((m), #MACRO, (MACRO)) < 0) { \ | ||
| return -1; \ | ||
| } | ||
| /*zstd_version_number, int */ | ||
| if (PyModule_AddIntConstant(m, "zstd_version_number", | ||
| ZSTD_versionNumber()) < 0) { | ||
| return -1; | ||
| } | ||
picnixz marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| /* zstd_version, str */ | ||
| if (PyModule_AddStringConstant(m, "zstd_version", | ||
| ZSTD_versionString()) < 0) { | ||
| return -1; | ||
| } | ||
| /* ZSTD_CLEVEL_DEFAULT, int */ | ||
| #if ZSTD_VERSION_NUMBER >= 10500 | ||
| if (PyModule_AddIntConstant(m, "ZSTD_CLEVEL_DEFAULT", | ||
picnixz marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| ZSTD_defaultCLevel()) < 0) { | ||
| return -1; | ||
| } | ||
| #else | ||
| ADD_INT_MACRO(ZSTD_CLEVEL_DEFAULT); | ||
| #endif | ||
| /* ZSTD_DStreamOutSize, int */ | ||
| if (PyModule_Add(m, "ZSTD_DStreamOutSize", | ||
| PyLong_FromSize_t(ZSTD_DStreamOutSize())) < 0) { | ||
| return -1; | ||
| } | ||
| /*Add zstd compression parameters. All should also be in cp_list. */ | ||
| ADD_INT_MACRO(ZSTD_c_compressionLevel); | ||
| ADD_INT_MACRO(ZSTD_c_windowLog); | ||
| ADD_INT_MACRO(ZSTD_c_hashLog); | ||
| ADD_INT_MACRO(ZSTD_c_chainLog); | ||
| ADD_INT_MACRO(ZSTD_c_searchLog); | ||
| ADD_INT_MACRO(ZSTD_c_minMatch); | ||
| ADD_INT_MACRO(ZSTD_c_targetLength); | ||
| ADD_INT_MACRO(ZSTD_c_strategy); | ||
| ADD_INT_MACRO(ZSTD_c_enableLongDistanceMatching); | ||
| ADD_INT_MACRO(ZSTD_c_ldmHashLog); | ||
| ADD_INT_MACRO(ZSTD_c_ldmMinMatch); | ||
| ADD_INT_MACRO(ZSTD_c_ldmBucketSizeLog); | ||
| ADD_INT_MACRO(ZSTD_c_ldmHashRateLog); | ||
| ADD_INT_MACRO(ZSTD_c_contentSizeFlag); | ||
| ADD_INT_MACRO(ZSTD_c_checksumFlag); | ||
| ADD_INT_MACRO(ZSTD_c_dictIDFlag); | ||
| ADD_INT_MACRO(ZSTD_c_nbWorkers); | ||
| ADD_INT_MACRO(ZSTD_c_jobSize); | ||
| ADD_INT_MACRO(ZSTD_c_overlapLog); | ||
| /* Add zstd decompression parameters. All should also be in dp_list. */ | ||
| ADD_INT_MACRO(ZSTD_d_windowLogMax); | ||
| /* ZSTD_strategy enum */ | ||
| ADD_INT_MACRO(ZSTD_fast); | ||
| ADD_INT_MACRO(ZSTD_dfast); | ||
| ADD_INT_MACRO(ZSTD_greedy); | ||
| ADD_INT_MACRO(ZSTD_lazy); | ||
| ADD_INT_MACRO(ZSTD_lazy2); | ||
| ADD_INT_MACRO(ZSTD_btlazy2); | ||
| ADD_INT_MACRO(ZSTD_btopt); | ||
| ADD_INT_MACRO(ZSTD_btultra); | ||
| ADD_INT_MACRO(ZSTD_btultra2); | ||
| #undef ADD_INT_MACRO | ||
| return 0; | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.