Skip to content

Commit 39cc9ea

Browse files
committed
Replace Result verion FileReader::Make
1 parent e3a041b commit 39cc9ea

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

cpp/src/gandiva/tests/generate_data.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ class DataGenerator {
3636

3737
class Random {
3838
public:
39-
Random() : gen_(::arrow::internal::GetRandomSeed()) {}
40-
explicit Random(uint64_t seed) : gen_(seed) {}
39+
Random()
40+
: gen_(static_cast<decltype(gen_)::result_type>(
41+
::arrow::internal::GetRandomSeed())) {}
4142

4243
int32_t next() { return gen_(); }
4344

cpp/src/parquet/arrow/reader_writer_benchmark.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -798,10 +798,10 @@ static void BM_ReadMultipleRowGroupsGenerator(::benchmark::State& state) {
798798
while (state.KeepRunning()) {
799799
auto reader =
800800
ParquetFileReader::Open(std::make_shared<::arrow::io::BufferReader>(buffer));
801-
std::unique_ptr<FileReader> unique_reader;
802-
ASSIGN_OR_ABORT(unique_reader,
803-
FileReader::Make(::arrow::default_memory_pool(), std::move(reader)));
804-
std::shared_ptr<FileReader> arrow_reader = std::move(unique_reader);
801+
auto arrow_reader_result =
802+
FileReader::Make(::arrow::default_memory_pool(), std::move(reader));
803+
EXIT_NOT_OK(arrow_reader_result.status());
804+
std::shared_ptr<FileReader> arrow_reader = std::move(*arrow_reader_result);
805805
ASSIGN_OR_ABORT(auto generator,
806806
arrow_reader->GetRecordBatchGenerator(arrow_reader, rgs, {0}));
807807
auto fut = ::arrow::CollectAsyncGenerator(generator);

0 commit comments

Comments
 (0)