From cb30be71beba66ed9b9ae0920076c665482f1fae Mon Sep 17 00:00:00 2001 From: wiedld Date: Mon, 9 Sep 2024 09:06:50 -0700 Subject: [PATCH] test(12123): update tests to pass now that latest arrow-rs release is in --- .../core/src/datasource/file_format/parquet.rs | 4 +--- .../src/datasource/physical_plan/parquet/mod.rs | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/datafusion/core/src/datasource/file_format/parquet.rs b/datafusion/core/src/datasource/file_format/parquet.rs index 55008cdb3275f..2a862dd6dcb37 100644 --- a/datafusion/core/src/datasource/file_format/parquet.rs +++ b/datafusion/core/src/datasource/file_format/parquet.rs @@ -1718,9 +1718,7 @@ mod tests { async fn test_statistics_from_parquet_metadata() -> Result<()> { _run_test_statistics_from_parquet_metadata(ForceViews::No).await?; - // Proved that this test will pass once the next arrow release occurs. - // Refer to https://github.com/influxdata/arrow-datafusion/pull/37 - // _run_test_statistics_from_parquet_metadata(true).await?; + _run_test_statistics_from_parquet_metadata(ForceViews::Yes).await?; Ok(()) } diff --git a/datafusion/core/src/datasource/physical_plan/parquet/mod.rs b/datafusion/core/src/datasource/physical_plan/parquet/mod.rs index e48ed7be45dff..54d4d7262a8e6 100644 --- a/datafusion/core/src/datasource/physical_plan/parquet/mod.rs +++ b/datafusion/core/src/datasource/physical_plan/parquet/mod.rs @@ -2091,11 +2091,8 @@ mod tests { Ok(()) } - /// parquet's get_data_page_statistics is not yet implemented - /// for view types. - #[should_panic(expected = "not implemented")] #[tokio::test] - async fn test_struct_filter_parquet_with_view_types() { + async fn test_struct_filter_parquet_with_view_types() -> Result<()> { let tmp_dir = TempDir::new().unwrap(); let path = tmp_dir.path().to_str().unwrap().to_string() + "/test.parquet"; write_file(&path); @@ -2111,7 +2108,17 @@ mod tests { .await .unwrap(); let sql = "select * from base_table where name='test02'"; - let _ = ctx.sql(sql).await.unwrap().collect().await.unwrap(); + let batch = ctx.sql(sql).await.unwrap().collect().await.unwrap(); + assert_eq!(batch.len(), 1); + let expected = [ + "+---------------------+----+--------+", + "| struct | id | name |", + "+---------------------+----+--------+", + "| {id: 4, name: aaa2} | 2 | test02 |", + "+---------------------+----+--------+", + ]; + crate::assert_batches_eq!(expected, &batch); + Ok(()) } fn write_file(file: &String) {