Skip to content

chore: rmreplace_columns, unused code #1251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 24, 2025
Merged

chore: rmreplace_columns, unused code #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42b1e46
refactor: `replace_columns`
Mar 18, 2025
367a5a6
test: `replace_columns`
Mar 18, 2025
1c0e509
Merge remote-tracking branch 'origin/main' into reflect
Mar 21, 2025
8db8338
Merge branch 'main' into reflect
Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/event/format/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ pub trait EventFormat: Sized {
update_field_type_in_schema(new_schema, None, time_partition, None, schema_version);

let rb = Self::decode(data, new_schema.clone())?;

let rb = add_parseable_fields(rb, p_timestamp, p_custom_fields)?;

Ok((rb, is_first))
Expand Down
85 changes: 3 additions & 82 deletions src/utils/arrow/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,37 +17,12 @@
*
*/

//! example function for concat recordbatch(may not work)
//! ```rust
//! # use arrow::record_batch::RecordBatch;
//! # use arrow::error::Result;
//!
//! fn concat_batches(batch1: RecordBatch, batch2: RecordBatch) -> Result<RecordBatch> {
//! let schema = batch1.schema();
//! let columns = schema
//! .fields()
//! .iter()
//! .enumerate()
//! .map(|(i, _)| -> Result<_> {
//! let array1 = batch1.column(i);
//! let array2 = batch2.column(i);
//! let array = arrow::compute::concat(&[array1.as_ref(), array2.as_ref()])?;
//! Ok(array)
//! })
//! .collect::<Result<Vec<_>>>()?;
//!
//! RecordBatch::try_new(schema.clone(), columns)
//! }
//! ```

use std::{
collections::{HashMap, HashSet},
sync::Arc,
};

use arrow_array::{
Array, ArrayRef, RecordBatch, StringArray, TimestampMillisecondArray, UInt64Array,
};
use arrow_array::{ArrayRef, RecordBatch, StringArray, TimestampMillisecondArray, UInt64Array};
use arrow_schema::{ArrowError, DataType, Field, Schema, TimeUnit};
use arrow_select::take::take;
use chrono::{DateTime, Utc};
Expand All @@ -62,31 +37,6 @@ use serde_json::{Map, Value};

use crate::event::DEFAULT_TIMESTAMP_KEY;

/// Replaces columns in a record batch with new arrays.
///
/// # Arguments
///
/// * `schema` - The schema of the record batch.
/// * `batch` - The record batch to modify.
/// * `indexes` - The indexes of the columns to replace.
/// * `arrays` - The new arrays to replace the columns with.
///
/// # Returns
///
/// The modified record batch with the columns replaced.
pub fn replace_columns(
schema: Arc<Schema>,
batch: &RecordBatch,
indexes: &[usize],
arrays: &[Arc<dyn Array + 'static>],
) -> RecordBatch {
let mut batch_arrays = batch.columns().iter().map(Arc::clone).collect_vec();
for (&index, arr) in indexes.iter().zip(arrays.iter()) {
batch_arrays[index] = Arc::clone(arr);
}
RecordBatch::try_new(schema, batch_arrays).unwrap()
}

/// Converts a slice of record batches to JSON.
///
/// # Arguments
Expand Down Expand Up @@ -213,40 +163,11 @@ pub fn reverse(rb: &RecordBatch) -> RecordBatch {
mod tests {
use std::sync::Arc;

use arrow_array::{Array, Int32Array, RecordBatch};
use arrow_schema::{DataType, Field, Schema};
use arrow_array::RecordBatch;
use arrow_schema::Schema;

use super::*;

#[test]
fn check_replace() {
let schema = Schema::new(vec![
Field::new("a", DataType::Int32, false),
Field::new("b", DataType::Int32, false),
Field::new("c", DataType::Int32, false),
]);

let schema_ref = Arc::new(schema);

let rb = RecordBatch::try_new(
schema_ref.clone(),
vec![
Arc::new(Int32Array::from_value(0, 3)),
Arc::new(Int32Array::from_value(0, 3)),
Arc::new(Int32Array::from_value(0, 3)),
],
)
.unwrap();

let arr: Arc<dyn Array + 'static> = Arc::new(Int32Array::from_value(0, 3));

let new_rb = replace_columns(schema_ref.clone(), &rb, &[2], &[arr]);

assert_eq!(new_rb.schema(), schema_ref);
assert_eq!(new_rb.num_columns(), 3);
assert_eq!(new_rb.num_rows(), 3)
}

#[test]
fn check_empty_json_to_record_batches() {
let r = RecordBatch::new_empty(Arc::new(Schema::empty()));
Expand Down
Loading