Change default SQL mapping for VARCAHR from Utf8 to Utf8View
#16142
+238
−193
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,6 +63,7 @@ use std::hash::Hash; | |
| use std::task::{Context, Poll}; | ||
| use std::{any::Any, collections::BTreeMap, fmt, sync::Arc}; | ||
|
|
||
| use arrow::array::{Array, ArrayRef, StringViewArray}; | ||
| use arrow::{ | ||
| array::{Int64Array, StringArray}, | ||
| datatypes::SchemaRef, | ||
|
|
@@ -100,6 +101,7 @@ use datafusion_optimizer::AnalyzerRule; | |
| use datafusion_physical_plan::execution_plan::{Boundedness, EmissionType}; | ||
|
|
||
| use async_trait::async_trait; | ||
| use datafusion_common::cast::as_string_view_array; | ||
| use futures::{Stream, StreamExt}; | ||
|
|
||
| /// Execute the specified sql and return the resulting record batches | ||
|
|
@@ -796,22 +798,30 @@ fn accumulate_batch( | |
| k: &usize, | ||
| ) -> BTreeMap<i64, String> { | ||
| let num_rows = input_batch.num_rows(); | ||
|
|
||
| // Assuming the input columns are | ||
| // column[0]: customer_id / UTF8 or UTF8View | ||
|
Contributor
There was a problem hiding this comment. I feel like the example would be simpler if it just used
Contributor
Author
There was a problem hiding this comment. Good suggestion! Thank you @alamb , addressed in latest PR. |
||
| // column[1]: revenue: Int64 | ||
|
|
||
| let customer_id_column = input_batch.column(0); | ||
| let revenue = as_int64_array(input_batch.column(1)).unwrap(); | ||
|
|
||
| for row in 0..num_rows { | ||
| let customer_id = match customer_id_column.data_type() { | ||
| arrow::datatypes::DataType::Utf8 => { | ||
| let array = as_string_array(customer_id_column).unwrap(); | ||
| array.value(row) | ||
| } | ||
| arrow::datatypes::DataType::Utf8View => { | ||
| let array = as_string_view_array(customer_id_column).unwrap(); | ||
| array.value(row) | ||
| } | ||
| _ => panic!("Unsupported customer_id type"), | ||
| }; | ||
|
|
||
| add_row(&mut top_values, customer_id, revenue.value(row), k); | ||
| } | ||
|
|
||
| top_values | ||
| } | ||
|
|
||
|
|
@@ -843,11 +853,22 @@ impl Stream for TopKReader { | |
| self.state.iter().rev().unzip(); | ||
|
|
||
| let customer: Vec<&str> = customer.iter().map(|&s| &**s).collect(); | ||
|
|
||
| let customer_array: ArrayRef = match schema.field(0).data_type() { | ||
| arrow::datatypes::DataType::Utf8 => { | ||
| Arc::new(StringArray::from(customer)) | ||
| } | ||
| arrow::datatypes::DataType::Utf8View => { | ||
| Arc::new(StringViewArray::from(customer)) | ||
| } | ||
| other => panic!("Unsupported customer_id output type: {other:?}"), | ||
| }; | ||
|
|
||
| Poll::Ready(Some( | ||
| RecordBatch::try_new( | ||
| schema, | ||
| vec![ | ||
| Arc::new(customer_array), | ||
| Arc::new(Int64Array::from(revenue)), | ||
| ], | ||
| ) | ||
|
|
||
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.
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.
I think it would be better if we could change the example to maybe just use a
StringViewArrayin the first place (rather than have to cast it here)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.
Good suggestion! Thank you @alamb , addressed in latest PR.