Fix master (#2692)

apache · Sep 8, 2022 · 2ee09bb · 2ee09bb
1 parent 7a22ec0
commit 2ee09bb
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/arrow/src/compute/kernels/concat.rs b/arrow/src/compute/kernels/concat.rs
@@ -104,7 +104,10 @@ pub fn concat(arrays: &[&dyn Array]) -> Result<ArrayRef> {
 }
 
 /// Concatenates `batches` together into a single record batch.
-pub fn concat_batches(schema: &SchemaRef, batches: &[RecordBatch]) -> Result<RecordBatch> {
+pub fn concat_batches(
+    schema: &SchemaRef,
+    batches: &[RecordBatch],
+) -> Result<RecordBatch> {
     if batches.is_empty() {
         return Ok(RecordBatch::new_empty(schema.clone()));
     }
@@ -613,16 +616,16 @@ mod tests {
                 Arc::new(StringArray::from(vec!["a", "b"])),
             ],
         )
-            .unwrap();
+        .unwrap();
         let batch2 = RecordBatch::try_new(
             schema.clone(),
             vec![
                 Arc::new(Int32Array::from(vec![3, 4])),
                 Arc::new(StringArray::from(vec!["c", "d"])),
             ],
         )
-            .unwrap();
-        let new_batch = RecordBatch::concat(&schema, &[batch1, batch2]).unwrap();
+        .unwrap();
+        let new_batch = concat_batches(&schema, &[batch1, batch2]).unwrap();
         assert_eq!(new_batch.schema().as_ref(), schema.as_ref());
         assert_eq!(2, new_batch.num_columns());
         assert_eq!(4, new_batch.num_rows());
@@ -634,7 +637,7 @@ mod tests {
             Field::new("a", DataType::Int32, false),
             Field::new("b", DataType::Utf8, false),
         ]));
-        let batch = RecordBatch::concat(&schema, &[]).unwrap();
+        let batch = concat_batches(&schema, &[]).unwrap();
         assert_eq!(batch.schema().as_ref(), schema.as_ref());
         assert_eq!(0, batch.num_rows());
     }
@@ -656,16 +659,16 @@ mod tests {
                 Arc::new(StringArray::from(vec!["a", "b"])),
             ],
         )
-            .unwrap();
+        .unwrap();
         let batch2 = RecordBatch::try_new(
             schema2,
             vec![
                 Arc::new(Int32Array::from(vec![3, 4])),
                 Arc::new(StringArray::from(vec!["c", "d"])),
             ],
         )
-            .unwrap();
-        let error = RecordBatch::concat(&schema1, &[batch1, batch2]).unwrap_err();
+        .unwrap();
+        let error = concat_batches(&schema1, &[batch1, batch2]).unwrap_err();
         assert_eq!(
             error.to_string(),
             "Invalid argument error: batches[1] schema is different with argument schema.",