Skip to content

Commit 47941f0

Browse files
notfilipponotfilippo
authored
[logical-types] fix conflicts (#12820)
1 parent f475a0f commit 47941f0

File tree

4 files changed

+69
-74
lines changed

4 files changed

+69
-74
lines changed

‎datafusion/functions/benches/encoding.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ extern crate criterion;
1919

2020
use arrow::util::bench_util::create_string_array_with_len;
2121
use criterion::{black_box, criterion_group, criterion_main, Criterion};
22+
use datafusion_common::ScalarValue;
2223
use datafusion_expr::ColumnarValue;
2324
use datafusion_functions::encoding;
2425
use std::sync::Arc;
@@ -28,7 +29,7 @@ fn criterion_benchmark(c: &mut Criterion) {
2829
for size in [1024, 4096, 8192] {
2930
let str_array = Arc::new(create_string_array_with_len::<i32>(size, 0.2, 32));
3031
c.bench_function(&format!("base64_decode/{size}"), |b| {
31-
let method = ColumnarValue::Scalar("base64".into());
32+
let method = ColumnarValue::from(ScalarValue::from("base64"));
3233
let encoded = encoding::encode()
3334
.invoke(&[ColumnarValue::Array(str_array.clone()), method.clone()])
3435
.unwrap();
@@ -38,7 +39,7 @@ fn criterion_benchmark(c: &mut Criterion) {
3839
});
3940

4041
c.bench_function(&format!("hex_decode/{size}"), |b| {
41-
let method = ColumnarValue::Scalar("hex".into());
42+
let method = ColumnarValue::from(ScalarValue::from("hex"));
4243
let encoded = encoding::encode()
4344
.invoke(&[ColumnarValue::Array(str_array.clone()), method.clone()])
4445
.unwrap();

‎datafusion/functions/src/string/btrim.rs

+22-24
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ mod tests {
147147
// String view cases for checking normal logic
148148
test_function!(
149149
BTrimFunc::new(),
150-
&[ColumnarValue::Scalar(ScalarValue::Utf8View(Some(
150+
&[ColumnarValue::from(ScalarValue::Utf8View(Some(
151151
String::from("alphabet ")
152152
))),],
153153
Ok(Some("alphabet")),
@@ -157,7 +157,7 @@ mod tests {
157157
);
158158
test_function!(
159159
BTrimFunc::new(),
160-
&[ColumnarValue::Scalar(ScalarValue::Utf8View(Some(
160+
&[ColumnarValue::from(ScalarValue::Utf8View(Some(
161161
String::from(" alphabet ")
162162
))),],
163163
Ok(Some("alphabet")),
@@ -168,10 +168,10 @@ mod tests {
168168
test_function!(
169169
BTrimFunc::new(),
170170
&[
171-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
171+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
172172
"alphabet"
173173
)))),
174-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from("t")))),
174+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("t")))),
175175
],
176176
Ok(Some("alphabe")),
177177
&str,
@@ -181,12 +181,10 @@ mod tests {
181181
test_function!(
182182
BTrimFunc::new(),
183183
&[
184-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
184+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
185185
"alphabet"
186186
)))),
187-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
188-
"alphabe"
189-
)))),
187+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("alphabe")))),
190188
],
191189
Ok(Some("t")),
192190
&str,
@@ -196,10 +194,10 @@ mod tests {
196194
test_function!(
197195
BTrimFunc::new(),
198196
&[
199-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
197+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
200198
"alphabet"
201199
)))),
202-
ColumnarValue::Scalar(ScalarValue::Utf8View(None)),
200+
ColumnarValue::from(ScalarValue::Utf8View(None)),
203201
],
204202
Ok(None),
205203
&str,
@@ -210,10 +208,10 @@ mod tests {
210208
test_function!(
211209
BTrimFunc::new(),
212210
&[
213-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
211+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
214212
"xxxalphabetalphabetxxx"
215213
)))),
216-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from("x")))),
214+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("x")))),
217215
],
218216
Ok(Some("alphabetalphabet")),
219217
&str,
@@ -223,19 +221,19 @@ mod tests {
223221
// String cases
224222
test_function!(
225223
BTrimFunc::new(),
226-
&[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
227-
String::from("alphabet ")
228-
))),],
224+
&[ColumnarValue::from(ScalarValue::Utf8(Some(String::from(
225+
"alphabet "
226+
)))),],
229227
Ok(Some("alphabet")),
230228
&str,
231229
Utf8,
232230
StringArray
233231
);
234232
test_function!(
235233
BTrimFunc::new(),
236-
&[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
237-
String::from("alphabet ")
238-
))),],
234+
&[ColumnarValue::from(ScalarValue::Utf8(Some(String::from(
235+
"alphabet "
236+
)))),],
239237
Ok(Some("alphabet")),
240238
&str,
241239
Utf8,
@@ -244,8 +242,8 @@ mod tests {
244242
test_function!(
245243
BTrimFunc::new(),
246244
&[
247-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
248-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("t")))),
245+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
246+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("t")))),
249247
],
250248
Ok(Some("alphabe")),
251249
&str,
@@ -255,8 +253,8 @@ mod tests {
255253
test_function!(
256254
BTrimFunc::new(),
257255
&[
258-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
259-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabe")))),
256+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
257+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabe")))),
260258
],
261259
Ok(Some("t")),
262260
&str,
@@ -266,8 +264,8 @@ mod tests {
266264
test_function!(
267265
BTrimFunc::new(),
268266
&[
269-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
270-
ColumnarValue::Scalar(ScalarValue::Utf8(None)),
267+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
268+
ColumnarValue::from(ScalarValue::Utf8(None)),
271269
],
272270
Ok(None),
273271
&str,

‎datafusion/functions/src/string/ltrim.rs

+22-24
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ mod tests {
147147
// String view cases for checking normal logic
148148
test_function!(
149149
LtrimFunc::new(),
150-
&[ColumnarValue::Scalar(ScalarValue::Utf8View(Some(
150+
&[ColumnarValue::from(ScalarValue::Utf8View(Some(
151151
String::from("alphabet ")
152152
))),],
153153
Ok(Some("alphabet ")),
@@ -157,7 +157,7 @@ mod tests {
157157
);
158158
test_function!(
159159
LtrimFunc::new(),
160-
&[ColumnarValue::Scalar(ScalarValue::Utf8View(Some(
160+
&[ColumnarValue::from(ScalarValue::Utf8View(Some(
161161
String::from(" alphabet ")
162162
))),],
163163
Ok(Some("alphabet ")),
@@ -168,10 +168,10 @@ mod tests {
168168
test_function!(
169169
LtrimFunc::new(),
170170
&[
171-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
171+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
172172
"alphabet"
173173
)))),
174-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from("t")))),
174+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("t")))),
175175
],
176176
Ok(Some("alphabet")),
177177
&str,
@@ -181,12 +181,10 @@ mod tests {
181181
test_function!(
182182
LtrimFunc::new(),
183183
&[
184-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
184+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
185185
"alphabet"
186186
)))),
187-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
188-
"alphabe"
189-
)))),
187+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("alphabe")))),
190188
],
191189
Ok(Some("t")),
192190
&str,
@@ -196,10 +194,10 @@ mod tests {
196194
test_function!(
197195
LtrimFunc::new(),
198196
&[
199-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
197+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
200198
"alphabet"
201199
)))),
202-
ColumnarValue::Scalar(ScalarValue::Utf8View(None)),
200+
ColumnarValue::from(ScalarValue::Utf8View(None)),
203201
],
204202
Ok(None),
205203
&str,
@@ -210,10 +208,10 @@ mod tests {
210208
test_function!(
211209
LtrimFunc::new(),
212210
&[
213-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from(
211+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from(
214212
"xxxalphabetalphabet"
215213
)))),
216-
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from("x")))),
214+
ColumnarValue::from(ScalarValue::Utf8View(Some(String::from("x")))),
217215
],
218216
Ok(Some("alphabetalphabet")),
219217
&str,
@@ -223,19 +221,19 @@ mod tests {
223221
// String cases
224222
test_function!(
225223
LtrimFunc::new(),
226-
&[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
227-
String::from("alphabet ")
228-
))),],
224+
&[ColumnarValue::from(ScalarValue::Utf8(Some(String::from(
225+
"alphabet "
226+
)))),],
229227
Ok(Some("alphabet ")),
230228
&str,
231229
Utf8,
232230
StringArray
233231
);
234232
test_function!(
235233
LtrimFunc::new(),
236-
&[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
237-
String::from("alphabet ")
238-
))),],
234+
&[ColumnarValue::from(ScalarValue::Utf8(Some(String::from(
235+
"alphabet "
236+
)))),],
239237
Ok(Some("alphabet ")),
240238
&str,
241239
Utf8,
@@ -244,8 +242,8 @@ mod tests {
244242
test_function!(
245243
LtrimFunc::new(),
246244
&[
247-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
248-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("t")))),
245+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
246+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("t")))),
249247
],
250248
Ok(Some("alphabet")),
251249
&str,
@@ -255,8 +253,8 @@ mod tests {
255253
test_function!(
256254
LtrimFunc::new(),
257255
&[
258-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
259-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabe")))),
256+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
257+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabe")))),
260258
],
261259
Ok(Some("t")),
262260
&str,
@@ -266,8 +264,8 @@ mod tests {
266264
test_function!(
267265
LtrimFunc::new(),
268266
&[
269-
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("alphabet")))),
270-
ColumnarValue::Scalar(ScalarValue::Utf8(None)),
267+
ColumnarValue::from(ScalarValue::Utf8(Some(String::from("alphabet")))),
268+
ColumnarValue::from(ScalarValue::Utf8(None)),
271269
],
272270
Ok(None),
273271
&str,

0 commit comments

Comments
 (0)