Skip to content

feat: normalize marked Variant arrays at the native Parquet boundary #5715

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.

Sign up for GitHub

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
peterxcli wants to merge 2 commits into
base: main
Choose a base branch
from
+1,257 −3
Open

feat: normalize marked Variant arrays at the native Parquet boundary #5715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be5c547
feat: normalize marked Variant arrays at the native Parquet boundary
peterxcli Sep 5, 2026
b7338be
Merge upstream main and reuse unchanged Variant buffers
peterxcli Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions native/core/src/parquet/cast_column.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
mod variant;

use self::variant::normalize_variant_array;
use arrow::{
array::{make_array, Array, ArrayRef, LargeListArray, ListArray, MapArray, StructArray},
compute::CastOptions,
Expand All @@ -26,6 +29,7 @@ use datafusion::common::format::DEFAULT_CAST_OPTIONS;
use datafusion::common::{DataFusionError, Result as DataFusionResult};
use datafusion::logical_expr::ColumnarValue;
use datafusion::physical_expr::PhysicalExpr;
use parquet::variant::VariantType;
use std::{
fmt::{self, Display},
hash::Hash,
Expand Down Expand Up @@ -243,6 +247,18 @@ impl PhysicalExpr for CometCastColumnExpr {
fn evaluate(&self, batch: &RecordBatch) -> DataFusionResult<ColumnarValue> {
let value = self.expr.evaluate(batch)?;

if self.target_field.has_valid_extension_type::<VariantType>() {
return match value {
ColumnarValue::Array(array) => Ok(ColumnarValue::Array(normalize_variant_array(
&array,
&self.target_field,
)?)),
ColumnarValue::Scalar(_) => Err(DataFusionError::Execution(
"Variant Parquet projection requires an array".to_string(),
)),
};
}

// Use == (PartialEq) instead of equals_datatype because equals_datatype
// ignores field names in nested types (Struct, List, Map). We need to detect
// when field names differ (e.g., Struct("a","b") vs Struct("c","d")) so that
Expand Down
Loading
Loading