kou commented on code in PR #48285:
URL: https://github.com/apache/arrow/pull/48285#discussion_r2597616453
##########
cpp/src/parquet/arrow/arrow_reader_writer_test.cc:
##########
@@ -4259,13 +4260,15 @@ TEST(TestArrowReaderAdHoc,
LARGE_MEMORY_TEST(LargeStringColumn)) {
auto reader =
ParquetFileReader::Open(std::make_shared<BufferReader>(tables_buffer));
std::unique_ptr<FileReader> arrow_reader;
- ASSERT_OK(FileReader::Make(default_memory_pool(), std::move(reader),
&arrow_reader));
+ ASSERT_OK_AND_ASSIGN(arrow_reader,
Review Comment:
```suggestion
ASSERT_OK_AND_ASSIGN(auto arrow_reader,
```
##########
cpp/src/parquet/arrow/arrow_reader_writer_test.cc:
##########
@@ -4494,8 +4497,8 @@ TEST(TestArrowReaderAdHoc, ReadFloat16Files) {
ARROW_SCOPED_TRACE("path = ", path);
std::unique_ptr<FileReader> reader;
- ASSERT_OK_NO_THROW(
- FileReader::Make(pool, ParquetFileReader::OpenFile(path, false),
&reader));
+ ASSERT_OK_AND_ASSIGN(
+ reader, FileReader::Make(pool, ParquetFileReader::OpenFile(path,
false)));
Review Comment:
```suggestion
ASSERT_OK_AND_ASSIGN(
auto reader, FileReader::Make(pool,
ParquetFileReader::OpenFile(path, false)));
```
##########
cpp/src/parquet/arrow/arrow_reader_writer_test.cc:
##########
@@ -4617,8 +4620,8 @@ TEST(TestArrowColumnReader, NextBatchEmptyInput) {
auto reader =
ParquetFileReader::Open(std::make_shared<BufferReader>(buffer));
std::unique_ptr<FileReader> file_reader;
- ASSERT_OK(
- FileReader::Make(::arrow::default_memory_pool(), std::move(reader),
&file_reader));
+ ASSERT_OK_AND_ASSIGN(
+ file_reader, FileReader::Make(::arrow::default_memory_pool(),
std::move(reader)));
Review Comment:
```suggestion
ASSERT_OK_AND_ASSIGN(
auto file_reader, FileReader::Make(::arrow::default_memory_pool(),
std::move(reader)));
```
##########
cpp/src/parquet/arrow/arrow_reader_writer_test.cc:
##########
@@ -5729,7 +5733,8 @@ TEST(TestArrowReadWrite, WriteAndReadRecordBatch) {
read_properties.set_batch_size(record_batch->num_rows());
auto reader =
ParquetFileReader::Open(std::make_shared<BufferReader>(buffer));
std::unique_ptr<FileReader> arrow_reader;
- ASSERT_OK(FileReader::Make(pool, std::move(reader), read_properties,
&arrow_reader));
+ ASSERT_OK_AND_ASSIGN(arrow_reader,
Review Comment:
```suggestion
ASSERT_OK_AND_ASSIGN(auto arrow_reader,
```
##########
cpp/src/parquet/arrow/arrow_reader_writer_test.cc:
##########
@@ -4567,8 +4570,8 @@ TEST(TestArrowFileReader, RecordBatchReaderEmptyInput) {
auto reader =
ParquetFileReader::Open(std::make_shared<BufferReader>(buffer));
std::unique_ptr<FileReader> file_reader;
- ASSERT_OK(
- FileReader::Make(::arrow::default_memory_pool(), std::move(reader),
&file_reader));
+ ASSERT_OK_AND_ASSIGN(
+ file_reader, FileReader::Make(::arrow::default_memory_pool(),
std::move(reader)));
Review Comment:
```suggestion
ASSERT_OK_AND_ASSIGN(
auto file_reader, FileReader::Make(::arrow::default_memory_pool(),
std::move(reader)));
```
##########
cpp/src/parquet/arrow/arrow_reader_writer_test.cc:
##########
@@ -4539,8 +4542,8 @@ TEST(TestArrowFileReader,
RecordBatchReaderEmptyRowGroups) {
auto reader =
ParquetFileReader::Open(std::make_shared<BufferReader>(buffer));
std::unique_ptr<FileReader> file_reader;
- ASSERT_OK(
- FileReader::Make(::arrow::default_memory_pool(), std::move(reader),
&file_reader));
+ ASSERT_OK_AND_ASSIGN(
+ file_reader, FileReader::Make(::arrow::default_memory_pool(),
std::move(reader)));
Review Comment:
```suggestion
ASSERT_OK_AND_ASSIGN(
auto file_reader, FileReader::Make(::arrow::default_memory_pool(),
std::move(reader)));
```
##########
cpp/src/parquet/arrow/arrow_reader_writer_test.cc:
##########
@@ -4362,8 +4365,8 @@ TEST(TestArrowReaderAdHoc, LegacyTwoLevelList) {
// Verify Arrow schema and data
std::unique_ptr<FileReader> reader;
- ASSERT_OK_NO_THROW(
- FileReader::Make(default_memory_pool(), std::move(file_reader),
&reader));
+ ASSERT_OK_AND_ASSIGN(reader,
+ FileReader::Make(default_memory_pool(),
std::move(file_reader)));
Review Comment:
```suggestion
ASSERT_OK_AND_ASSIGN(auto reader,
FileReader::Make(default_memory_pool(),
std::move(file_reader)));
```
##########
cpp/src/parquet/arrow/arrow_reader_writer_test.cc:
##########
@@ -4591,8 +4594,8 @@ TEST(TestArrowColumnReader, NextBatchZeroBatchSize) {
auto reader =
ParquetFileReader::Open(std::make_shared<BufferReader>(buffer));
std::unique_ptr<FileReader> file_reader;
- ASSERT_OK(
- FileReader::Make(::arrow::default_memory_pool(), std::move(reader),
&file_reader));
+ ASSERT_OK_AND_ASSIGN(
+ file_reader, FileReader::Make(::arrow::default_memory_pool(),
std::move(reader)));
Review Comment:
```suggestion
ASSERT_OK_AND_ASSIGN(
auto file_reader, FileReader::Make(::arrow::default_memory_pool(),
std::move(reader)));
```
##########
cpp/src/parquet/arrow/arrow_reader_writer_test.cc:
##########
@@ -4427,8 +4430,8 @@ TEST_P(TestArrowReaderAdHocSparkAndHvr, ReadDecimals) {
auto pool = ::arrow::default_memory_pool();
std::unique_ptr<FileReader> arrow_reader;
- ASSERT_OK_NO_THROW(
- FileReader::Make(pool, ParquetFileReader::OpenFile(path, false),
&arrow_reader));
+ ASSERT_OK_AND_ASSIGN(arrow_reader,
Review Comment:
```suggestion
ASSERT_OK_AND_ASSIGN(auto arrow_reader,
```
##########
cpp/src/parquet/arrow/arrow_reader_writer_test.cc:
##########
@@ -5201,8 +5204,9 @@ TEST_F(TestArrowReadDeltaEncoding,
IncrementalDecodeDeltaByteArray) {
ArrowReaderProperties properties = default_arrow_reader_properties();
properties.set_batch_size(batch_size);
std::unique_ptr<FileReader> parquet_reader;
- ASSERT_OK(FileReader::Make(pool, ParquetFileReader::OpenFile(file, false),
properties,
- &parquet_reader));
+ ASSERT_OK_AND_ASSIGN(
+ parquet_reader,
Review Comment:
```suggestion
ASSERT_OK_AND_ASSIGN(
auto parquet_reader,
```
##########
cpp/src/parquet/arrow/arrow_reader_writer_test.cc:
##########
@@ -5141,8 +5144,8 @@ class TestArrowReadDeltaEncoding : public ::testing::Test
{
auto file = test::get_data_file(file_name);
auto pool = ::arrow::default_memory_pool();
std::unique_ptr<FileReader> parquet_reader;
- ASSERT_OK(FileReader::Make(pool, ParquetFileReader::OpenFile(file, false),
- &parquet_reader));
+ ASSERT_OK_AND_ASSIGN(
+ parquet_reader, FileReader::Make(pool,
ParquetFileReader::OpenFile(file, false)));
Review Comment:
```suggestion
ASSERT_OK_AND_ASSIGN(
auto parquet_reader, FileReader::Make(pool,
ParquetFileReader::OpenFile(file, false)));
```
##########
cpp/src/parquet/arrow/reader_writer_benchmark.cc:
##########
@@ -296,9 +296,10 @@ static void BenchmarkReadTable(::benchmark::State& state,
const Table& table,
for (auto _ : state) {
auto reader =
ParquetFileReader::Open(std::make_shared<::arrow::io::BufferReader>(buffer));
- std::unique_ptr<FileReader> arrow_reader;
- EXIT_NOT_OK(FileReader::Make(::arrow::default_memory_pool(),
std::move(reader),
- &arrow_reader));
+ auto arrow_reader_result =
+ FileReader::Make(::arrow::default_memory_pool(), std::move(reader));
+ EXIT_NOT_OK(arrow_reader_result.status());
+ std::shared_ptr<FileReader> arrow_reader = std::move(*arrow_reader_result);
Review Comment:
```suggestion
auto arrow_reader = std::move(*arrow_reader_result);
```
##########
cpp/src/parquet/arrow/reader_writer_benchmark.cc:
##########
@@ -735,9 +736,10 @@ static void BM_ReadIndividualRowGroups(::benchmark::State&
state) {
while (state.KeepRunning()) {
auto reader =
ParquetFileReader::Open(std::make_shared<::arrow::io::BufferReader>(buffer));
- std::unique_ptr<FileReader> arrow_reader;
- EXIT_NOT_OK(FileReader::Make(::arrow::default_memory_pool(),
std::move(reader),
- &arrow_reader));
+ auto arrow_reader_result =
+ FileReader::Make(::arrow::default_memory_pool(), std::move(reader));
+ EXIT_NOT_OK(arrow_reader_result.status());
+ std::shared_ptr<FileReader> arrow_reader = std::move(*arrow_reader_result);
Review Comment:
```suggestion
auto arrow_reader = std::move(*arrow_reader_result);
```
##########
cpp/src/parquet/arrow/reader_writer_benchmark.cc:
##########
@@ -770,9 +772,11 @@ static void BM_ReadMultipleRowGroups(::benchmark::State&
state) {
while (state.KeepRunning()) {
auto reader =
ParquetFileReader::Open(std::make_shared<::arrow::io::BufferReader>(buffer));
- std::unique_ptr<FileReader> arrow_reader;
- EXIT_NOT_OK(FileReader::Make(::arrow::default_memory_pool(),
std::move(reader),
- &arrow_reader));
+ auto arrow_reader_result =
+ FileReader::Make(::arrow::default_memory_pool(), std::move(reader));
+ EXIT_NOT_OK(arrow_reader_result.status());
+ std::shared_ptr<FileReader> arrow_reader = std::move(*arrow_reader_result);
Review Comment:
```suggestion
auto arrow_reader = std::move(*arrow_reader_result);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
