Skip to content

MINOR: [1.18.x] Remove accidentally committed Thrift build tree - #3930

Closed
manuzhang wants to merge 1 commit into
apache:parquet-1.18.xfrom
manuzhang:remove-thrift-tree-1.18.x
Closed

manuzhang wants to merge 1 commit into
apache:parquet-1.18.xfrom
manuzhang:remove-thrift-tree-1.18.x

Conversation

@manuzhang

Copy link
Copy Markdown
Member

Rationale for this change

The release commit 490699b ("Set version to 1.18.2 for release"), which is the current head of parquet-1.18.x, did more than bump the 18 POM versions. It also committed thrift-0.25.0/: 3,550 files (about 332 MB unpacked), including 40 compiled x86-64 .o files and the files Thrift's configure generates. The prepare-RC workflow had built Thrift inside the checkout, and prepare-rc.sh staged the version bump with git add -A. The tree ended up in the 1.18.2-rc0 source tarball (72.6 MB, against 1.4 MB for 1.18.1), so RC0 cannot be released.

Re-running the workflow for RC1 without this change would tag the same tree again. The POMs are already at 1.18.2, so prepare-rc.sh skips the version bump and tags the branch head.

What changes are included in this PR?

  • Removes thrift-0.25.0/ and nothing else (deletions only).

After this PR, the branch tree matches 9ea3b78 (the commit before the release bump) except for the 1.18.2 POM versions:

$ git diff --stat 9ea3b783 HEAD
 18 files changed, 18 insertions(+), 18 deletions(-)   # pom.xml files only

The removed files stay in history through 490699b and the apache-parquet-1.18.2-rc0 tag, but they are no longer in the tree that RC1 will be built from.

The workflow fix (build Thrift outside the checkout, stage with git add -u, refuse to release from a dirty tree) is in #3929 against master. #3929 should be merged before 1.18.2-rc1 is prepared. Otherwise the workflow builds Thrift in the checkout again, and the Nexus source-release.zip, which mvn deploy builds from the files on disk, would still include it.

Are these changes tested?

  • git diff --stat 9ea3b783 HEAD shows only the 18 POM version changes, as above.
  • No .o files are left in the tree (git ls-files | grep '\.o$' is empty).

Are there any user-facing changes?

No.

🤖 Generated with Claude Code

The release commit 490699b ("Set version to 1.18.2 for release") picked
up the thrift-0.25.0/ directory that the prepare-RC workflow had built in
the checkout, because prepare-rc.sh staged with `git add -A`. That put
3,550 Thrift files, compiled .o files included, into 1.18.2-rc0.

Remove the tree so the branch matches 9ea3b78 again apart from the 1.18.2
POM versions. The workflow side is fixed on master in apache#3929.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.

1 participant