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

GH-37535: [C++][Parquet] Add missing "thrift" dependency in parquet.pc #37603

Merged
merged 2 commits into from
Sep 11, 2023

Conversation

kou
Copy link
Member

@kou kou commented Sep 7, 2023

Rationale for this change

GH-37399 removed "thrift" pkg-config package dependency from "parquet" pkg-config package accidentally.
Before GH-37399, "arrow" pkg-config packages has "thrift" pkg-config package dependency as Requires.private.

What changes are included in this PR?

Add "thrift" to Requires.private of parquet.pc.

Are these changes tested?

Yes.

Are there any user-facing changes?

Yes.

@kou kou requested a review from wgtmac as a code owner September 7, 2023 08:02
@kou
Copy link
Member Author

kou commented Sep 7, 2023

@github-actions crossbow submit test-r-dev-duckdb

@github-actions
Copy link

github-actions bot commented Sep 7, 2023

⚠️ GitHub issue #37535 has been automatically assigned in GitHub to PR creator.

@github-actions
Copy link

github-actions bot commented Sep 7, 2023

Revision: e69b819

Submitted crossbow builds: ursacomputing/crossbow @ actions-ab2eef7c21

Task Status
test-r-dev-duckdb Github Actions

@kou
Copy link
Member Author

kou commented Sep 7, 2023

@github-actions crossbow submit test-r-gcc-*

@github-actions
Copy link

github-actions bot commented Sep 7, 2023

Revision: e69b819

Submitted crossbow builds: ursacomputing/crossbow @ actions-2be519e29b

Task Status
test-r-gcc-11 Github Actions
test-r-gcc-12 Github Actions

@mapleFU
Copy link
Member

mapleFU commented Sep 7, 2023

Might now related, after #37461 , I changed some parquet generated thrift. Don't know would it affect the parquet.pc

@wgtmac
Copy link
Member

wgtmac commented Sep 7, 2023

Might now related, after #37461 , I changed some parquet generated thrift. Don't know would it affect the parquet.pc

I don't think so.

@@ -533,6 +533,9 @@ set(ARROW_TESTING_PC_LIBS "")
set(ARROW_TESTING_PC_REQUIRES "")

# For parquet.pc.
set(PARQUET_PC_CFLAGS "")
set(PARQUET_PC_CFLAGS_PRIVATE " -DPARQUET_STATIC")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a hack? Or Cflags.private requires only static linking?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a hack.
This is a normal .pc usage.

Or Cflags.private requires only static linking?

Right.
pkg-config --cflags parquet uses only Cflags and
pkg-config --cflags --static parquet uses both of Cflags and Cflags.private.

@kou
Copy link
Member Author

kou commented Sep 8, 2023

#37461 isn't related. :-)

@github-actions github-actions bot added awaiting changes Awaiting changes and removed awaiting committer review Awaiting committer review labels Sep 8, 2023
@kou kou requested a review from assignUser as a code owner September 8, 2023 02:15
@github-actions github-actions bot added Component: R awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Sep 8, 2023
@kou
Copy link
Member Author

kou commented Sep 8, 2023

@github-actions crossbow submit test-r-dev-duckdb test-r-gcc-*

@github-actions
Copy link

github-actions bot commented Sep 8, 2023

Revision: b349d80

Submitted crossbow builds: ursacomputing/crossbow @ actions-4c4b8bc409

Task Status
test-r-dev-duckdb Github Actions
test-r-gcc-11 Github Actions
test-r-gcc-12 Github Actions

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@assignUser FYI: Changes for this file are for using pkg-config for not only arrow.pc but also parquet.pc/arrow-dataset.pc/arrow-acero.pc/arrow-substrait.pc. libarrow.a doesn't depend on Thrift. libparquet.a depends on Thrift. So I removed thrift from Requires.private of arrow.pc by #37399. But I forgot to add thrift to Requires.private of parquet.pc. This is fixed by other changes in this PR. But R failures weren't fixed because r/configure uses pkg-config only for arrow.pc. Requires.private: thrift in parquet.pc wasn't used. So I also changed r/configure to use pkg-config for parquet.pc/arrow-dataset.pc/arrow-acero.pc/arrow-substrait.pc too.

@github-actions github-actions bot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Sep 8, 2023
@kou
Copy link
Member Author

kou commented Sep 8, 2023

