Skip to content

Commit 134262b

Browse files
committed
Use upstream StatisticsConveter
1 parent 7e7a0f9 commit 134262b

File tree

10 files changed

+48
-5129
lines changed

10 files changed

+48
-5129
lines changed

datafusion-examples/examples/parquet_index.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@ use arrow::util::pretty::pretty_format_batches;
2424
use arrow_schema::SchemaRef;
2525
use async_trait::async_trait;
2626
use datafusion::datasource::listing::PartitionedFile;
27-
use datafusion::datasource::physical_plan::{
28-
parquet::StatisticsConverter,
29-
{FileScanConfig, ParquetExec},
30-
};
27+
use datafusion::datasource::physical_plan::{FileScanConfig, ParquetExec};
3128
use datafusion::datasource::TableProvider;
3229
use datafusion::execution::context::SessionState;
3330
use datafusion::execution::object_store::ObjectStoreUrl;
31+
use datafusion::parquet::arrow::arrow_reader::statistics::StatisticsConverter;
3432
use datafusion::parquet::arrow::{
3533
arrow_reader::ParquetRecordBatchReaderBuilder, ArrowWriter,
3634
};

datafusion/core/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,3 @@ name = "sort"
212212
[[bench]]
213213
harness = false
214214
name = "topk_aggregate"
215-
216-
[[bench]]
217-
harness = false
218-
name = "parquet_statistic"

datafusion/core/benches/parquet_statistic.rs

Lines changed: 0 additions & 287 deletions
This file was deleted.

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,11 @@ use tokio::io::{AsyncWrite, AsyncWriteExt};
7575
use tokio::sync::mpsc::{self, Receiver, Sender};
7676
use tokio::task::JoinSet;
7777

78-
use crate::datasource::physical_plan::parquet::{
79-
ParquetExecBuilder, StatisticsConverter,
80-
};
78+
use crate::datasource::physical_plan::parquet::ParquetExecBuilder;
8179
use futures::{StreamExt, TryStreamExt};
8280
use object_store::path::Path;
8381
use object_store::{ObjectMeta, ObjectStore};
82+
use parquet::arrow::arrow_reader::statistics::StatisticsConverter;
8483

8584
/// Initial writing buffer size. Note this is just a size hint for efficiency. It
8685
/// will grow beyond the set value if needed.
@@ -1310,7 +1309,7 @@ mod tests {
13101309
.map(|i| i.to_string())
13111310
.collect();
13121311
let coll: Vec<_> = schema
1313-
.all_fields()
1312+
.flattened_fields()
13141313
.into_iter()
13151314
.map(|i| i.name().to_string())
13161315
.collect();

datafusion/core/src/datasource/physical_plan/parquet/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ mod page_filter;
5454
mod reader;
5555
mod row_filter;
5656
mod row_groups;
57-
mod statistics;
5857
mod writer;
5958

6059
use crate::datasource::schema_adapter::{
@@ -64,7 +63,6 @@ pub use access_plan::{ParquetAccessPlan, RowGroupAccess};
6463
pub use metrics::ParquetFileMetrics;
6564
use opener::ParquetOpener;
6665
pub use reader::{DefaultParquetFileReaderFactory, ParquetFileReaderFactory};
67-
pub use statistics::StatisticsConverter;
6866
pub use writer::plan_to_parquet;
6967

7068
/// Execution plan for reading one or more Parquet files.

0 commit comments

Comments
 (0)