Skip to content

Commit 5ad5f7c

Browse files
IgosukiIgosuki
committed
use from_slice(&[T]) instead of from_slice(Vec<T>) to prevent future merge conflicts
1 parent 469731b commit 5ad5f7c

File tree

13 files changed

+44
-44
lines changed

13 files changed

+44
-44
lines changed

‎datafusion/benches/data_utils/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ fn create_record_batch(
123123
schema,
124124
vec![
125125
Arc::new(Utf8Array::<i32>::from_slice(keys)),
126-
Arc::new(Float32Array::from_slice(vec![i as f32; batch_size])),
126+
Arc::new(Float32Array::from_slice(&[i as f32; batch_size])),
127127
Arc::new(Float64Array::from(values)),
128128
Arc::new(UInt64Array::from(integer_values_wide)),
129129
Arc::new(UInt64Array::from_slice(integer_values_narrow)),

‎datafusion/src/datasource/file_format/parquet.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ fn summarize_min_max(
141141
if let Some(max_value) = &mut max_values[i] {
142142
if let Some(v) = stats.max_value {
143143
match max_value.update_batch(&[Arc::new(
144-
arrow::array::$ARRAY_TYPE::from_slice(vec![v]),
144+
arrow::array::$ARRAY_TYPE::from_slice(&[v]),
145145
)]) {
146146
Ok(_) => {}
147147
Err(_) => {
@@ -153,7 +153,7 @@ fn summarize_min_max(
153153
if let Some(min_value) = &mut min_values[i] {
154154
if let Some(v) = stats.min_value {
155155
match min_value.update_batch(&[Arc::new(
156-
arrow::array::$ARRAY_TYPE::from_slice(vec![v]),
156+
arrow::array::$ARRAY_TYPE::from_slice(&[v]),
157157
)]) {
158158
Ok(_) => {}
159159
Err(_) => {
@@ -180,7 +180,7 @@ fn summarize_min_max(
180180
if let Some(max_value) = &mut max_values[i] {
181181
if let Some(v) = stats.max_value {
182182
match max_value
183-
.update_batch(&[Arc::new(BooleanArray::from_slice(vec![v]))])
183+
.update_batch(&[Arc::new(BooleanArray::from_slice(&[v]))])
184184
{
185185
Ok(_) => {}
186186
Err(_) => {
@@ -192,7 +192,7 @@ fn summarize_min_max(
192192
if let Some(min_value) = &mut min_values[i] {
193193
if let Some(v) = stats.min_value {
194194
match min_value
195-
.update_batch(&[Arc::new(BooleanArray::from_slice(vec![v]))])
195+
.update_batch(&[Arc::new(BooleanArray::from_slice(&[v]))])
196196
{
197197
Ok(_) => {}
198198
Err(_) => {

‎datafusion/src/execution/context.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3681,8 +3681,8 @@ mod tests {
36813681
};
36823682

36833683
// create mock record batch
3684-
let ids = Arc::new(Int32Array::from_slice(vec![i as i32]));
3685-
let names = Arc::new(Utf8Array::<i32>::from_slice(vec!["test"]));
3684+
let ids = Arc::new(Int32Array::from_slice(&[i as i32]));
3685+
let names = Arc::new(Utf8Array::<i32>::from_slice(&["test"]));
36863686
let schema_ref = schema.as_ref();
36873687
let parquet_schema = to_parquet_schema(schema_ref).unwrap();
36883688
let iter = vec![Ok(Chunk::new(vec![ids as ArrayRef, names as ArrayRef]))];

‎datafusion/src/physical_plan/expressions/array_agg.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ mod tests {
168168

169169
#[test]
170170
fn array_agg_i32() -> Result<()> {
171-
let a: ArrayRef = Arc::new(Int32Array::from_slice(vec![1, 2, 3, 4, 5]));
171+
let a: ArrayRef = Arc::new(Int32Array::from_slice(&[1, 2, 3, 4, 5]));
172172

173173
let list = ScalarValue::List(
174174
Some(Box::new(vec![

‎datafusion/src/physical_plan/expressions/correlation.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,10 @@ mod tests {
284284

285285
#[test]
286286
fn correlation_f64_6() -> Result<()> {
287-
let a = Arc::new(Float64Array::from_slice(vec![
287+
let a = Arc::new(Float64Array::from_slice(&[
288288
1_f64, 2_f64, 3_f64, 1.1_f64, 2.2_f64, 3.3_f64,
289289
]));
290-
let b = Arc::new(Float64Array::from_slice(vec![
290+
let b = Arc::new(Float64Array::from_slice(&[
291291
4_f64, 5_f64, 6_f64, 4.4_f64, 5.5_f64, 6.6_f64,
292292
]));
293293

‎datafusion/src/physical_plan/expressions/covariance.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,10 +468,10 @@ mod tests {
468468

469469
#[test]
470470
fn covariance_f64_6() -> Result<()> {
471-
let a = Arc::new(Float64Array::from_slice(vec![
471+
let a = Arc::new(Float64Array::from_slice(&[
472472
1_f64, 2_f64, 3_f64, 1.1_f64, 2.2_f64, 3.3_f64,
473473
]));
474-
let b = Arc::new(Float64Array::from_slice(vec![
474+
let b = Arc::new(Float64Array::from_slice(&[
475475
4_f64, 5_f64, 6_f64, 4.4_f64, 5.5_f64, 6.6_f64,
476476
]));
477477

‎datafusion/src/physical_plan/expressions/distinct_expressions.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,7 @@ mod tests {
878878

879879
#[test]
880880
fn distinct_array_agg_i32() -> Result<()> {
881-
let col: ArrayRef = Arc::new(Int32Array::from_slice(vec![1, 2, 7, 4, 5, 2]));
881+
let col: ArrayRef = Arc::new(Int32Array::from_slice(&[1, 2, 7, 4, 5, 2]));
882882

883883
let out = ScalarValue::List(
884884
Some(Box::new(vec![

‎datafusion/src/physical_plan/expressions/stddev.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ mod tests {
260260

261261
#[test]
262262
fn stddev_f64_1() -> Result<()> {
263-
let a: ArrayRef = Arc::new(Float64Array::from_slice(vec![1_f64, 2_f64]));
263+
let a: ArrayRef = Arc::new(Float64Array::from_slice(&[1_f64, 2_f64]));
264264
generic_test_op!(
265265
a,
266266
DataType::Float64,
@@ -272,7 +272,7 @@ mod tests {
272272

273273
#[test]
274274
fn stddev_f64_2() -> Result<()> {
275-
let a: ArrayRef = Arc::new(Float64Array::from_slice(vec![1.1_f64, 2_f64, 3_f64]));
275+
let a: ArrayRef = Arc::new(Float64Array::from_slice(&[1.1_f64, 2_f64, 3_f64]));
276276
generic_test_op!(
277277
a,
278278
DataType::Float64,
@@ -284,7 +284,7 @@ mod tests {
284284

285285
#[test]
286286
fn stddev_f64_3() -> Result<()> {
287-
let a: ArrayRef = Arc::new(Float64Array::from_slice(vec![
287+
let a: ArrayRef = Arc::new(Float64Array::from_slice(&[
288288
1_f64, 2_f64, 3_f64, 4_f64, 5_f64,
289289
]));
290290
generic_test_op!(
@@ -298,7 +298,7 @@ mod tests {
298298

299299
#[test]
300300
fn stddev_f64_4() -> Result<()> {
301-
let a: ArrayRef = Arc::new(Float64Array::from_slice(vec![1.1_f64, 2_f64, 3_f64]));
301+
let a: ArrayRef = Arc::new(Float64Array::from_slice(&[1.1_f64, 2_f64, 3_f64]));
302302
generic_test_op!(
303303
a,
304304
DataType::Float64,
@@ -310,7 +310,7 @@ mod tests {
310310

311311
#[test]
312312
fn stddev_i32() -> Result<()> {
313-
let a: ArrayRef = Arc::new(Int32Array::from_slice(vec![1, 2, 3, 4, 5]));
313+
let a: ArrayRef = Arc::new(Int32Array::from_slice(&[1, 2, 3, 4, 5]));
314314
generic_test_op!(
315315
a,
316316
DataType::Int32,
@@ -322,7 +322,7 @@ mod tests {
322322

323323
#[test]
324324
fn stddev_u32() -> Result<()> {
325-
let a: ArrayRef = Arc::new(UInt32Array::from_slice(vec![
325+
let a: ArrayRef = Arc::new(UInt32Array::from_slice(&[
326326
1_u32, 2_u32, 3_u32, 4_u32, 5_u32,
327327
]));
328328
generic_test_op!(
@@ -336,7 +336,7 @@ mod tests {
336336

337337
#[test]
338338
fn stddev_f32() -> Result<()> {
339-
let a: ArrayRef = Arc::new(Float32Array::from_slice(vec![
339+
let a: ArrayRef = Arc::new(Float32Array::from_slice(&[
340340
1_f32, 2_f32, 3_f32, 4_f32, 5_f32,
341341
]));
342342
generic_test_op!(
@@ -361,7 +361,7 @@ mod tests {
361361

362362
#[test]
363363
fn test_stddev_1_input() -> Result<()> {
364-
let a: ArrayRef = Arc::new(Float64Array::from_slice(vec![1_f64]));
364+
let a: ArrayRef = Arc::new(Float64Array::from_slice(&[1_f64]));
365365
let schema = Schema::new(vec![Field::new("a", DataType::Float64, false)]);
366366
let batch = RecordBatch::try_new(Arc::new(schema.clone()), vec![a])?;
367367

‎datafusion/src/physical_plan/expressions/variance.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ mod tests {
345345

346346
#[test]
347347
fn variance_f64_1() -> Result<()> {
348-
let a: ArrayRef = Arc::new(Float64Array::from_slice(vec![1_f64, 2_f64]));
348+
let a: ArrayRef = Arc::new(Float64Array::from_slice(&[1_f64, 2_f64]));
349349
generic_test_op!(
350350
a,
351351
DataType::Float64,
@@ -357,7 +357,7 @@ mod tests {
357357

358358
#[test]
359359
fn variance_f64_2() -> Result<()> {
360-
let a: ArrayRef = Arc::new(Float64Array::from_slice(vec![
360+
let a: ArrayRef = Arc::new(Float64Array::from_slice(&[
361361
1_f64, 2_f64, 3_f64, 4_f64, 5_f64,
362362
]));
363363
generic_test_op!(
@@ -371,7 +371,7 @@ mod tests {
371371

372372
#[test]
373373
fn variance_f64_3() -> Result<()> {
374-
let a: ArrayRef = Arc::new(Float64Array::from_slice(vec![
374+
let a: ArrayRef = Arc::new(Float64Array::from_slice(&[
375375
1_f64, 2_f64, 3_f64, 4_f64, 5_f64,
376376
]));
377377
generic_test_op!(
@@ -385,7 +385,7 @@ mod tests {
385385

386386
#[test]
387387
fn variance_f64_4() -> Result<()> {
388-
let a: ArrayRef = Arc::new(Float64Array::from_slice(vec![1.1_f64, 2_f64, 3_f64]));
388+
let a: ArrayRef = Arc::new(Float64Array::from_slice(&[1.1_f64, 2_f64, 3_f64]));
389389
generic_test_op!(
390390
a,
391391
DataType::Float64,
@@ -397,7 +397,7 @@ mod tests {
397397

398398
#[test]
399399
fn variance_i32() -> Result<()> {
400-
let a: ArrayRef = Arc::new(Int32Array::from_slice(vec![1, 2, 3, 4, 5]));
400+
let a: ArrayRef = Arc::new(Int32Array::from_slice(&[1, 2, 3, 4, 5]));
401401
generic_test_op!(
402402
a,
403403
DataType::Int32,
@@ -409,7 +409,7 @@ mod tests {
409409

410410
#[test]
411411
fn variance_u32() -> Result<()> {
412-
let a: ArrayRef = Arc::new(UInt32Array::from_slice(vec![
412+
let a: ArrayRef = Arc::new(UInt32Array::from_slice(&[
413413
1_u32, 2_u32, 3_u32, 4_u32, 5_u32,
414414
]));
415415
generic_test_op!(
@@ -424,7 +424,7 @@ mod tests {
424424
#[test]
425425
fn variance_f32() -> Result<()> {
426426
let a: ArrayRef =
427-
Float32Vec::from_slice(vec![1_f32, 2_f32, 3_f32, 4_f32, 5_f32]).as_arc();
427+
Float32Vec::from_slice(&[1_f32, 2_f32, 3_f32, 4_f32, 5_f32]).as_arc();
428428
generic_test_op!(
429429
a,
430430
DataType::Float32,
@@ -447,7 +447,7 @@ mod tests {
447447

448448
#[test]
449449
fn test_variance_1_input() -> Result<()> {
450-
let a: ArrayRef = Arc::new(Float64Array::from_slice(vec![1_f64]));
450+
let a: ArrayRef = Arc::new(Float64Array::from_slice(&[1_f64]));
451451
let schema = Schema::new(vec![Field::new("a", DataType::Float64, false)]);
452452
let batch = RecordBatch::try_new(Arc::new(schema.clone()), vec![a])?;
453453

‎datafusion/src/physical_plan/regex_expressions.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ mod tests {
302302
]);
303303

304304
let patterns = Utf8Array::<i32>::from_slice(&vec![r"x.*-(\d*)-.*"; 4]);
305-
let flags = Utf8Array::<i32>::from_slice(vec!["i"; 4]);
305+
let flags = Utf8Array::<i32>::from_slice(&["i"; 4]);
306306

307307
let result = regexp_matches(&array, &patterns, Some(&flags))?;
308308

@@ -317,9 +317,9 @@ mod tests {
317317

318318
#[test]
319319
fn test_case_sensitive_regexp_match() {
320-
let values = StringArray::from_slice(vec!["abc"; 5]);
320+
let values = StringArray::from_slice(&["abc"; 5]);
321321
let patterns =
322-
StringArray::from_slice(vec!["^(a)", "^(A)", "(b|d)", "(B|D)", "^(b|c)"]);
322+
StringArray::from_slice(&["^(a)", "^(A)", "(b|d)", "(B|D)", "^(b|c)"]);
323323
let expected = vec![
324324
Some(vec![Some("a")]),
325325
None,
@@ -337,10 +337,10 @@ mod tests {
337337

338338
#[test]
339339
fn test_case_insensitive_regexp_match() {
340-
let values = StringArray::from_slice(vec!["abc"; 5]);
340+
let values = StringArray::from_slice(&["abc"; 5]);
341341
let patterns =
342-
StringArray::from_slice(vec!["^(a)", "^(A)", "(b|d)", "(B|D)", "^(b|c)"]);
343-
let flags = StringArray::from_slice(vec!["i"; 5]);
342+
StringArray::from_slice(&["^(a)", "^(A)", "(b|d)", "(B|D)", "^(b|c)"]);
343+
let flags = StringArray::from_slice(&["i"; 5]);
344344

345345
let expected = vec![
346346
Some(vec![Some("a")]),

0 commit comments

Comments
 (0)