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

cherry-picks: bring fixes from master to release branch #1720

Merged
merged 6 commits into from
Jul 8, 2021

Conversation

NamanJain8
Copy link
Contributor

@NamanJain8 NamanJain8 commented Jul 2, 2021

feat(compression): use klauspost zstd when cgo is not enabled (#1706) …
feat(zstd): replace datadog's zstd with Klauspost's zstd (#1709) …
fix(compaction): copy over the file ID when building tables #1713
Bump ristretto: v0.0.4 -> v0.1.0 (#1714) …
fix: Fix conflict detection for managed DB (#1716) …
fix(pendingWrites): don't skip the pending entries with version=0 (#1721


This change is Reviewable

Use https://github.com/klauspost/compress ZSTD compression when CGO is not enabled.
Related to #1383

(cherry picked from commit b188600)
Remove Datadog's ZSTD that requires CGO
Make Klauspost's ZSTD as default

(cherry picked from commit 275264c)
@NamanJain8 NamanJain8 requested a review from manishrjain as a code owner July 2, 2021 16:21
NamanJain8 and others added 4 commits July 8, 2021 15:13
I propose this simple fix for detecting conflicts in managed mode. Addresses https://discuss.dgraph.io/t/fatal-error-when-writing-conflicting-keys-in-managed-mode/14784.

When a write conflict exists for a managed DB, an internal assert can fail.
This occurs because a detected conflict is indicated with commitTs of 0, but handling the error is skipped for managed DB instances.

Rather than conflate conflict detection with a timestamp of 0, it can be indicated with another return value from hasConflict.

(cherry picked from commit 3279e18)
)

With the introduction of SinceTs, a bug was introduced #1653 that skips the pending entries.
The default value of SinceTs is zero. And for the transaction made at readTs 0, the pending entries have version set to 0. So they were also getting skipped.

(cherry picked from commit 3911787)
@NamanJain8 NamanJain8 merged commit 128ac55 into release/v3.2103 Jul 8, 2021
@joshua-goldstein joshua-goldstein deleted the naman/cp/2103 branch October 12, 2022 02:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants