@@ -206,11 +206,11 @@ TEST_F(PrefetchFileBatchReaderImplTest, TestSimple) {
206206 /* enable_adaptive_prefetch_strategy=*/ false , executor_,
207207 /* initialize_read_ranges=*/ true , /* prefetch_cache_mode=*/ PrefetchCacheMode::ALWAYS ,
208208 CacheConfig (), GetDefaultPool ()));
209- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), -1 );
209+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , -1 );
210210 ASSERT_OK_AND_ASSIGN (auto result_array,
211211 ReadResultCollector::CollectResult (
212212 reader.get (), /* max simulated data processing time*/ 100 ));
213- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), 101 );
213+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , 101 );
214214 auto expected_array = std::make_shared<arrow::ChunkedArray>(data_array);
215215 ASSERT_TRUE (result_array->Equals (expected_array));
216216 }
@@ -396,11 +396,11 @@ TEST_F(PrefetchFileBatchReaderImplTest, TestReadWithLargeBatchSize) {
396396 prefetch_max_parallel_num * 2 , /* enable_adaptive_prefetch_strategy=*/ false , executor_,
397397 /* initialize_read_ranges=*/ true , /* prefetch_cache_mode=*/ PrefetchCacheMode::ALWAYS ,
398398 CacheConfig (), GetDefaultPool ()));
399- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), -1 );
399+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , -1 );
400400 ASSERT_OK_AND_ASSIGN (auto result_array,
401401 ReadResultCollector::CollectResult (
402402 reader.get (), /* max simulated data processing time*/ 100 ));
403- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), 101 );
403+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , 101 );
404404 auto expected_array = std::make_shared<arrow::ChunkedArray>(data_array);
405405 ASSERT_TRUE (result_array->Equals (expected_array));
406406}
@@ -424,11 +424,11 @@ TEST_F(PrefetchFileBatchReaderImplTest, TestPartialReaderSuccessRead) {
424424 }
425425
426426 arrow::ArrayVector result_array_vector;
427- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), -1 );
427+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , -1 );
428428 ASSERT_OK_AND_ASSIGN (auto batch_with_bitmap, reader->NextBatchWithBitmap ());
429429 auto & [batch, bitmap] = batch_with_bitmap;
430430 ASSERT_EQ (batch.first ->length , bitmap.Cardinality ());
431- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), 0 );
431+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , 0 );
432432 ASSERT_OK_AND_ASSIGN (auto array, ReadResultCollector::GetArray (std::move (batch)));
433433 result_array_vector.push_back (array);
434434 ASSERT_OK (prefetch_reader->GetReadStatus ());
@@ -469,9 +469,9 @@ TEST_F(PrefetchFileBatchReaderImplTest, TestAllReaderFailedWithIOError) {
469469 ->SetNextBatchStatus (Status::IOError (" mock error" ));
470470 }
471471
472- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), -1 );
472+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , -1 );
473473 auto batch_result = reader->NextBatchWithBitmap ();
474- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), -1 );
474+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , -1 );
475475 ASSERT_FALSE (batch_result.ok ());
476476 ASSERT_TRUE (batch_result.status ().IsIOError ());
477477 ASSERT_FALSE (prefetch_reader->is_shutdown_ );
@@ -480,7 +480,7 @@ TEST_F(PrefetchFileBatchReaderImplTest, TestAllReaderFailedWithIOError) {
480480
481481 // call NextBatch again, will still return error status
482482 auto batch_result2 = reader->NextBatchWithBitmap ();
483- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), -1 );
483+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , -1 );
484484 ASSERT_FALSE (batch_result2.ok ());
485485 ASSERT_TRUE (batch_result2.status ().IsIOError ());
486486}
@@ -497,11 +497,11 @@ TEST_F(PrefetchFileBatchReaderImplTest, TestPrefetchWithEmptyData) {
497497 prefetch_max_parallel_num * 2 , /* enable_adaptive_prefetch_strategy=*/ false , executor_,
498498 /* initialize_read_ranges=*/ true , /* prefetch_cache_mode=*/ PrefetchCacheMode::ALWAYS ,
499499 CacheConfig (), GetDefaultPool ()));
500- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), -1 );
500+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , -1 );
501501 ASSERT_OK_AND_ASSIGN (auto result_array,
502502 ReadResultCollector::CollectResult (
503503 reader.get (), /* max simulated data processing time*/ 100 ));
504- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), 0 );
504+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , 0 );
505505 ASSERT_FALSE (result_array);
506506}
507507
@@ -517,11 +517,11 @@ TEST_F(PrefetchFileBatchReaderImplTest, TestCallNextBatchAfterReadingEof) {
517517 prefetch_max_parallel_num * 2 , /* enable_adaptive_prefetch_strategy=*/ false , executor_,
518518 /* initialize_read_ranges=*/ true , /* prefetch_cache_mode=*/ PrefetchCacheMode::ALWAYS ,
519519 CacheConfig (), GetDefaultPool ()));
520- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), -1 );
520+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , -1 );
521521 ASSERT_OK_AND_ASSIGN (auto result_array,
522522 ReadResultCollector::CollectResult (
523523 reader.get (), /* max simulated data processing time*/ 100 ));
524- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), 10 );
524+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , 10 );
525525 auto expected_array = std::make_shared<arrow::ChunkedArray>(data_array);
526526 ASSERT_TRUE (result_array->Equals (expected_array));
527527
@@ -623,11 +623,11 @@ TEST_P(PrefetchFileBatchReaderImplTest, TestPrefetchWithPredicatePushdownWithCom
623623 PreparePrefetchReader (file_format, schema.get (), predicate,
624624 /* selection_bitmap=*/ std::nullopt ,
625625 /* batch_size=*/ 10 , /* prefetch_max_parallel_num=*/ 3 , cache_mode);
626- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), -1 );
626+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , -1 );
627627 ASSERT_OK_AND_ASSIGN (auto result_array,
628628 ReadResultCollector::CollectResult (
629629 reader.get (), /* max simulated data processing time*/ 100 ));
630- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), 90 );
630+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , 90 );
631631
632632 arrow::ArrayVector expected_array_vector;
633633 expected_array_vector.push_back (data_array->Slice (0 , 30 ));
@@ -659,11 +659,11 @@ TEST_P(PrefetchFileBatchReaderImplTest,
659659 /* selection_bitmap=*/ std::nullopt ,
660660 /* batch_size=*/ 10 , /* prefetch_max_parallel_num=*/ 3 , cache_mode);
661661 ASSERT_OK (reader->RefreshReadRanges ());
662- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), -1 );
662+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , -1 );
663663 ASSERT_OK_AND_ASSIGN (auto result_array,
664664 ReadResultCollector::CollectResult (
665665 reader.get (), /* max simulated data processing time*/ 100 ));
666- ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (), 90 );
666+ ASSERT_EQ (reader->GetPreviousBatchFirstRowNumber (). value () , 90 );
667667
668668 arrow::ArrayVector expected_array_vector;
669669 expected_array_vector.push_back (data_array->Slice (0 , 20 ));
0 commit comments