-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Spark: Add vectorized Parquet reads for variant columns #16292
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
Open
nssalian
wants to merge
17
commits into
apache:main
Choose a base branch
from
nssalian:variant-vectorized-reader
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
7c91c45
Spark, Arrow: Add vectorized Parquet reads for variant columns
nssalian d8dd3c7
Modify test from previous patch
nssalian d0cf8dd
disable vectorized read for shredded variant
nssalian 020cf79
Merge remote-tracking branch 'apache/main' into variant-vectorized-re…
nssalian 4164a4b
Fall back to row-at-a-time reads for shredded variant columns
nssalian 6a66e06
Merge remote-tracking branch 'apache/main' into variant-vectorized-re…
nssalian 253ac64
Fix vectorized variant read with deletes
nssalian 2a7f0ca
Merge remote-tracking branch 'apache/main' into variant-vectorized-re…
nssalian f5a7439
PR comments
nssalian a4a0b54
Merge remote-tracking branch 'apache/main' into variant-vectorized-re…
nssalian 933ea41
Merge remote-tracking branch 'apache/main' into variant-vectorized-re…
6f5eb4b
Spark: Detect shredded variant per-file via manifest bounds
2bfc609
Merge remote-tracking branch 'apache/main' into variant-vectorized-re…
bed7967
Fix tests
8f7d68c
Checks for typed value
8957bd2
Merge remote-tracking branch 'apache/main' into variant-vectorized-re…
6282af9
Minor test cleanup
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
137 changes: 137 additions & 0 deletions
137
arrow/src/main/java/org/apache/iceberg/arrow/vectorized/VectorizedVariantVisitor.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,137 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 org.apache.iceberg.arrow.vectorized; | ||
|
|
||
| import java.util.List; | ||
| import org.apache.arrow.memory.BufferAllocator; | ||
| import org.apache.iceberg.Schema; | ||
| import org.apache.iceberg.parquet.ParquetVariantVisitor; | ||
| import org.apache.iceberg.parquet.VectorizedReader; | ||
| import org.apache.iceberg.types.Types; | ||
| import org.apache.parquet.column.ColumnDescriptor; | ||
| import org.apache.parquet.io.InvalidRecordException; | ||
| import org.apache.parquet.schema.GroupType; | ||
| import org.apache.parquet.schema.MessageType; | ||
| import org.apache.parquet.schema.PrimitiveType; | ||
|
|
||
| /** Creates Arrow readers for a variant column's metadata and value leaves. */ | ||
| class VectorizedVariantVisitor extends ParquetVariantVisitor<VectorizedReader<?>> { | ||
| private final String[] variantGroupPath; | ||
| private final MessageType parquetSchema; | ||
| private final Schema icebergSchema; | ||
| private final BufferAllocator allocator; | ||
| private final boolean setArrowValidityVector; | ||
|
|
||
| VectorizedVariantVisitor( | ||
| String[] variantGroupPath, | ||
| MessageType parquetSchema, | ||
| Schema icebergSchema, | ||
| BufferAllocator allocator, | ||
| boolean setArrowValidityVector) { | ||
| this.variantGroupPath = variantGroupPath; | ||
| this.parquetSchema = parquetSchema; | ||
| this.icebergSchema = icebergSchema; | ||
| this.allocator = allocator; | ||
| this.setArrowValidityVector = setArrowValidityVector; | ||
| } | ||
|
|
||
| @Override | ||
| public VectorizedReader<?> metadata(PrimitiveType metadata) { | ||
| ColumnDescriptor desc = resolveDescriptor(metadata); | ||
| if (desc == null) { | ||
| return null; | ||
| } | ||
|
|
||
| Types.NestedField field = | ||
| Types.NestedField.required(-1, metadata.getName(), Types.BinaryType.get()); | ||
| return new VectorizedArrowReader(desc, field, allocator, setArrowValidityVector); | ||
| } | ||
|
|
||
| @Override | ||
| public VectorizedReader<?> serialized(PrimitiveType value) { | ||
| ColumnDescriptor desc = resolveDescriptor(value); | ||
| if (desc == null) { | ||
| return null; | ||
| } | ||
|
|
||
| Types.NestedField field = | ||
| Types.NestedField.optional(-1, value.getName(), Types.BinaryType.get()); | ||
| return new VectorizedArrowReader(desc, field, allocator, setArrowValidityVector); | ||
| } | ||
|
|
||
| @Override | ||
| public VectorizedReader<?> variant( | ||
| GroupType variant, VectorizedReader<?> metadataResult, VectorizedReader<?> valueResult) { | ||
| if (metadataResult instanceof VectorizedArrowReader | ||
| && valueResult instanceof VectorizedArrowReader) { | ||
| Types.NestedField field = findVariantField(variant); | ||
| if (field != null) { | ||
| return new VectorizedArrowReader.VectorizedVariantReader( | ||
| field, (VectorizedArrowReader) metadataResult, (VectorizedArrowReader) valueResult); | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public VectorizedReader<?> primitive(PrimitiveType primitive) { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public VectorizedReader<?> value( | ||
| GroupType value, VectorizedReader<?> valueResult, VectorizedReader<?> typedResult) { | ||
| return valueResult; | ||
| } | ||
|
|
||
| @Override | ||
| public VectorizedReader<?> object( | ||
| GroupType object, VectorizedReader<?> valueResult, List<VectorizedReader<?>> fieldResults) { | ||
| return valueResult; | ||
|
nssalian marked this conversation as resolved.
Outdated
|
||
| } | ||
|
|
||
| @Override | ||
| public VectorizedReader<?> array( | ||
| GroupType array, VectorizedReader<?> valueResult, VectorizedReader<?> elementResult) { | ||
| return valueResult; | ||
| } | ||
|
|
||
| private ColumnDescriptor resolveDescriptor(PrimitiveType primitive) { | ||
| // Build full column path: variant group path + primitive name | ||
| // e.g., ["v1", "metadata"] or ["v2", "value"] | ||
| String[] path = new String[variantGroupPath.length + 1]; | ||
| System.arraycopy(variantGroupPath, 0, path, 0, variantGroupPath.length); | ||
| path[variantGroupPath.length] = primitive.getName(); | ||
|
|
||
| try { | ||
| return parquetSchema.getColumnDescription(path); | ||
| } catch (InvalidRecordException e) { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| private Types.NestedField findVariantField(GroupType variant) { | ||
| if (variant.getId() != null) { | ||
| return icebergSchema.findField(variant.getId().intValue()); | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
| } | ||
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
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.
Uh oh!
There was an error while loading. Please reload this page.