Skip to content

Conversation

@andygrove
Copy link
Member

@andygrove andygrove commented Aug 20, 2025

Which issue does this PR close?

Closes #2086

Rationale for this change

What changes are included in this PR?

Fall back to Spark for schemas containing empty structs (seems like an artificial edge case)

How are these changes tested?

I tested this fix manually with Iceberg

@andygrove andygrove requested a review from parthchandra August 20, 2025 18:49
@andygrove
Copy link
Member Author

@hsiang-c fyi

@andygrove andygrove marked this pull request as ready for review August 20, 2025 18:50
@hsiang-c
Copy link
Contributor

hsiang-c commented Aug 20, 2025

@andygrove We might need to add [iceberg] to the title to enable Iceberg Spark tests

@andygrove andygrove changed the title fix: Fall back to spark for schemas with empty structs fix: [iceberg] Fall back to spark for schemas with empty structs Aug 20, 2025
@andygrove
Copy link
Member Author

@andygrove We might need to add [iceberg] to the title to enable Iceberg Spark tests

Done. This won't fully test the fix because shuffle is still disabled in Iceberg. I will create a separate follow-on PR to update the diff and see if there are any other failures related to shuffle after this fix.

@codecov-commenter
Copy link

codecov-commenter commented Aug 20, 2025

Codecov Report

❌ Patch coverage is 20.00000% with 4 lines in your changes missing coverage. Please review.
✅ Project coverage is 58.54%. Comparing base (f09f8af) to head (f6b22c8).
⚠️ Report is 398 commits behind head on main.

Files with missing lines Patch % Lines
...n/scala/org/apache/comet/rules/CometScanRule.scala 0.00% 1 Missing and 1 partial ⚠️
.../main/scala/org/apache/comet/DataTypeSupport.scala 50.00% 0 Missing and 1 partial ⚠️
.../scala/org/apache/comet/serde/QueryPlanSerde.scala 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #2204      +/-   ##
============================================
+ Coverage     56.12%   58.54%   +2.41%     
- Complexity      976     1283     +307     
============================================
  Files           119      143      +24     
  Lines         11743    13216    +1473     
  Branches       2251     2363     +112     
============================================
+ Hits           6591     7737    +1146     
- Misses         4012     4250     +238     
- Partials       1140     1229      +89     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@andygrove
Copy link
Member Author

TPC-DS failure due to #2206

Copy link
Contributor

@parthchandra parthchandra left a comment

Choose a reason for hiding this comment

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

Nice one @andygrove

@andygrove andygrove merged commit 7d737d7 into apache:main Aug 20, 2025
93 of 94 checks passed
@andygrove andygrove deleted the fallback-for-empty-struct branch August 20, 2025 21:37
coderfender pushed a commit to coderfender/datafusion-comet that referenced this pull request Dec 13, 2025
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.

[iceberg] testMergeOnReadMerge failure creating empty StructArray

4 participants