chore: Refactor CometScanRule to avoid duplication and improve fallback messages #1474
+91
−120
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
N/A
Rationale for this change
The original code was hard to follow due to the duplicated code across multiple match arms.
The original code also contains some bugs/inconsistencies. For example, for v1 data source, there is one match arm that checks
CometNativeScanExec.isSchemaSupported(requiredSchema)
and another match arm that checksCometScanExec.isSchemaSupported(requiredSchema)
. There is then another match arm that runs if neither of those arms ran and it reports unsupported schema based onCometScanExec
and notCometNativeScanExec
, so may miss reporting unsupported schema for native scan.What changes are included in this PR?
Refactor code for readability and correctness.
How are these changes tested?