File size: 18,221 Bytes
5a9e79d | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 | diff --git a/datafusion/core/tests/custom_sources_cases/provider_filter_pushdown.rs b/datafusion/core/tests/custom_sources_cases/provider_filter_pushdown.rs
index f68bcfaf1..c80c0b4bf 100644
--- a/datafusion/core/tests/custom_sources_cases/provider_filter_pushdown.rs
+++ b/datafusion/core/tests/custom_sources_cases/provider_filter_pushdown.rs
@@ -179,12 +179,12 @@ impl TableProvider for CustomProvider {
match &filters[0] {
Expr::BinaryExpr(BinaryExpr { right, .. }) => {
let int_value = match &**right {
- Expr::Literal(ScalarValue::Int8(Some(i))) => *i as i64,
- Expr::Literal(ScalarValue::Int16(Some(i))) => *i as i64,
- Expr::Literal(ScalarValue::Int32(Some(i))) => *i as i64,
- Expr::Literal(ScalarValue::Int64(Some(i))) => *i,
+ Expr::Literal(ScalarValue::Int8(Some(i)), _) => *i as i64,
+ Expr::Literal(ScalarValue::Int16(Some(i)), _) => *i as i64,
+ Expr::Literal(ScalarValue::Int32(Some(i)), _) => *i as i64,
+ Expr::Literal(ScalarValue::Int64(Some(i)), _) => *i,
Expr::Cast(Cast { expr, data_type: _ }) => match expr.deref() {
- Expr::Literal(lit_value) => match lit_value {
+ Expr::Literal(lit_value, _) => match lit_value {
ScalarValue::Int8(Some(v)) => *v as i64,
ScalarValue::Int16(Some(v)) => *v as i64,
ScalarValue::Int32(Some(v)) => *v as i64,
diff --git a/datafusion/core/tests/dataframe/mod.rs b/datafusion/core/tests/dataframe/mod.rs
index aa36de1e5..c737d0f9c 100644
--- a/datafusion/core/tests/dataframe/mod.rs
+++ b/datafusion/core/tests/dataframe/mod.rs
@@ -1210,7 +1210,7 @@ async fn join_on_filter_datatype() -> Result<()> {
let join = left.clone().join_on(
right.clone(),
JoinType::Inner,
- Some(Expr::Literal(ScalarValue::Null)),
+ Some(Expr::Literal(ScalarValue::Null, None)),
)?;
assert_snapshot!(join.into_optimized_plan().unwrap(), @"EmptyRelation");
@@ -4527,7 +4527,10 @@ async fn consecutive_projection_same_schema() -> Result<()> {
// Add `t` column full of nulls
let df = df
- .with_column("t", cast(Expr::Literal(ScalarValue::Null), DataType::Int32))
+ .with_column(
+ "t",
+ cast(Expr::Literal(ScalarValue::Null, None), DataType::Int32),
+ )
.unwrap();
df.clone().show().await.unwrap();
diff --git a/datafusion/core/tests/execution/logical_plan.rs b/datafusion/core/tests/execution/logical_plan.rs
index 97bb2a727..f5a8a30e0 100644
--- a/datafusion/core/tests/execution/logical_plan.rs
+++ b/datafusion/core/tests/execution/logical_plan.rs
@@ -47,9 +47,9 @@ async fn count_only_nulls() -> Result<()> {
let input = Arc::new(LogicalPlan::Values(Values {
schema: input_schema,
values: vec![
- vec![Expr::Literal(ScalarValue::Null)],
- vec![Expr::Literal(ScalarValue::Null)],
- vec![Expr::Literal(ScalarValue::Null)],
+ vec![Expr::Literal(ScalarValue::Null, None)],
+ vec![Expr::Literal(ScalarValue::Null, None)],
+ vec![Expr::Literal(ScalarValue::Null, None)],
],
}));
let input_col_ref = Expr::Column(Column {
diff --git a/datafusion/core/tests/expr_api/simplification.rs b/datafusion/core/tests/expr_api/simplification.rs
index 34e0487f3..91a507bdf 100644
--- a/datafusion/core/tests/expr_api/simplification.rs
+++ b/datafusion/core/tests/expr_api/simplification.rs
@@ -282,10 +282,13 @@ fn select_date_plus_interval() -> Result<()> {
let date_plus_interval_expr = to_timestamp_expr(ts_string)
.cast_to(&DataType::Date32, schema)?
- + Expr::Literal(ScalarValue::IntervalDayTime(Some(IntervalDayTime {
- days: 123,
- milliseconds: 0,
- })));
+ + Expr::Literal(
+ ScalarValue::IntervalDayTime(Some(IntervalDayTime {
+ days: 123,
+ milliseconds: 0,
+ })),
+ None,
+ );
let plan = LogicalPlanBuilder::from(table_scan.clone())
.project(vec![date_plus_interval_expr])?
diff --git a/datafusion/core/tests/user_defined/expr_planner.rs b/datafusion/core/tests/user_defined/expr_planner.rs
index 1fc6d14c5..07d289cab 100644
--- a/datafusion/core/tests/user_defined/expr_planner.rs
+++ b/datafusion/core/tests/user_defined/expr_planner.rs
@@ -56,7 +56,7 @@ impl ExprPlanner for MyCustomPlanner {
}
BinaryOperator::Question => {
Ok(PlannerResult::Planned(Expr::Alias(Alias::new(
- Expr::Literal(ScalarValue::Boolean(Some(true))),
+ Expr::Literal(ScalarValue::Boolean(Some(true)), None),
None::<&str>,
format!("{} ? {}", expr.left, expr.right),
))))
diff --git a/datafusion/core/tests/user_defined/user_defined_plan.rs b/datafusion/core/tests/user_defined/user_defined_plan.rs
index b68ef6aca..4d3916c17 100644
--- a/datafusion/core/tests/user_defined/user_defined_plan.rs
+++ b/datafusion/core/tests/user_defined/user_defined_plan.rs
@@ -912,11 +912,12 @@ impl MyAnalyzerRule {
.map(|e| {
e.transform(|e| {
Ok(match e {
- Expr::Literal(ScalarValue::Int64(i)) => {
+ Expr::Literal(ScalarValue::Int64(i), _) => {
// transform to UInt64
- Transformed::yes(Expr::Literal(ScalarValue::UInt64(
- i.map(|i| i as u64),
- )))
+ Transformed::yes(Expr::Literal(
+ ScalarValue::UInt64(i.map(|i| i as u64)),
+ None,
+ ))
}
_ => Transformed::no(e),
})
diff --git a/datafusion/core/tests/user_defined/user_defined_scalar_functions.rs b/datafusion/core/tests/user_defined/user_defined_scalar_functions.rs
index 25458efa4..3e8fafc7a 100644
--- a/datafusion/core/tests/user_defined/user_defined_scalar_functions.rs
+++ b/datafusion/core/tests/user_defined/user_defined_scalar_functions.rs
@@ -20,7 +20,7 @@ use std::collections::HashMap;
use std::hash::{DefaultHasher, Hash, Hasher};
use std::sync::Arc;
-use arrow::array::{as_string_array, record_batch, Int8Array, UInt64Array};
+use arrow::array::{as_string_array, create_array, record_batch, Int8Array, UInt64Array};
use arrow::array::{
builder::BooleanBuilder, cast::AsArray, Array, ArrayRef, Float32Array, Float64Array,
Int32Array, RecordBatch, StringArray,
@@ -42,9 +42,9 @@ use datafusion_common::{
};
use datafusion_expr::simplify::{ExprSimplifyResult, SimplifyInfo};
use datafusion_expr::{
- Accumulator, ColumnarValue, CreateFunction, CreateFunctionBody, LogicalPlanBuilder,
- OperateFunctionArg, ReturnFieldArgs, ScalarFunctionArgs, ScalarUDF, ScalarUDFImpl,
- Signature, Volatility,
+ lit_with_metadata, Accumulator, ColumnarValue, CreateFunction, CreateFunctionBody,
+ LogicalPlanBuilder, OperateFunctionArg, ReturnFieldArgs, ScalarFunctionArgs,
+ ScalarUDF, ScalarUDFImpl, Signature, Volatility,
};
use datafusion_functions_nested::range::range_udf;
use parking_lot::Mutex;
@@ -1529,6 +1529,65 @@ async fn test_metadata_based_udf() -> Result<()> {
Ok(())
}
+#[tokio::test]
+async fn test_metadata_based_udf_with_literal() -> Result<()> {
+ let ctx = SessionContext::new();
+ let input_metadata: HashMap<String, String> =
+ [("modify_values".to_string(), "double_output".to_string())]
+ .into_iter()
+ .collect();
+ let df = ctx.sql("select 0;").await?.select(vec![
+ lit(5u64).alias_with_metadata("lit_with_doubling", Some(input_metadata.clone())),
+ lit(5u64).alias("lit_no_doubling"),
+ lit_with_metadata(5u64, Some(input_metadata))
+ .alias("lit_with_double_no_alias_metadata"),
+ ])?;
+
+ let output_metadata: HashMap<String, String> =
+ [("output_metatype".to_string(), "custom_value".to_string())]
+ .into_iter()
+ .collect();
+ let custom_udf = ScalarUDF::from(MetadataBasedUdf::new(output_metadata.clone()));
+
+ let plan = LogicalPlanBuilder::from(df.into_optimized_plan()?)
+ .project(vec![
+ custom_udf
+ .call(vec![col("lit_with_doubling")])
+ .alias("doubled_output"),
+ custom_udf
+ .call(vec![col("lit_no_doubling")])
+ .alias("not_doubled_output"),
+ custom_udf
+ .call(vec![col("lit_with_double_no_alias_metadata")])
+ .alias("double_without_alias_metadata"),
+ ])?
+ .build()?;
+
+ let actual = DataFrame::new(ctx.state(), plan).collect().await?;
+
+ let schema = Arc::new(Schema::new(vec![
+ Field::new("doubled_output", DataType::UInt64, false)
+ .with_metadata(output_metadata.clone()),
+ Field::new("not_doubled_output", DataType::UInt64, false)
+ .with_metadata(output_metadata.clone()),
+ Field::new("double_without_alias_metadata", DataType::UInt64, false)
+ .with_metadata(output_metadata.clone()),
+ ]));
+
+ let expected = RecordBatch::try_new(
+ schema,
+ vec![
+ create_array!(UInt64, [10]),
+ create_array!(UInt64, [5]),
+ create_array!(UInt64, [10]),
+ ],
+ )?;
+
+ assert_eq!(expected, actual[0]);
+
+ Ok(())
+}
+
/// This UDF is to test extension handling, both on the input and output
/// sides. For the input, we will handle the data differently if there is
/// the canonical extension type Bool8. For the output we will add a
diff --git a/datafusion/core/tests/user_defined/user_defined_table_functions.rs b/datafusion/core/tests/user_defined/user_defined_table_functions.rs
index e4aff0b00..2c6611f38 100644
--- a/datafusion/core/tests/user_defined/user_defined_table_functions.rs
+++ b/datafusion/core/tests/user_defined/user_defined_table_functions.rs
@@ -205,7 +205,7 @@ impl TableFunctionImpl for SimpleCsvTableFunc {
let mut filepath = String::new();
for expr in exprs {
match expr {
- Expr::Literal(ScalarValue::Utf8(Some(ref path))) => {
+ Expr::Literal(ScalarValue::Utf8(Some(ref path)), _) => {
filepath.clone_from(path);
}
expr => new_exprs.push(expr.clone()),
diff --git a/datafusion/proto/tests/cases/roundtrip_logical_plan.rs b/datafusion/proto/tests/cases/roundtrip_logical_plan.rs
index 3edf152f4..993cc6f87 100644
--- a/datafusion/proto/tests/cases/roundtrip_logical_plan.rs
+++ b/datafusion/proto/tests/cases/roundtrip_logical_plan.rs
@@ -1968,7 +1968,7 @@ fn roundtrip_case_with_null() {
let test_expr = Expr::Case(Case::new(
Some(Box::new(lit(1.0_f32))),
vec![(Box::new(lit(2.0_f32)), Box::new(lit(3.0_f32)))],
- Some(Box::new(Expr::Literal(ScalarValue::Null))),
+ Some(Box::new(Expr::Literal(ScalarValue::Null, None))),
));
let ctx = SessionContext::new();
@@ -1977,7 +1977,7 @@ fn roundtrip_case_with_null() {
#[test]
fn roundtrip_null_literal() {
- let test_expr = Expr::Literal(ScalarValue::Null);
+ let test_expr = Expr::Literal(ScalarValue::Null, None);
let ctx = SessionContext::new();
roundtrip_expr_test(test_expr, ctx);
diff --git a/datafusion/proto/tests/cases/serialize.rs b/datafusion/proto/tests/cases/serialize.rs
index ed9915083..c9ef4377d 100644
--- a/datafusion/proto/tests/cases/serialize.rs
+++ b/datafusion/proto/tests/cases/serialize.rs
@@ -256,7 +256,7 @@ fn test_expression_serialization_roundtrip() {
use datafusion_proto::logical_plan::from_proto::parse_expr;
let ctx = SessionContext::new();
- let lit = Expr::Literal(ScalarValue::Utf8(None));
+ let lit = Expr::Literal(ScalarValue::Utf8(None), None);
for function in string::functions() {
// default to 4 args (though some exprs like substr have error checking)
let num_args = 4;
diff --git a/datafusion/sqllogictest/test_files/array.slt b/datafusion/sqllogictest/test_files/array.slt
index d89ba600d..ac96daed0 100644
--- a/datafusion/sqllogictest/test_files/array.slt
+++ b/datafusion/sqllogictest/test_files/array.slt
@@ -6032,7 +6032,7 @@ physical_plan
04)------AggregateExec: mode=Partial, gby=[], aggr=[count(Int64(1))]
05)--------ProjectionExec: expr=[]
06)----------CoalesceBatchesExec: target_batch_size=8192
-07)------------FilterExec: substr(md5(CAST(value@0 AS Utf8)), 1, 32) IN ([Literal { value: Utf8View("7f4b18de3cfeb9b4ac78c381ee2ad278") }, Literal { value: Utf8View("a") }, Literal { value: Utf8View("b") }, Literal { value: Utf8View("c") }])
+07)------------FilterExec: substr(md5(CAST(value@0 AS Utf8)), 1, 32) IN ([Literal { value: Utf8View("7f4b18de3cfeb9b4ac78c381ee2ad278"), field: Field { name: "7f4b18de3cfeb9b4ac78c381ee2ad278", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }, Literal { value: Utf8View("a"), field: Field { name: "a", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }, Literal { value: Utf8View("b"), field: Field { name: "b", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }, Literal { value: Utf8View("c"), field: Field { name: "c", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }])
08)--------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
09)----------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
@@ -6061,7 +6061,7 @@ physical_plan
04)------AggregateExec: mode=Partial, gby=[], aggr=[count(Int64(1))]
05)--------ProjectionExec: expr=[]
06)----------CoalesceBatchesExec: target_batch_size=8192
-07)------------FilterExec: substr(md5(CAST(value@0 AS Utf8)), 1, 32) IN ([Literal { value: Utf8View("7f4b18de3cfeb9b4ac78c381ee2ad278") }, Literal { value: Utf8View("a") }, Literal { value: Utf8View("b") }, Literal { value: Utf8View("c") }])
+07)------------FilterExec: substr(md5(CAST(value@0 AS Utf8)), 1, 32) IN ([Literal { value: Utf8View("7f4b18de3cfeb9b4ac78c381ee2ad278"), field: Field { name: "7f4b18de3cfeb9b4ac78c381ee2ad278", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }, Literal { value: Utf8View("a"), field: Field { name: "a", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }, Literal { value: Utf8View("b"), field: Field { name: "b", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }, Literal { value: Utf8View("c"), field: Field { name: "c", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }])
08)--------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
09)----------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
@@ -6090,7 +6090,7 @@ physical_plan
04)------AggregateExec: mode=Partial, gby=[], aggr=[count(Int64(1))]
05)--------ProjectionExec: expr=[]
06)----------CoalesceBatchesExec: target_batch_size=8192
-07)------------FilterExec: substr(md5(CAST(value@0 AS Utf8)), 1, 32) IN ([Literal { value: Utf8View("7f4b18de3cfeb9b4ac78c381ee2ad278") }, Literal { value: Utf8View("a") }, Literal { value: Utf8View("b") }, Literal { value: Utf8View("c") }])
+07)------------FilterExec: substr(md5(CAST(value@0 AS Utf8)), 1, 32) IN ([Literal { value: Utf8View("7f4b18de3cfeb9b4ac78c381ee2ad278"), field: Field { name: "7f4b18de3cfeb9b4ac78c381ee2ad278", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }, Literal { value: Utf8View("a"), field: Field { name: "a", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }, Literal { value: Utf8View("b"), field: Field { name: "b", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }, Literal { value: Utf8View("c"), field: Field { name: "c", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }])
08)--------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
09)----------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
@@ -6150,7 +6150,7 @@ physical_plan
04)------AggregateExec: mode=Partial, gby=[], aggr=[count(Int64(1))]
05)--------ProjectionExec: expr=[]
06)----------CoalesceBatchesExec: target_batch_size=8192
-07)------------FilterExec: substr(md5(CAST(value@0 AS Utf8)), 1, 32) IN ([Literal { value: Utf8View("7f4b18de3cfeb9b4ac78c381ee2ad278") }, Literal { value: Utf8View("a") }, Literal { value: Utf8View("b") }, Literal { value: Utf8View("c") }])
+07)------------FilterExec: substr(md5(CAST(value@0 AS Utf8)), 1, 32) IN ([Literal { value: Utf8View("7f4b18de3cfeb9b4ac78c381ee2ad278"), field: Field { name: "7f4b18de3cfeb9b4ac78c381ee2ad278", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }, Literal { value: Utf8View("a"), field: Field { name: "a", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }, Literal { value: Utf8View("b"), field: Field { name: "b", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }, Literal { value: Utf8View("c"), field: Field { name: "c", data_type: Utf8View, nullable: false, dict_id: 0, dict_is_ordered: false, metadata: {} } }])
08)--------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
09)----------------LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=1, end=100000, batch_size=8192]
|