This is an automated email from the ASF dual-hosted git repository.
jayzhan pushed a commit to branch logical-types
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/logical-types by this push:
new 47941f07c2 [logical-types] fix conflicts (#12820)
47941f07c2 is described below
commit 47941f07c2384a7e004bf918967a296d412ecbb6
Author: Filippo Rossi <[email protected]>
AuthorDate: Wed Oct 9 02:28:24 2024 +0200
[logical-types] fix conflicts (#12820)
---
datafusion/functions/benches/encoding.rs | 5 ++--
datafusion/functions/src/string/btrim.rs | 46 +++++++++++++++-----------------
datafusion/functions/src/string/ltrim.rs | 46 +++++++++++++++-----------------
datafusion/functions/src/string/rtrim.rs | 46 +++++++++++++++-----------------
4 files changed, 69 insertions(+), 74 deletions(-)
diff --git a/datafusion/functions/benches/encoding.rs
b/datafusion/functions/benches/encoding.rs
index d49235aac9..f92e88a464 100644
--- a/datafusion/functions/benches/encoding.rs
+++ b/datafusion/functions/benches/encoding.rs
@@ -19,6 +19,7 @@ extern crate criterion;
use arrow::util::bench_util::create_string_array_with_len;
use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use datafusion_common::ScalarValue;
use datafusion_expr::ColumnarValue;
use datafusion_functions::encoding;
use std::sync::Arc;
@@ -28,7 +29,7 @@ fn criterion_benchmark(c: &mut Criterion) {
for size in [1024, 4096, 8192] {
let str_array = Arc::new(create_string_array_with_len::<i32>(size,
0.2, 32));
c.bench_function(&format!("base64_decode/{size}"), |b| {
- let method = ColumnarValue::Scalar("base64".into());
+ let method = ColumnarValue::from(ScalarValue::from("base64"));
let encoded = encoding::encode()
.invoke(&[ColumnarValue::Array(str_array.clone()),
method.clone()])
.unwrap();
@@ -38,7 +39,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});
c.bench_function(&format!("hex_decode/{size}"), |b| {
- let method = ColumnarValue::Scalar("hex".into());
+ let method = ColumnarValue::from(ScalarValue::from("hex"));
let encoded = encoding::encode()
.invoke(&[ColumnarValue::Array(str_array.clone()),
method.clone()])
.unwrap();
diff --git a/datafusion/functions/src/string/btrim.rs
b/datafusion/functions/src/string/btrim.rs
index 82b7599f07..55687c2d1b 100644
--- a/datafusion/functions/src/string/btrim.rs
+++ b/datafusion/functions/src/string/btrim.rs
@@ -147,7 +147,7 @@ mod tests {
// String view cases for checking normal logic
test_function!(
BTrimFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8View(Some(
+ &[ColumnarValue::from(ScalarValue::Utf8View(Some(
String::from("alphabet ")
))),],
Ok(Some("alphabet")),
@@ -157,7 +157,7 @@ mod tests {
);
test_function!(
BTrimFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8View(Some(
+ &[ColumnarValue::from(ScalarValue::Utf8View(Some(
String::from(" alphabet ")
))),],
Ok(Some("alphabet")),
@@ -168,10 +168,10 @@ mod tests {
test_function!(
BTrimFunc::new(),
&[
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
"alphabet"
)))),
-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from("t")))),
+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("t")))),
],
Ok(Some("alphabe")),
&str,
@@ -181,12 +181,10 @@ mod tests {
test_function!(
BTrimFunc::new(),
&[
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
"alphabet"
)))),
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
- "alphabe"
- )))),
+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("alphabe")))),
],
Ok(Some("t")),
&str,
@@ -196,10 +194,10 @@ mod tests {
test_function!(
BTrimFunc::new(),
&[
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
"alphabet"
)))),
- ColumnarValue::Scalar(ScalarValue::Utf8View(None)),
+ ColumnarValue::from(ScalarValue::Utf8View(None)),
],
Ok(None),
&str,
@@ -210,10 +208,10 @@ mod tests {
test_function!(
BTrimFunc::new(),
&[
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
"xxxalphabetalphabetxxx"
)))),
-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from("x")))),
+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("x")))),
],
Ok(Some("alphabetalphabet")),
&str,
@@ -223,9 +221,9 @@ mod tests {
// String cases
test_function!(
BTrimFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
- String::from("alphabet ")
- ))),],
+ &[ColumnarValue::from(ScalarValue::Utf8(Some(String::from(
+ "alphabet "
+ )))),],
Ok(Some("alphabet")),
&str,
Utf8,
@@ -233,9 +231,9 @@ mod tests {
);
test_function!(
BTrimFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
- String::from("alphabet ")
- ))),],
+ &[ColumnarValue::from(ScalarValue::Utf8(Some(String::from(
+ "alphabet "
+ )))),],
Ok(Some("alphabet")),
&str,
Utf8,
@@ -244,8 +242,8 @@ mod tests {
test_function!(
BTrimFunc::new(),
&[
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("t")))),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("t")))),
],
Ok(Some("alphabe")),
&str,
@@ -255,8 +253,8 @@ mod tests {
test_function!(
BTrimFunc::new(),
&[
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabe")))),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabe")))),
],
Ok(Some("t")),
&str,
@@ -266,8 +264,8 @@ mod tests {
test_function!(
BTrimFunc::new(),
&[
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
- ColumnarValue::Scalar(ScalarValue::Utf8(None)),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
+ ColumnarValue::from(ScalarValue::Utf8(None)),
],
Ok(None),
&str,
diff --git a/datafusion/functions/src/string/ltrim.rs
b/datafusion/functions/src/string/ltrim.rs
index b64dcda721..5bf6abaa8c 100644
--- a/datafusion/functions/src/string/ltrim.rs
+++ b/datafusion/functions/src/string/ltrim.rs
@@ -147,7 +147,7 @@ mod tests {
// String view cases for checking normal logic
test_function!(
LtrimFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8View(Some(
+ &[ColumnarValue::from(ScalarValue::Utf8View(Some(
String::from("alphabet ")
))),],
Ok(Some("alphabet ")),
@@ -157,7 +157,7 @@ mod tests {
);
test_function!(
LtrimFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8View(Some(
+ &[ColumnarValue::from(ScalarValue::Utf8View(Some(
String::from(" alphabet ")
))),],
Ok(Some("alphabet ")),
@@ -168,10 +168,10 @@ mod tests {
test_function!(
LtrimFunc::new(),
&[
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
"alphabet"
)))),
-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from("t")))),
+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("t")))),
],
Ok(Some("alphabet")),
&str,
@@ -181,12 +181,10 @@ mod tests {
test_function!(
LtrimFunc::new(),
&[
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
"alphabet"
)))),
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
- "alphabe"
- )))),
+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("alphabe")))),
],
Ok(Some("t")),
&str,
@@ -196,10 +194,10 @@ mod tests {
test_function!(
LtrimFunc::new(),
&[
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
"alphabet"
)))),
- ColumnarValue::Scalar(ScalarValue::Utf8View(None)),
+ ColumnarValue::from(ScalarValue::Utf8View(None)),
],
Ok(None),
&str,
@@ -210,10 +208,10 @@ mod tests {
test_function!(
LtrimFunc::new(),
&[
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
"xxxalphabetalphabet"
)))),
-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from("x")))),
+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("x")))),
],
Ok(Some("alphabetalphabet")),
&str,
@@ -223,9 +221,9 @@ mod tests {
// String cases
test_function!(
LtrimFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
- String::from("alphabet ")
- ))),],
+ &[ColumnarValue::from(ScalarValue::Utf8(Some(String::from(
+ "alphabet "
+ )))),],
Ok(Some("alphabet ")),
&str,
Utf8,
@@ -233,9 +231,9 @@ mod tests {
);
test_function!(
LtrimFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
- String::from("alphabet ")
- ))),],
+ &[ColumnarValue::from(ScalarValue::Utf8(Some(String::from(
+ "alphabet "
+ )))),],
Ok(Some("alphabet ")),
&str,
Utf8,
@@ -244,8 +242,8 @@ mod tests {
test_function!(
LtrimFunc::new(),
&[
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("t")))),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("t")))),
],
Ok(Some("alphabet")),
&str,
@@ -255,8 +253,8 @@ mod tests {
test_function!(
LtrimFunc::new(),
&[
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabe")))),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabe")))),
],
Ok(Some("t")),
&str,
@@ -266,8 +264,8 @@ mod tests {
test_function!(
LtrimFunc::new(),
&[
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
- ColumnarValue::Scalar(ScalarValue::Utf8(None)),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
+ ColumnarValue::from(ScalarValue::Utf8(None)),
],
Ok(None),
&str,
diff --git a/datafusion/functions/src/string/rtrim.rs
b/datafusion/functions/src/string/rtrim.rs
index 1a27502a20..1ba20bedf6 100644
--- a/datafusion/functions/src/string/rtrim.rs
+++ b/datafusion/functions/src/string/rtrim.rs
@@ -147,7 +147,7 @@ mod tests {
// String view cases for checking normal logic
test_function!(
RtrimFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8View(Some(
+ &[ColumnarValue::from(ScalarValue::Utf8View(Some(
String::from("alphabet ")
))),],
Ok(Some("alphabet")),
@@ -157,7 +157,7 @@ mod tests {
);
test_function!(
RtrimFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8View(Some(
+ &[ColumnarValue::from(ScalarValue::Utf8View(Some(
String::from(" alphabet ")
))),],
Ok(Some(" alphabet")),
@@ -168,10 +168,10 @@ mod tests {
test_function!(
RtrimFunc::new(),
&[
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
"alphabet"
)))),
-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from("t ")))),
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("t
")))),
],
Ok(Some("alphabe")),
&str,
@@ -181,12 +181,10 @@ mod tests {
test_function!(
RtrimFunc::new(),
&[
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
"alphabet"
)))),
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
- "alphabe"
- )))),
+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("alphabe")))),
],
Ok(Some("alphabet")),
&str,
@@ -196,10 +194,10 @@ mod tests {
test_function!(
RtrimFunc::new(),
&[
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
"alphabet"
)))),
- ColumnarValue::Scalar(ScalarValue::Utf8View(None)),
+ ColumnarValue::from(ScalarValue::Utf8View(None)),
],
Ok(None),
&str,
@@ -210,10 +208,10 @@ mod tests {
test_function!(
RtrimFunc::new(),
&[
- ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
+ ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
"alphabetalphabetxxx"
)))),
-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from("x")))),
+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("x")))),
],
Ok(Some("alphabetalphabet")),
&str,
@@ -223,9 +221,9 @@ mod tests {
// String cases
test_function!(
RtrimFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
- String::from("alphabet ")
- ))),],
+ &[ColumnarValue::from(ScalarValue::Utf8(Some(String::from(
+ "alphabet "
+ )))),],
Ok(Some("alphabet")),
&str,
Utf8,
@@ -233,9 +231,9 @@ mod tests {
);
test_function!(
RtrimFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
- String::from(" alphabet ")
- ))),],
+ &[ColumnarValue::from(ScalarValue::Utf8(Some(String::from(
+ " alphabet "
+ )))),],
Ok(Some(" alphabet")),
&str,
Utf8,
@@ -244,8 +242,8 @@ mod tests {
test_function!(
RtrimFunc::new(),
&[
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
- ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("t
")))),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
+ ColumnarValue::from(ScalarValue::Utf8(Some(String::from("t
")))),
],
Ok(Some("alphabe")),
&str,
@@ -255,8 +253,8 @@ mod tests {
test_function!(
RtrimFunc::new(),
&[
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabe")))),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabe")))),
],
Ok(Some("alphabet")),
&str,
@@ -266,8 +264,8 @@ mod tests {
test_function!(
RtrimFunc::new(),
&[
-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
- ColumnarValue::Scalar(ScalarValue::Utf8(None)),
+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
+ ColumnarValue::from(ScalarValue::Utf8(None)),
],
Ok(None),
&str,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
