Skip to content

Commit 8550010

Browse files
authored
Fix input handling for encoding functions & various refactors (#18754)
## 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 #123` indicates that this PR will close issue #123. --> Part of #12725 ## 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. --> Started refactoring encoding functions (`encode`, `decode`) to remove user defined signature (per linked issue). However, discovered in the process it was bugged in handling of certain inputs. For example on main we get these errors: ```sql DataFusion CLI v51.0.0 > select encode(arrow_cast(column1, 'LargeUtf8'), 'hex') from values ('a'), ('b'); Internal error: Function 'encode' returned value of type 'Utf8' while the following type was promised at planning time and expected: 'LargeUtf8'. This issue was likely caused by a bug in DataFusion's code. Please help us to resolve this by filing a bug report in our issue tracker: https://github.com/apache/datafusion/issues > select encode(arrow_cast(column1, 'LargeBinary'), 'hex') from values ('a'), ('b'); Internal error: Function 'encode' returned value of type 'Utf8' while the following type was promised at planning time and expected: 'LargeUtf8'. This issue was likely caused by a bug in DataFusion's code. Please help us to resolve this by filing a bug report in our issue tracker: https://github.com/apache/datafusion/issues > select encode(arrow_cast(column1, 'BinaryView'), 'hex') from values ('a'), ('b'); Error during planning: Execution error: Function 'encode' user-defined coercion failed with "Error during planning: 1st argument should be Utf8 or Binary or Null, got BinaryView" No function matches the given name and argument types 'encode(BinaryView, Utf8)'. You might need to add explicit type casts. Candidate functions: encode(UserDefined) ``` - LargeUtf8/LargeBinary array inputs are broken - BinaryView input not supported (but Utf8View input is supported) So went about fixing this input handling as well as doing various refactors to try simplify the code. (I also discovered #18746 in the process of this refactor). ## 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. --> Refactor signatures away from user defined to the signature coercion API; importantly, we now accept only binary inputs, letting string inputs be coerced by type coercion. This simplifies the internal code of encode/decode to only need to consider binary inputs, instead of duplicating essentially exact code for string inputs (given for string inputs we just grabbed the underlying bytes anyway) Consolidating the inner functions used by encode/decode to try simplify/inline where possible. ## 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)? --> Added new SLTs. ## Are there any user-facing changes? <!-- If there are user-facing changes then we may require documentation to be updated before approving the PR. --> No. <!-- If there are any breaking changes to public APIs, please add the `api change` label. -->
1 parent d493f3d commit 8550010

File tree

2 files changed

+485
-403
lines changed

2 files changed

+485
-403
lines changed

0 commit comments

Comments
 (0)