Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion arrow-flight/tests/flight_sql_client_cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ impl FlightSqlService for FlightSqlServiceImpl {
.try_collect::<Vec<_>>()
.await?;

for (left, right) in parameters[0].schema().all_fields().iter().zip(vec![
for (left, right) in parameters[0].schema().flattened_fields().iter().zip(vec![
Field::new("$1", DataType::Utf8, false),
Field::new("$2", DataType::Int64, true),
]) {
Expand Down
2 changes: 1 addition & 1 deletion arrow-ipc/src/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ impl IpcDataGenerator {
write_options: &IpcWriteOptions,
) -> Result<(Vec<EncodedData>, EncodedData), ArrowError> {
let schema = batch.schema();
let mut encoded_dictionaries = Vec::with_capacity(schema.all_fields().len());
let mut encoded_dictionaries = Vec::with_capacity(schema.flattened_fields().len());

let mut dict_id = dictionary_tracker.dict_ids.clone().into_iter();

Expand Down
2 changes: 1 addition & 1 deletion arrow-json/src/reader/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ impl ReaderBuilder {

let decoder = make_decoder(data_type, self.coerce_primitive, self.strict_mode, nullable)?;

let num_fields = self.schema.all_fields().len();
let num_fields = self.schema.flattened_fields().len();

Ok(Decoder {
decoder,
Expand Down
9 changes: 8 additions & 1 deletion arrow-schema/src/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,17 @@ impl Schema {

/// Returns a vector with references to all fields (including nested fields)
#[inline]
pub fn all_fields(&self) -> Vec<&Field> {
pub fn flattened_fields(&self) -> Vec<&Field> {
self.fields.iter().flat_map(|f| f.fields()).collect()
}

/// Returns a vector with references to all fields (including nested fields)
#[deprecated(since = "52.1.0", note = "Use `flattened_fields` instead")]
#[inline]
pub fn all_fields(&self) -> Vec<&Field> {
self.flattened_fields()
}

/// Returns an immutable reference of a specific [`Field`] instance selected using an
/// offset within the internal `fields` vector.
///
Expand Down
2 changes: 1 addition & 1 deletion parquet/src/arrow/async_reader/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1650,7 +1650,7 @@ mod tests {
#[tokio::test]
async fn test_parquet_record_batch_stream_schema() {
fn get_all_field_names(schema: &Schema) -> Vec<&String> {
schema.all_fields().iter().map(|f| f.name()).collect()
schema.flattened_fields().iter().map(|f| f.name()).collect()
}

// ParquetRecordBatchReaderBuilder::schema differs from
Expand Down