Skip to content

Conversation

@andygrove
Copy link
Member

@andygrove andygrove commented Oct 21, 2024

Which issue does this PR close?

Closes #1026
Closes #1012

Rationale for this change

Our instructions for building from source produce a jar file that does not contain comet-git-info.properties and this results in an exception at runtime.

We had the same issue with our Docker build because that also builds without git info.

What changes are included in this PR?

Use default values in CometBuildInfo instead of throwing an exception if comet-git-info.properties does not exist.

How are these changes tested?

I tested manually using our Docker/k8s instructions. This was previously failing for me.

@andygrove andygrove marked this pull request as draft October 21, 2024 14:57
@andygrove andygrove marked this pull request as ready for review October 21, 2024 15:31
@andygrove andygrove requested review from comphead and viirya October 21, 2024 15:32
@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 0% with 17 lines in your changes missing coverage. Please review.

Project coverage is 34.28%. Comparing base (e3ac6cf) to head (6979696).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
...mmon/src/main/scala/org/apache/comet/package.scala 0.00% 17 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #1027      +/-   ##
============================================
- Coverage     34.41%   34.28%   -0.13%     
+ Complexity      886      881       -5     
============================================
  Files           112      112              
  Lines         43479    43477       -2     
  Branches       9656     9648       -8     
============================================
- Hits          14962    14908      -54     
- Misses        25442    25480      +38     
- Partials       3075     3089      +14     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

val resourceStream = Thread
.currentThread()
.getContextClassLoader
.getResourceAsStream("comet-git-info.properties")
Copy link
Contributor

Choose a reason for hiding this comment

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

perhaps we can set comet-git-info.properties as a constant?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good point. Updated.

Copy link
Contributor

@comphead comphead left a comment

Choose a reason for hiding this comment

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

lgtm thanks @andygrove

@andygrove andygrove merged commit 3df9d5c into apache:main Oct 21, 2024
@andygrove andygrove deleted the git-info-optional branch October 21, 2024 17:59
andygrove added a commit that referenced this pull request Oct 24, 2024
* Make comet-git-info.properties optional

* use constant
coderfender pushed a commit to coderfender/datafusion-comet that referenced this pull request Dec 13, 2025
## Which issue does this PR close?

<!--
We generally require a GitHub issue to be filed for all bug fixes and
enhancements and this helps us generate change logs for our releases.
You can link an issue to this PR using the GitHub syntax. For example
`Closes apache#123` indicates that this PR will close issue apache#123.
-->

Closes #.

## Rationale for this change

<!--
Why are you proposing this change? If this is already explained clearly
in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand
your changes and offer better suggestions for fixes.
-->

## What changes are included in this PR?

<!--
There is no need to duplicate the description in the issue here but it
is sometimes worth providing a summary of the individual changes in this
PR.
-->

```
cb3e977 perf: Add experimental feature to replace SortMergeJoin with ShuffledHashJoin (apache#1007)
3df9d5c fix: Make comet-git-info.properties optional (apache#1027)
4033687 chore: Reserve memory for native shuffle writer per partition (apache#1022)
bd541d6 (public/main) remove hard-coded version number from Dockerfile (apache#1025)
e3ac6cf feat: Implement bloom_filter_agg (apache#987)
8d097d5 (origin/main) chore: Revert "chore: Reserve memory for native shuffle writer per partition (apache#988)" (apache#1020)
591f45a chore: Bump arrow-rs to 53.1.0 and datafusion (apache#1001)
e146cfa chore: Reserve memory for native shuffle writer per partition (apache#988)
abd9f85 fix: Fallback to Spark if named_struct contains duplicate field names (apache#1016)
22613e9 remove legacy comet-spark-shell (apache#1013)
d40c802 clarify that Maven central only has jars for Linux (apache#1009)
837c256 docs: Various documentation improvements (apache#1005)
0667c60 chore: Make parquet reader options Comet options instead of Hadoop options (apache#968)
0028f1e fix: Fallback to Spark if scan has meta columns (apache#997)
b131cc3 feat: Support `GetArrayStructFields` expression (apache#993)
3413397 docs: Update tuning guide (apache#995)
afd28b9 Quality of life fixes for easier hacking (apache#982)
18150fb chore: Don't transform the HashAggregate to CometHashAggregate if Comet shuffle is disabled (apache#991)
a1599e2 chore: Update for 0.3.0 release, prepare for 0.4.0 development (apache#970)
```

## How are these changes tested?

<!--
We typically require tests for all PRs in order to:
1. Prevent the code from being accidentally broken by subsequent changes
2. Serve as another way to document the expected behavior of the code

If tests are not included in your PR, please explain why (for example,
are they covered by existing tests)?
-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

4 participants