@@ -296,10 +296,10 @@ static void BenchmarkReadTable(::benchmark::State& state, const Table& table,
296296 for (auto _ : state) {
297297 auto reader =
298298 ParquetFileReader::Open (std::make_shared<::arrow::io::BufferReader>(buffer));
299- std::unique_ptr<FileReader> arrow_reader;
300- auto reader_result =
299+ auto arrow_reader_result =
301300 FileReader::Make (::arrow::default_memory_pool (), std::move (reader));
302- EXIT_NOT_OK (reader_result.status ());
301+ EXIT_NOT_OK (arrow_reader_result.status ());
302+ std::shared_ptr<FileReader> arrow_reader = std::move (*arrow_reader_result);
303303
304304 std::shared_ptr<Table> table;
305305 EXIT_NOT_OK (arrow_reader->ReadTable (&table));
@@ -736,10 +736,10 @@ static void BM_ReadIndividualRowGroups(::benchmark::State& state) {
736736 while (state.KeepRunning ()) {
737737 auto reader =
738738 ParquetFileReader::Open (std::make_shared<::arrow::io::BufferReader>(buffer));
739- std::unique_ptr<FileReader> arrow_reader;
740- auto reader_result =
739+ auto arrow_reader_result =
741740 FileReader::Make (::arrow::default_memory_pool (), std::move (reader));
742- EXIT_NOT_OK (reader_result.status ());
741+ EXIT_NOT_OK (arrow_reader_result.status ());
742+ std::shared_ptr<FileReader> arrow_reader = std::move (*arrow_reader_result);
743743
744744 std::vector<std::shared_ptr<Table>> tables;
745745 for (int i = 0 ; i < arrow_reader->num_row_groups (); i++) {
@@ -799,8 +799,8 @@ static void BM_ReadMultipleRowGroupsGenerator(::benchmark::State& state) {
799799 auto reader =
800800 ParquetFileReader::Open (std::make_shared<::arrow::io::BufferReader>(buffer));
801801 std::unique_ptr<FileReader> unique_reader;
802- ASSERT_OK_AND_ASSIGN (unique_reader, FileReader::Make (::arrow::default_memory_pool (),
803- std::move (reader)));
802+ ASSIGN_OR_ABORT (unique_reader, FileReader::Make (::arrow::default_memory_pool (),
803+ std::move (reader)));
804804 std::shared_ptr<FileReader> arrow_reader = std::move (unique_reader);
805805 ASSIGN_OR_ABORT (auto generator,
806806 arrow_reader->GetRecordBatchGenerator (arrow_reader, rgs, {0 }));
0 commit comments