From 7b59970c2b7825f9fa9e3b85863748076231786e Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 7 Oct 2021 10:57:18 -0400 Subject: [PATCH] ARROW-14247: [C++] Fix Valgrind errors in parquet-arrow-test --- cpp/src/parquet/arrow/arrow_schema_test.cc | 2 +- cpp/src/parquet/arrow/arrow_statistics_test.cc | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cpp/src/parquet/arrow/arrow_schema_test.cc b/cpp/src/parquet/arrow/arrow_schema_test.cc index 880eba7a1bc..99ce0c962f7 100644 --- a/cpp/src/parquet/arrow/arrow_schema_test.cc +++ b/cpp/src/parquet/arrow/arrow_schema_test.cc @@ -1338,7 +1338,7 @@ TEST(TestFromParquetSchema, CorruptMetadata) { ::arrow::Result> RootToTreeLeafLevels( const SchemaManifest& manifest, int column_number) { std::deque out; - const SchemaField* field; + const SchemaField* field = nullptr; RETURN_NOT_OK(manifest.GetColumnField(column_number, &field)); while (field != nullptr) { out.push_front(field->level_info); diff --git a/cpp/src/parquet/arrow/arrow_statistics_test.cc b/cpp/src/parquet/arrow/arrow_statistics_test.cc index 47c715d469d..6684300c0f3 100644 --- a/cpp/src/parquet/arrow/arrow_statistics_test.cc +++ b/cpp/src/parquet/arrow/arrow_statistics_test.cc @@ -48,6 +48,16 @@ struct StatisticsTestParam { std::string expected_max; }; +// Define a custom print since the default Googletest print trips Valgrind +void PrintTo(const StatisticsTestParam& param, std::ostream* os) { + (*os) << "StatisticsTestParam{" + << "table.schema=" << param.table->schema()->ToString() + << ", expected_null_count=" << param.expected_null_count + << ", expected_value_count=" << param.expected_value_count + << ", expected_min=" << param.expected_min + << ", expected_max=" << param.expected_max << "}"; +} + class ParameterizedStatisticsTest : public ::testing::TestWithParam { };