-
Notifications
You must be signed in to change notification settings - Fork 3.6k
[Iceberg v3] VARIANT type #27753
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
Merged
Merged
[Iceberg v3] VARIANT type #27753
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3455978
Upgrade testing Docker images to 126
dain 30a654f
Generalize the cast to/from row with field castable constraints
dain f8121c5
Add variant implementation to SPI
dain 14c23d4
Add variant type and block
dain 30d2abd
Remove duplicate assertion in TestRowOperators
dain 041be51
Add variant casts, operators and functions
dain b836777
Add variant to client json and testing client
dain 8174c9a
Add variant support to Iceberg
dain 9bc46eb
Add variant documentation
dain File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
core/trino-main/src/main/java/io/trino/operator/scalar/ArrayToVariantCast.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.trino.operator.scalar; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import io.trino.metadata.SqlScalarFunction; | ||
| import io.trino.spi.block.Block; | ||
| import io.trino.spi.function.BoundSignature; | ||
| import io.trino.spi.function.FunctionMetadata; | ||
| import io.trino.spi.function.Signature; | ||
| import io.trino.spi.type.ArrayType; | ||
| import io.trino.spi.type.TypeSignature; | ||
| import io.trino.spi.variant.Variant; | ||
| import io.trino.util.variant.VariantWriter; | ||
|
|
||
| import java.lang.invoke.MethodHandle; | ||
| import java.lang.invoke.MethodHandles; | ||
|
|
||
| import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT; | ||
| import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL; | ||
| import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL; | ||
| import static io.trino.spi.function.OperatorType.CAST; | ||
| import static io.trino.spi.type.TypeSignature.arrayType; | ||
| import static io.trino.spi.type.VariantType.VARIANT; | ||
| import static io.trino.util.Failures.checkCondition; | ||
| import static io.trino.util.variant.VariantUtil.canCastToVariant; | ||
| import static java.lang.invoke.MethodType.methodType; | ||
|
|
||
| public class ArrayToVariantCast | ||
| extends SqlScalarFunction | ||
| { | ||
| public static final ArrayToVariantCast ARRAY_TO_VARIANT = new ArrayToVariantCast(); | ||
|
|
||
| private static final MethodHandle METHOD_HANDLE; | ||
|
|
||
| static { | ||
| try { | ||
| METHOD_HANDLE = MethodHandles.lookup().findStatic(ArrayToVariantCast.class, "toVariant", methodType(Variant.class, VariantWriter.class, Block.class)); | ||
| } | ||
| catch (IllegalAccessException | NoSuchMethodException e) { | ||
| throw new ExceptionInInitializerError(e); | ||
| } | ||
| } | ||
|
|
||
| private ArrayToVariantCast() | ||
| { | ||
| super(FunctionMetadata.operatorBuilder(CAST) | ||
| .signature(Signature.builder() | ||
| .castableToTypeParameter("T", VARIANT.getTypeSignature()) | ||
| .returnType(VARIANT) | ||
| .argumentType(arrayType(new TypeSignature("T"))) | ||
| .build()) | ||
| .build()); | ||
| } | ||
|
|
||
| @Override | ||
| protected SpecializedSqlScalarFunction specialize(BoundSignature boundSignature) | ||
| { | ||
| ArrayType arrayType = (ArrayType) boundSignature.getArgumentTypes().getFirst(); | ||
| checkCondition(canCastToVariant(arrayType), INVALID_CAST_ARGUMENT, "Cannot cast %s to VARIANT", arrayType); | ||
|
|
||
| VariantWriter writer = VariantWriter.create(arrayType); | ||
| MethodHandle methodHandle = METHOD_HANDLE.bindTo(writer); | ||
| return new ChoicesSpecializedSqlScalarFunction( | ||
| boundSignature, | ||
| FAIL_ON_NULL, | ||
| ImmutableList.of(NEVER_NULL), | ||
| methodHandle); | ||
| } | ||
|
|
||
| private static Variant toVariant(VariantWriter writer, Block block) | ||
| { | ||
| return writer.write(block); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Per our discussion, we should add a new
ClientCapabilitiesflag, maybeRAW_VARIANTorBINARY_VARIANT, and send the client JSON if they don't support it.For JDBC,
getString()should return the JSON value (this is what Snowflake does). ForgetObject(), we can return our ownTrinoVariantin the JDBC package, similar toTrinoIntervalDayTime.