I'll merge this in the next week if nobody objects this.

@assignUser
Copy link
Member

@github-actions crossbow submit -g r

@github-actions
Copy link

github-actions bot commented Sep 8, 2023

Revision: b349d80

Submitted crossbow builds: ursacomputing/crossbow @ actions-1ca961daae

Task Status
conda-linux-aarch64-cpu-r41 Azure
conda-linux-aarch64-cpu-r42 Azure
conda-linux-x64-cpu-r41 Azure
conda-linux-x64-cpu-r42 Azure
conda-osx-arm64-cpu-r41 Azure
conda-osx-arm64-cpu-r42 Azure
conda-osx-x64-cpu-r41 Azure
conda-osx-x64-cpu-r42 Azure
conda-win-x64-cpu-r41 Azure
homebrew-r-autobrew Github Actions
homebrew-r-brew Github Actions
r-binary-packages Github Actions
test-fedora-r-clang-sanitizer Azure
test-r-arrow-backwards-compatibility Github Actions
test-r-depsource-bundled Azure
test-r-depsource-system Github Actions
test-r-dev-duckdb Github Actions
test-r-devdocs Github Actions
test-r-gcc-11 Github Actions
test-r-gcc-12 Github Actions
test-r-install-local Github Actions
test-r-install-local-minsizerel Github Actions
test-r-library-r-base-latest Azure
test-r-linux-as-cran Github Actions
test-r-linux-rchk Github Actions
test-r-linux-valgrind Azure
test-r-minimal-build Azure
test-r-offline-maximal Github Actions
test-r-offline-minimal Azure
test-r-rhub-debian-gcc-devel-lto-latest Azure
test-r-rhub-debian-gcc-release-custom-ccache Azure
test-r-rhub-ubuntu-gcc-release-latest Azure
test-r-rstudio-r-base-4.1-opensuse153 Azure
test-r-rstudio-r-base-4.2-centos7-devtoolset-8 Azure
test-r-rstudio-r-base-4.2-focal Azure
test-r-ubuntu-22.04 Github Actions
test-r-versions Github Actions
test-ubuntu-r-sanitizer Azure

Copy link
Member

@assignUser assignUser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The r failures are unrelated e.g. due to #37639

@kou
Copy link
Member Author

kou commented Sep 11, 2023

Thanks.
I merge this.

@kou kou merged commit c0c56e8 into apache:main Sep 11, 2023
32 checks passed
@kou kou deleted the cpp-parquet-pc-thrift branch September 11, 2023 00:15
@kou kou removed the awaiting changes Awaiting changes label Sep 11, 2023
@conbench-apache-arrow
Copy link

After merging your PR, Conbench analyzed the 6 benchmarking runs that have been run so far on merge-commit c0c56e8.

There were 5 benchmark results indicating a performance regression:

The full Conbench report has more details. It also includes information about possible false positives for unstable benchmarks that are known to sometimes produce them.

loicalleyne pushed a commit to loicalleyne/arrow that referenced this pull request Nov 13, 2023
…quet.pc (apache#37603)

### Rationale for this change

apacheGH-37399 removed "thrift" pkg-config package dependency from "parquet" pkg-config package accidentally. 
Before apacheGH-37399, "arrow" pkg-config packages has "thrift" pkg-config package dependency as `Requires.private`.

### What changes are included in this PR?

Add "thrift" to `Requires.private` of `parquet.pc`.

### Are these changes tested?

Yes.

### Are there any user-facing changes?

Yes.
* Closes: apache#37535

Authored-by: Sutou Kouhei <kou@clear-code.com>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
dgreiss pushed a commit to dgreiss/arrow that referenced this pull request Feb 19, 2024
…quet.pc (apache#37603)

### Rationale for this change

apacheGH-37399 removed "thrift" pkg-config package dependency from "parquet" pkg-config package accidentally. 
Before apacheGH-37399, "arrow" pkg-config packages has "thrift" pkg-config package dependency as `Requires.private`.

### What changes are included in this PR?

Add "thrift" to `Requires.private` of `parquet.pc`.

### Are these changes tested?

Yes.

### Are there any user-facing changes?

Yes.
* Closes: apache#37535

Authored-by: Sutou Kouhei <kou@clear-code.com>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
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.

[R][CI] Nightly CI jobs failing with Thrift error
4 participants