comphead commented on code in PR #2324:
URL: https://github.com/apache/arrow-datafusion/pull/2324#discussion_r859555520
##########
datafusion/physical-expr/src/math_expressions.rs:
##########
@@ -86,6 +88,33 @@ macro_rules! math_unary_function {
};
}
+macro_rules! downcast_arg {
+ ($ARG:expr, $NAME:expr, $ARRAY_TYPE:ident) => {{
+ $ARG.as_any().downcast_ref::<$ARRAY_TYPE>().ok_or_else(|| {
+ DataFusionError::Internal(format!(
+ "could not cast {} to {}",
+ $NAME,
+ type_name::<$ARRAY_TYPE>()
+ ))
+ })?
+ }};
+}
+
+macro_rules! make_function_inputs2 {
+ ($ARG1: expr, $ARG2: expr, $NAME1:expr, $NAME2: expr, $ARRAY_TYPE:ident,
$FUNC: block) => {{
+ let arg1 = downcast_arg!($ARG1, $NAME1, $ARRAY_TYPE);
+ let arg2 = downcast_arg!($ARG2, $NAME2, $ARRAY_TYPE);
+
+ arg1.iter()
+ .zip(arg2.iter())
+ .map(|(a1, a2)| match (a1, a2) {
+ (Some(a1), Some(a2)) => Some($FUNC(a1,
a2.try_into().unwrap())),
Review Comment:
I have removed the conversion, but expended the macros signature, so the
macros user is responsible to provide correct type information. it will be
checked on compile time.
##########
datafusion/core/tests/sql/functions.rs:
##########
@@ -445,3 +445,169 @@ async fn case_builtin_math_expression() {
assert_batches_sorted_eq!(expected, &results);
}
}
+
+#[tokio::test]
+async fn case_sensitive_identifiers_aggregates() {
+ let ctx = SessionContext::new();
+ ctx.register_table("t", table_with_sequence(1, 1).unwrap())
+ .unwrap();
+
+ let expected = vec![
+ "+----------+",
+ "| MAX(t.i) |",
+ "+----------+",
+ "| 1 |",
+ "+----------+",
+ ];
+
+ let results = plan_and_collect(&ctx, "SELECT max(i) FROM t")
+ .await
+ .unwrap();
+
+ assert_batches_sorted_eq!(expected, &results);
+
+ let results = plan_and_collect(&ctx, "SELECT MAX(i) FROM t")
+ .await
+ .unwrap();
+ assert_batches_sorted_eq!(expected, &results);
+
+ // Using double quotes allows specifying the function name with
capitalization
+ let err = plan_and_collect(&ctx, "SELECT \"MAX\"(i) FROM t")
+ .await
+ .unwrap_err();
+ assert_eq!(
+ err.to_string(),
+ "Error during planning: Invalid function 'MAX'"
+ );
+
+ let results = plan_and_collect(&ctx, "SELECT \"max\"(i) FROM t")
+ .await
+ .unwrap();
+ assert_batches_sorted_eq!(expected, &results);
+}
+
+#[tokio::test]
+async fn test_power() -> Result<()> {
+ let schema = Arc::new(Schema::new(vec![
+ Field::new("i32", DataType::Int16, true),
+ Field::new("i64", DataType::Int64, true),
+ Field::new("f32", DataType::Float32, true),
+ Field::new("f64", DataType::Float64, true),
+ ]));
+
+ let data = RecordBatch::try_new(
+ schema.clone(),
+ vec![
+ Arc::new(Int16Array::from(vec![
+ Some(2),
+ Some(5),
+ Some(0),
+ Some(-14),
+ None,
+ ])),
+ Arc::new(Int64Array::from(vec![
+ Some(2),
+ Some(5),
+ Some(0),
+ Some(-14),
+ None,
+ ])),
+ Arc::new(Float32Array::from(vec![
+ Some(1.0),
+ Some(2.5),
+ Some(0.0),
+ Some(-14.5),
+ None,
+ ])),
+ Arc::new(Float64Array::from(vec![
+ Some(1.0),
+ Some(2.5),
+ Some(0.0),
+ Some(-14.5),
+ None,
+ ])),
+ ],
+ )?;
+
+ let table = MemTable::try_new(schema, vec![vec![data]])?;
+
+ let ctx = SessionContext::new();
+ ctx.register_table("test", Arc::new(table))?;
+ let sql = r"SELECT power(i32, 3) as power_i32,
+ power(i64, 3) as power_i64,
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
