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

Update parquet-go dependency #3068

Merged
merged 3 commits into from
Oct 26, 2023

Conversation

stoewer
Copy link
Collaborator

@stoewer stoewer commented Oct 25, 2023

What this PR does:

Among other changes the parquet-go update contains a fix that avoids blocks with overflows in the uncompressed page size

Which issue(s) this PR fixes:

Helps to mitigate #2987

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Among other changes the parquet-go update contains a fix that avoids
blocks with overflows in the uncompressed page size

See parquet-go/parquet-go#79
@joe-elliott joe-elliott added type/bug Something isn't working backport release-v2.3 labels Oct 25, 2023
@joe-elliott
Copy link
Member

joe-elliott commented Oct 25, 2023

changelog entry?

apologies, didn't mean to close it. i hit the wrong button :).

@joe-elliott joe-elliott reopened this Oct 25, 2023
@stoewer
Copy link
Collaborator Author

stoewer commented Oct 26, 2023

changelog entry?

I now added a changelog entry

@stoewer stoewer merged commit 419288d into grafana:main Oct 26, 2023
14 checks passed
@github-actions
Copy link
Contributor

The backport to release-v2.3 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3068-to-release-v2.3 origin/release-v2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 419288d49dae887d8887aae24e83f3407665f8f1

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-3068-to-release-v2.3
# Create the PR body template
PR_BODY=$(gh pr view 3068 --json body --template 'Backport 419288d49dae887d8887aae24e83f3407665f8f1 from #3068{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release-v2.3] Update parquet-go dependency" --body-file - --label "type/bug" --label "backport" --base release-v2.3 --milestone release-v2.3 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-3068-to-release-v2.3

# Create a pull request where the `base` branch is `release-v2.3` and the `compare`/`head` branch is `backport-3068-to-release-v2.3`.

# Remove the local backport branch
git switch main
git branch -D backport-3068-to-release-v2.3

stoewer added a commit to stoewer/tempo that referenced this pull request Oct 26, 2023
* Update parquet-go dependency

Among other changes the parquet-go update contains a fix that avoids
blocks with overflows in the uncompressed page size

* Update CHANGELOG.md

(cherry picked from commit 419288d)
@stoewer stoewer deleted the update-parquet-go-dependency branch October 26, 2023 08:38
joe-elliott pushed a commit that referenced this pull request Oct 26, 2023
* Update parquet-go dependency

Among other changes the parquet-go update contains a fix that avoids
blocks with overflows in the uncompressed page size

* Update CHANGELOG.md

(cherry picked from commit 419288d)
joe-elliott added a commit that referenced this pull request Oct 26, 2023
* Update parquet-go dependency

Among other changes the parquet-go update contains a fix that avoids
blocks with overflows in the uncompressed page size

* Update CHANGELOG.md

(cherry picked from commit 419288d)

Co-authored-by: A. Stoewer <adrian@stoewer.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants