OGRLayer::GetArrowStream(): do not issue ResetReading() at beginning …

…of iteration, but at end instead, so SetNextByIndex() can be honoured
OSGeo · Sep 2, 2023 · 248cf60 · 248cf60
1 parent 15ad2b4
commit 248cf60
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ogr/ogrsf_frmts/generic/ogrlayerarrow.cpp b/ogr/ogrsf_frmts/generic/ogrlayerarrow.cpp
@@ -1729,6 +1729,8 @@ void OGRLayer::ReleaseStream(struct ArrowArrayStream *stream)
         static_cast<ArrowArrayStreamPrivateDataSharedDataWrapper *>(
             stream->private_data);
     poPrivate->poShared->m_bArrowArrayStreamInProgress = false;
+    if (poPrivate->poShared->m_poLayer)
+        poPrivate->poShared->m_poLayer->ResetReading();
     delete poPrivate;
     stream->private_data = nullptr;
     stream->release = nullptr;
@@ -1865,8 +1867,6 @@ bool OGRLayer::GetArrowStream(struct ArrowArrayStream *out_stream,
     }
     m_aosArrowArrayStreamOptions.Assign(CSLDuplicate(papszOptions), true);
 
-    ResetReading();
-
     out_stream->get_schema = OGRLayer::StaticGetArrowSchema;
     out_stream->get_next = OGRLayer::StaticGetNextArrowArray;
     out_stream->get_last_error = OGRLayer::GetLastErrorArrowArrayStream;