Merge pull request #9160 from OSGeo/backport-9146-to-release/3.8

[Backport release/3.8] ogr2ogr: Arrow code path: take into account -limit parameter for MAX_FEATURES_IN_BATCH
OSGeo · Jan 30, 2024 · b0ef517 · b0ef517
2 parents d445e97 + 8577afd
commit b0ef517
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/apps/ogr2ogr_lib.cpp b/apps/ogr2ogr_lib.cpp
@@ -5464,7 +5464,17 @@ bool LayerTranslator::TranslateArrow(
         aosOptionsWriteArrowBatch.SetNameValue("IF_FID_NOT_PRESERVED",
                                                "WARNING");
     }
-    if (psOptions->nGroupTransactions > 0)
+    if (psOptions->nLimit >= 0)
+    {
+        aosOptionsGetArrowStream.SetNameValue(
+            "MAX_FEATURES_IN_BATCH",
+            CPLSPrintf(CPL_FRMT_GIB,
+                       std::min<GIntBig>(psOptions->nLimit,
+                                         (psOptions->nGroupTransactions > 0
+                                              ? psOptions->nGroupTransactions
+                                              : 65536))));
+    }
+    else if (psOptions->nGroupTransactions > 0)
     {
         aosOptionsGetArrowStream.SetNameValue(
             "MAX_FEATURES_IN_BATCH",