-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Implement GetIndexedField for map-typed columns #7825
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
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
Binary file not shown.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,16 +18,19 @@ | |
| //! get field of a `ListArray` | ||
|
|
||
| use crate::PhysicalExpr; | ||
| use arrow::array::Array; | ||
| use datafusion_common::exec_err; | ||
|
|
||
| use crate::array_expressions::{array_element, array_slice}; | ||
| use crate::physical_expr::down_cast_any_ref; | ||
| use arrow::{ | ||
| array::{Array, Scalar, StringArray}, | ||
| datatypes::{DataType, Schema}, | ||
| record_batch::RecordBatch, | ||
| }; | ||
| use datafusion_common::{cast::as_struct_array, DataFusionError, Result, ScalarValue}; | ||
| use datafusion_common::{ | ||
| cast::{as_map_array, as_struct_array}, | ||
| DataFusionError, Result, ScalarValue, | ||
| }; | ||
| use datafusion_expr::{field_util::GetFieldAccessSchema, ColumnarValue}; | ||
| use std::fmt::Debug; | ||
| use std::hash::{Hash, Hasher}; | ||
|
|
@@ -183,6 +186,14 @@ impl PhysicalExpr for GetIndexedFieldExpr { | |
| let array = self.arg.evaluate(batch)?.into_array(batch.num_rows()); | ||
| match &self.field { | ||
| GetFieldAccessExpr::NamedStructField{name} => match (array.data_type(), name) { | ||
| (DataType::Map(_, _), ScalarValue::Utf8(Some(k))) => { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👨🍳 👌 |
||
| let map_array = as_map_array(array.as_ref())?; | ||
| let key_scalar = Scalar::new(StringArray::from(vec![k.clone()])); | ||
| let keys = arrow::compute::kernels::cmp::eq(&key_scalar, map_array.keys())?; | ||
| let entries = arrow::compute::filter(map_array.entries(), &keys)?; | ||
| let entries_struct_array = as_struct_array(entries.as_ref())?; | ||
| Ok(ColumnarValue::Array(entries_struct_array.column(1).clone())) | ||
| } | ||
| (DataType::Struct(_), ScalarValue::Utf8(Some(k))) => { | ||
| let as_struct_array = as_struct_array(&array)?; | ||
| match as_struct_array.column_by_name(k) { | ||
|
|
||
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,46 @@ | ||
| # 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. | ||
|
|
||
| statement ok | ||
| CREATE EXTERNAL TABLE data | ||
| STORED AS PARQUET | ||
| LOCATION '../core/tests/data/parquet_map.parquet'; | ||
|
|
||
| query I | ||
| SELECT SUM(ints['bytes']) FROM data; | ||
| ---- | ||
| 5636785 | ||
|
|
||
| query I | ||
| SELECT SUM(ints['bytes']) FROM data WHERE strings['method'] == 'GET'; | ||
| ---- | ||
| 649668 | ||
|
|
||
| query TI | ||
| SELECT strings['method'] AS method, COUNT(*) as count FROM data GROUP BY method ORDER BY count DESC; | ||
| ---- | ||
| POST 41 | ||
| HEAD 33 | ||
| PATCH 30 | ||
| OPTION 29 | ||
| GET 27 | ||
| PUT 25 | ||
| DELETE 24 | ||
|
|
||
| query T | ||
| SELECT strings['not_found'] FROM data LIMIT 1; | ||
| ---- |
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.
👍