This is an automated email from the ASF dual-hosted git repository.

etseidl pushed a commit to branch gh5854_thrift_remodel
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git

commit 959677533878529a1790c3b9477848fa16a1fb73
Merge: 64a59c3bff d9a4b39815
Author: Ed Seidl <[email protected]>
AuthorDate: Mon Sep 8 16:16:26 2025 -0700

    Merge remote-tracking branch 'origin/main' into gh5854_thrift_remodel

 .github/workflows/integration.yml                  |    6 +
 .github/workflows/parquet.yml                      |    4 +-
 Cargo.toml                                         |    2 +-
 arrow-avro/Cargo.toml                              |    1 +
 arrow-avro/src/codec.rs                            |  418 +++--
 arrow-avro/src/reader/mod.rs                       |  235 ++-
 arrow-avro/src/reader/record.rs                    |  533 +++++--
 arrow-avro/src/schema.rs                           |  244 ++-
 arrow-avro/src/writer/encoder.rs                   |  777 ++++++++--
 arrow-avro/src/writer/format.rs                    |   22 +-
 arrow-avro/src/writer/mod.rs                       |  177 ++-
 arrow-avro/test/data/README.md                     |  147 ++
 arrow-avro/test/data/fixed256_decimal.avro         |  Bin 0 -> 1043 bytes
 .../test/data/fixed_length_decimal_legacy_32.avro  |  Bin 0 -> 378 bytes
 arrow-avro/test/data/int128_decimal.avro           |  Bin 0 -> 306 bytes
 arrow-avro/test/data/int256_decimal.avro           |  Bin 0 -> 380 bytes
 arrow-csv/src/writer.rs                            |    2 +-
 arrow-flight/src/bin/flight_sql_client.rs          |   14 +-
 parquet-variant-compute/src/cast_to_variant.rs     | 1639 ++++++++++----------
 parquet-variant-compute/src/variant_array.rs       |  341 +++-
 parquet-variant-compute/src/variant_get/mod.rs     | 1281 ++++++++++++++-
 .../src/variant_get/output/mod.rs                  |   83 +-
 .../src/variant_get/output/row_builder.rs          |  342 ++++
 parquet-variant/src/path.rs                        |   10 +-
 parquet-variant/src/variant.rs                     |  160 ++
 parquet/Cargo.toml                                 |    8 +-
 parquet/README.md                                  |    2 +
 parquet/src/arrow/async_writer/mod.rs              |   65 +-
 parquet/src/column/writer/mod.rs                   |   48 +-
 parquet/src/lib.rs                                 |   11 +
 parquet/src/variant.rs                             |  115 ++
 ...riant_integration.rs => variant_integration.rs} |    0
 32 files changed, 5136 insertions(+), 1551 deletions(-)

diff --cc parquet/src/arrow/async_writer/mod.rs
index d9133801a1,4547f71274..09c0fc60d2
--- a/parquet/src/arrow/async_writer/mod.rs
+++ b/parquet/src/arrow/async_writer/mod.rs
@@@ -61,12 -61,11 +61,13 @@@ mod store
  pub use store::*;
  
  use crate::{
-     arrow::{arrow_writer::ArrowWriterOptions, ArrowWriter},
+     arrow::arrow_writer::{ArrowColumnChunk, ArrowColumnWriter, 
ArrowWriterOptions},
+     arrow::ArrowWriter,
      errors::{ParquetError, Result},
 -    file::{metadata::RowGroupMetaData, properties::WriterProperties},
 -    format::{FileMetaData, KeyValue},
 +    file::{
 +        metadata::{KeyValue, RowGroupMetaData},
 +        properties::WriterProperties,
 +    },
  };
  use arrow_array::RecordBatch;
  use arrow_schema::SchemaRef;
diff --cc parquet/src/lib.rs
index 74182d2650,1142a1c4a0..1ba731cb43
--- a/parquet/src/lib.rs
+++ b/parquet/src/lib.rs
@@@ -178,6 -186,7 +186,9 @@@ pub mod file
  pub mod record;
  pub mod schema;
  
 +mod parquet_macros;
 +mod parquet_thrift;
  pub mod thrift;
+ 
+ #[cfg(feature = "variant_experimental")]
+ pub mod variant;

Reply via email to