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.

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

zstd: Fix incorrect repeat coding in best mode #923

Merged
merged 1 commit into from
Feb 5, 2024

Conversation

klauspost
Copy link
Owner

When extending back repeats we may encounter the literals_length = 0 exception, which changes the meaning of offsets. This means the repeat matches the wrong offset.

There is little gain extending repeats back anyway, so just avoid it.

Fixes #922

When extending back repeats we may encounter the [`literals_length = 0`](https://github.com/facebook/zstd/blob/dev/doc/zstd_compression_format.md#repeat-offsets]) exception,  which changes the meaning of offsets. This means the repeat matches the wrong offset.

There is little gain extending repeats back anyway, so just avoid it.

Fixes #922
@klauspost klauspost merged commit aac36dc into master Feb 5, 2024
18 checks passed
@klauspost klauspost deleted the fix-incorrect-zstd-best-repeat branch February 5, 2024 10:35
codeboten referenced this pull request in open-telemetry/opentelemetry-collector Feb 7, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/klauspost/compress](https://github.com/klauspost/compress)
| `v1.17.5` -> `v1.17.6` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fklauspost%2fcompress/v1.17.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fklauspost%2fcompress/v1.17.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fklauspost%2fcompress/v1.17.5/v1.17.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fklauspost%2fcompress/v1.17.5/v1.17.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>klauspost/compress (github.com/klauspost/compress)</summary>

###
[`v1.17.6`](https://github.com/klauspost/compress/releases/tag/v1.17.6)

[Compare
Source](https://github.com/klauspost/compress/compare/v1.17.5...v1.17.6)

#### What's Changed

- zstd: Fix incorrect repeat coding in best mode by
[@&#8203;klauspost](https://github.com/klauspost) in
[https://github.com/klauspost/compress/pull/923](https://github.com/klauspost/compress/pull/923)
- s2: Fix DecodeConcurrent deadlock on errors by
[@&#8203;klauspost](https://github.com/klauspost) in
[https://github.com/klauspost/compress/pull/925](https://github.com/klauspost/compress/pull/925)
- build: Remove garble compiler by
[@&#8203;klauspost](https://github.com/klauspost) in
[https://github.com/klauspost/compress/pull/924](https://github.com/klauspost/compress/pull/924)

**Full Changelog**:
klauspost/compress@v1.17.5...v1.17.6

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any
time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNzMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjE3My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
Co-authored-by: Alex Boten <aboten@lightstep.com>
mx-psi referenced this pull request in open-telemetry/opentelemetry-collector-contrib Feb 9, 2024
…1060)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/klauspost/compress](https://github.com/klauspost/compress)
| `v1.17.5` -> `v1.17.6` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fklauspost%2fcompress/v1.17.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fklauspost%2fcompress/v1.17.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fklauspost%2fcompress/v1.17.5/v1.17.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fklauspost%2fcompress/v1.17.5/v1.17.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>klauspost/compress (github.com/klauspost/compress)</summary>

###
[`v1.17.6`](https://github.com/klauspost/compress/releases/tag/v1.17.6)

[Compare
Source](https://github.com/klauspost/compress/compare/v1.17.5...v1.17.6)

#### What's Changed

- zstd: Fix incorrect repeat coding in best mode by
[@&#8203;klauspost](https://github.com/klauspost) in
[https://github.com/klauspost/compress/pull/923](https://github.com/klauspost/compress/pull/923)
- s2: Fix DecodeConcurrent deadlock on errors by
[@&#8203;klauspost](https://github.com/klauspost) in
[https://github.com/klauspost/compress/pull/925](https://github.com/klauspost/compress/pull/925)
- build: Remove garble compiler by
[@&#8203;klauspost](https://github.com/klauspost) in
[https://github.com/klauspost/compress/pull/924](https://github.com/klauspost/compress/pull/924)

**Full Changelog**:
klauspost/compress@v1.17.5...v1.17.6

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any
time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNzMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjE3My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
Co-authored-by: Yang Song <songy23@users.noreply.github.com>
kodiakhq bot referenced this pull request in cloudquery/codegen Mar 1, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [github.com/klauspost/compress](https://github.com/klauspost/compress) | indirect | patch | `v1.17.5` -> `v1.17.7` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency Dashboard for more information.

---

### Release Notes

<details>
<summary>klauspost/compress (github.com/klauspost/compress)</summary>

### [`v1.17.7`](https://github.com/klauspost/compress/releases/tag/v1.17.7)

[Compare Source](https://github.com/klauspost/compress/compare/v1.17.6...v1.17.7)

#### What's Changed

-   s2: Add AsyncFlush method: Complete the block without flushing by [@&#8203;Jille](https://github.com/Jille) in [https://github.com/klauspost/compress/pull/927](https://github.com/klauspost/compress/pull/927)
-   s2: Fix literal+repeat exceeds dst crash by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/930](https://github.com/klauspost/compress/pull/930)

**Full Changelog**: klauspost/compress@v1.17.6...v1.17.7

### [`v1.17.6`](https://github.com/klauspost/compress/releases/tag/v1.17.6)

[Compare Source](https://github.com/klauspost/compress/compare/v1.17.5...v1.17.6)

#### What's Changed

-   zstd: Fix incorrect repeat coding in best mode by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/923](https://github.com/klauspost/compress/pull/923)
-   s2: Fix DecodeConcurrent deadlock on errors by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/925](https://github.com/klauspost/compress/pull/925)
-   build: Remove garble compiler by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/924](https://github.com/klauspost/compress/pull/924)

**Full Changelog**: klauspost/compress@v1.17.5...v1.17.6

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on the first day of the month" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMjEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjIyMS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
kodiakhq bot referenced this pull request in cloudquery/filetypes Mar 1, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [github.com/klauspost/compress](https://github.com/klauspost/compress) | indirect | patch | `v1.17.5` -> `v1.17.7` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency Dashboard for more information.

---

### Release Notes

<details>
<summary>klauspost/compress (github.com/klauspost/compress)</summary>

### [`v1.17.7`](https://github.com/klauspost/compress/releases/tag/v1.17.7)

[Compare Source](https://github.com/klauspost/compress/compare/v1.17.6...v1.17.7)

#### What's Changed

-   s2: Add AsyncFlush method: Complete the block without flushing by [@&#8203;Jille](https://github.com/Jille) in [https://github.com/klauspost/compress/pull/927](https://github.com/klauspost/compress/pull/927)
-   s2: Fix literal+repeat exceeds dst crash by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/930](https://github.com/klauspost/compress/pull/930)

**Full Changelog**: klauspost/compress@v1.17.6...v1.17.7

### [`v1.17.6`](https://github.com/klauspost/compress/releases/tag/v1.17.6)

[Compare Source](https://github.com/klauspost/compress/compare/v1.17.5...v1.17.6)

#### What's Changed

-   zstd: Fix incorrect repeat coding in best mode by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/923](https://github.com/klauspost/compress/pull/923)
-   s2: Fix DecodeConcurrent deadlock on errors by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/925](https://github.com/klauspost/compress/pull/925)
-   build: Remove garble compiler by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/924](https://github.com/klauspost/compress/pull/924)

**Full Changelog**: klauspost/compress@v1.17.5...v1.17.6

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on the first day of the month" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMjEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjIyMS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
kodiakhq bot referenced this pull request in cloudquery/plugin-pb-go Mar 1, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [github.com/klauspost/compress](https://github.com/klauspost/compress) | indirect | patch | `v1.17.5` -> `v1.17.7` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency Dashboard for more information.

---

### Release Notes

<details>
<summary>klauspost/compress (github.com/klauspost/compress)</summary>

### [`v1.17.7`](https://github.com/klauspost/compress/releases/tag/v1.17.7)

[Compare Source](https://github.com/klauspost/compress/compare/v1.17.6...v1.17.7)

#### What's Changed

-   s2: Add AsyncFlush method: Complete the block without flushing by [@&#8203;Jille](https://github.com/Jille) in [https://github.com/klauspost/compress/pull/927](https://github.com/klauspost/compress/pull/927)
-   s2: Fix literal+repeat exceeds dst crash by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/930](https://github.com/klauspost/compress/pull/930)

**Full Changelog**: klauspost/compress@v1.17.6...v1.17.7

### [`v1.17.6`](https://github.com/klauspost/compress/releases/tag/v1.17.6)

[Compare Source](https://github.com/klauspost/compress/compare/v1.17.5...v1.17.6)

#### What's Changed

-   zstd: Fix incorrect repeat coding in best mode by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/923](https://github.com/klauspost/compress/pull/923)
-   s2: Fix DecodeConcurrent deadlock on errors by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/925](https://github.com/klauspost/compress/pull/925)
-   build: Remove garble compiler by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/924](https://github.com/klauspost/compress/pull/924)

**Full Changelog**: klauspost/compress@v1.17.5...v1.17.6

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on the first day of the month" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMjEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjIyMS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
kodiakhq bot referenced this pull request in cloudquery/plugin-sdk Mar 1, 2024
)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [github.com/klauspost/compress](https://github.com/klauspost/compress) | indirect | patch | `v1.17.5` -> `v1.17.7` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency Dashboard for more information.

---

### Release Notes

<details>
<summary>klauspost/compress (github.com/klauspost/compress)</summary>

### [`v1.17.7`](https://github.com/klauspost/compress/releases/tag/v1.17.7)

[Compare Source](https://github.com/klauspost/compress/compare/v1.17.6...v1.17.7)

#### What's Changed

-   s2: Add AsyncFlush method: Complete the block without flushing by [@&#8203;Jille](https://github.com/Jille) in [https://github.com/klauspost/compress/pull/927](https://github.com/klauspost/compress/pull/927)
-   s2: Fix literal+repeat exceeds dst crash by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/930](https://github.com/klauspost/compress/pull/930)

**Full Changelog**: klauspost/compress@v1.17.6...v1.17.7

### [`v1.17.6`](https://github.com/klauspost/compress/releases/tag/v1.17.6)

[Compare Source](https://github.com/klauspost/compress/compare/v1.17.5...v1.17.6)

#### What's Changed

-   zstd: Fix incorrect repeat coding in best mode by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/923](https://github.com/klauspost/compress/pull/923)
-   s2: Fix DecodeConcurrent deadlock on errors by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/925](https://github.com/klauspost/compress/pull/925)
-   build: Remove garble compiler by [@&#8203;klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/924](https://github.com/klauspost/compress/pull/924)

**Full Changelog**: klauspost/compress@v1.17.5...v1.17.6

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on the first day of the month" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMjEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjIyMS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

zstd: Another data corruption on SpeedBestCompression level
1 participant