Merge branch 'main' into enable-read-from-s3

apache · Apr 18, 2023 · 19de831 · 19de831
2 parents 44127c7 + 551cc78
commit 19de831
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/cpp/include/gar/reader/arrow_chunk_reader.h b/cpp/include/gar/reader/arrow_chunk_reader.h
@@ -236,7 +236,8 @@ class AdjListArrowChunkReader {
    */
   Status next_chunk() {
     Status st;
-    if (++chunk_index_ >= chunk_num_) {
+    ++chunk_index_;
+    while (chunk_index_ >= chunk_num_) {
       st = Status::EndOfChunk();
       ++vertex_chunk_index_;
       if (vertex_chunk_index_ >= vertex_chunk_num_) {
@@ -494,7 +495,8 @@ class AdjListPropertyArrowChunkReader {
    */
   Status next_chunk() {
     Status st;
-    if (++chunk_index_ >= chunk_num_) {
+    ++chunk_index_;
+    while (chunk_index_ >= chunk_num_) {
       st = Status::EndOfChunk();
       ++vertex_chunk_index_;
       if (vertex_chunk_index_ >= vertex_chunk_num_) {

diff --git a/cpp/include/gar/reader/chunk_info_reader.h b/cpp/include/gar/reader/chunk_info_reader.h
@@ -186,7 +186,8 @@ class AdjListChunkInfoReader {
    *     error.
    */
   Status next_chunk() {
-    if (++chunk_index_ >= chunk_num_) {
+    ++chunk_index_;
+    while (chunk_index_ >= chunk_num_) {
       ++vertex_chunk_index_;
       if (vertex_chunk_index_ >= vertex_chunk_num_) {
         return Status::OutOfRange();
@@ -290,7 +291,8 @@ class AdjListPropertyChunkInfoReader {
    *  error.
    */
   Status next_chunk() {
-    if (++chunk_index_ >= chunk_num_) {
+    ++chunk_index_;
+    while (chunk_index_ >= chunk_num_) {
       ++vertex_chunk_index_;
       if (vertex_chunk_index_ >= vertex_chunk_num_) {
         return Status::OutOfRange();