Merge remote-tracking branch 'upstream/master' into inputmasking

Author: abellgithub

.github/workflows/code_checks.yml

@@ -235,3 +235,17 @@ jobs:
         git diff
         git diff --quiet || (echo "You need to run scripts/collect_config_options to update port/cpl_known_config_options.h" && /bin/false)
 
+  check-driver-connection-prefix:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - name: Set up Python
+      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      with:
+        python-version: 3.8
+    - name: Check cmakelist
+      run: |
+        python scripts/collect_driver_connection_prefix.py
+        git diff
+        git diff --quiet || (echo "You need to run scripts/collect_driver_connection_prefix.py to update gcore/gdal_known_connection_prefixes.h" && /bin/false)

.github/workflows/codeql.yml

@@ -108,7 +108,7 @@ jobs:
     # We do that after running CMake to avoid CodeQL to trigger during CMake time,
     # in particular during HDF5 detection which is terribly slow (https://github.com/OSGeo/gdal/issues/9549)
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+      uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -128,6 +128,6 @@ jobs:
         cmake --build build -j$(nproc)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+      uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/delete_untagged_containers.yml

@@ -19,7 +19,7 @@ jobs:
     if: github.repository == 'OSGeo/gdal'
     steps:
     - name: Delete all containers from gdal-deps without tags
-      uses: Chizkiyahu/delete-untagged-ghcr-action@4a33ce3cf2456d2aef98a1b6c60a12dad56cffd9 # v6.0.0
+      uses: Chizkiyahu/delete-untagged-ghcr-action@68758dd8caf1d9dbaed1fe9cc1a1f8fcea1c4cf0 # v6.1.0
       with:
         token: ${{ secrets.PAT_TOKEN_DELETE_UNTAGGED_CONTAINERS }}
         repository_owner: ${{ github.repository_owner }}

.github/workflows/scorecard.yml

@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/ubuntu_24.04/Dockerfile.ci

@@ -99,7 +99,7 @@ RUN apt-get update \
    && ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev
 
 # Build mongo-c-driver
-ARG MONGO_C_DRIVER_VERSION=1.24.4
+ARG MONGO_C_DRIVER_VERSION=2.0.2
 RUN mkdir mongo-c-driver \
     && wget -q https://github.com/mongodb/mongo-c-driver/releases/download/${MONGO_C_DRIVER_VERSION}/mongo-c-driver-${MONGO_C_DRIVER_VERSION}.tar.gz -O - \
         | tar xz -C mongo-c-driver --strip-components=1 \
@@ -113,7 +113,7 @@ RUN mkdir mongo-c-driver \
     && rm -rf mongo-c-driver
 
 # Build mongocxx
-ARG MONGOCXX_VERSION=3.8.1
+ARG MONGOCXX_VERSION=4.1.1
 RUN mkdir mongocxx \
     && wget -q https://github.com/mongodb/mongo-cxx-driver/archive/r${MONGOCXX_VERSION}.tar.gz -O - \
         | tar xz -C mongocxx --strip-components=1 \

apps/gdalalg_abstract_pipeline.h

@@ -281,6 +281,8 @@ class GDALPipelineStepAlgorithm /* non final */ : public GDALAlgorithm
     std::vector<std::string> m_inputLayerNames{};
 
     // Output arguments
+    bool m_stdout = false;
+    std::string m_output{};
     GDALArgDatasetValue m_outputDataset{};
     std::string m_format{};
     std::vector<std::string> m_creationOptions{};
@@ -678,12 +680,19 @@ bool GDALAbstractPipelineAlgorithm<StepAlgorithm>::RunStep(
         {
             stepCtxt.m_poNextUsableStep = m_steps[i + 1].get();
         }
+        if (i + 1 == m_steps.size() && StepAlgorithm::m_stdout &&
+            step->GetArg("stdout") != nullptr)
+        {
+            step->m_stdout = true;
+        }
         if (!step->ValidateArguments() || !step->RunStep(stepCtxt))
         {
             return false;
         }
         poCurDS = step->m_outputDataset.GetDatasetRef();
-        if (!poCurDS)
+        if (!poCurDS &&
+            !(i + 1 == m_steps.size() &&
+              (!step->m_output.empty() || step->GetArg("stdout") != nullptr)))
         {
             StepAlgorithm::ReportError(
                 CE_Failure, CPLE_AppDefined,
@@ -698,10 +707,17 @@ bool GDALAbstractPipelineAlgorithm<StepAlgorithm>::RunStep(
         }
     }
 
-    if (ctxt.m_pfnProgress)
+    if (ctxt.m_pfnProgress &&
+        m_steps.back()->GetArg("output-string") == nullptr)
         ctxt.m_pfnProgress(1.0, "", ctxt.m_pProgressData);
 
-    if (!StepAlgorithm::m_outputDataset.GetDatasetRef())
+    if (!m_steps.back()->m_output.empty())
+    {
+        auto outputStringArg = StepAlgorithm::GetArg("output-string");
+        if (outputStringArg && outputStringArg->GetType() == GAAT_STRING)
+            outputStringArg->Set(m_steps.back()->m_output);
+    }
+    else if (!StepAlgorithm::m_outputDataset.GetDatasetRef())
     {
         StepAlgorithm::m_outputDataset.Set(poCurDS);
     }

apps/gdalalg_dispatcher.h

@@ -33,8 +33,9 @@ class GDALDispatcherAlgorithm : public GDALAlgorithm
                             const std::string &helpURL)
         : GDALAlgorithm(name, description, helpURL),
           m_rasterDispatcher(std::make_unique<RasterDispatcher>(
-              /* openForMixedRasterVector = */ true)),
-          m_vectorDispatcher(std::make_unique<VectorDispatcher>())
+              /* standalone = */ true, /* openForMixedRasterVector = */ true)),
+          m_vectorDispatcher(
+              std::make_unique<VectorDispatcher>(/* standalone = */ true))
     {
         // A "info" dispacher command is a shortcut for something like
         // "raster info", "vector info". Best to expose the latter.

apps/gdalalg_pipeline.cpp

@@ -28,7 +28,9 @@
 #include "gdalalg_raster_contour.h"
 #include "gdalalg_raster_footprint.h"
 #include "gdalalg_raster_polygonize.h"
+#include "gdalalg_raster_info.h"
 #include "gdalalg_vector_grid.h"
+#include "gdalalg_vector_info.h"
 #include "gdalalg_vector_rasterize.h"
 
 #include <algorithm>
@@ -219,9 +221,19 @@ bool GDALPipelineStepAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
 
         std::unique_ptr<GDALPipelineStepAlgorithm> writeAlg;
         if (GetOutputType() == GDAL_OF_RASTER)
-            writeAlg = std::make_unique<GDALRasterWriteAlgorithm>();
+        {
+            if (GetName() == GDALRasterInfoAlgorithm::NAME)
+                writeAlg = std::make_unique<GDALRasterInfoAlgorithm>();
+            else
+                writeAlg = std::make_unique<GDALRasterWriteAlgorithm>();
+        }
         else
-            writeAlg = std::make_unique<GDALVectorWriteAlgorithm>();
+        {
+            if (GetName() == GDALVectorInfoAlgorithm::NAME)
+                writeAlg = std::make_unique<GDALVectorInfoAlgorithm>();
+            else
+                writeAlg = std::make_unique<GDALVectorWriteAlgorithm>();
+        }
         for (auto &arg : writeAlg->GetArgs())
         {
             auto stepArg = GetArg(arg->GetName());
@@ -252,8 +264,9 @@ bool GDALPipelineStepAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
         }
         else if (readAlg->Run())
         {
+            auto outputArg = GetArg(GDAL_ARG_NAME_OUTPUT);
             const bool bOutputSpecified =
-                GetArg(GDAL_ARG_NAME_OUTPUT)->IsExplicitlySet();
+                outputArg && outputArg->IsExplicitlySet();
 
             m_inputDataset.clear();
             m_inputDataset.resize(1);
@@ -402,6 +415,14 @@ class GDALPipelineAlgorithm final
             .SetHiddenForCLI()
             .SetPositional();
 
+        AddOutputStringArg(&m_output).SetHiddenForCLI();
+        AddArg(
+            "stdout", 0,
+            _("Directly output on stdout (format=text mode only). If enabled, "
+              "output-string will be empty"),
+            &m_stdout)
+            .SetHidden();
+
         GDALRasterPipelineAlgorithm::RegisterAlgorithms(m_stepRegistry, true);
         GDALVectorPipelineAlgorithm::RegisterAlgorithms(m_stepRegistry, true);
         m_stepRegistry.Register<GDALRasterContourAlgorithm>();
@@ -618,24 +639,28 @@ bool GDALPipelineAlgorithm::ParseCommandLineArguments(
     if (!CheckFirstStep(stepAlgs))
         return false;  // CheckFirstStep emits an error
 
-    if (steps.back().alg->GetName() != GDALRasterWriteAlgorithm::NAME)
+    if (steps.back().alg->GetName() != GDALRasterWriteAlgorithm::NAME &&
+        steps.back().alg->GetName() != GDALRasterInfoAlgorithm::NAME)
     {
         if (helpRequested)
         {
             steps.back().alg->ParseCommandLineArguments(steps.back().args);
             return false;
         }
-        ReportError(CE_Failure, CPLE_AppDefined, "Last step should be '%s'",
-                    GDALRasterWriteAlgorithm::NAME);
+        ReportError(
+            CE_Failure, CPLE_AppDefined, "Last step should be '%s' or '%s'",
+            GDALRasterWriteAlgorithm::NAME, GDALRasterInfoAlgorithm::NAME);
         return false;
     }
     for (size_t i = 0; i < steps.size() - 1; ++i)
     {
-        if (steps[i].alg->GetName() == GDALRasterWriteAlgorithm::NAME)
+        if (steps[i].alg->GetName() == GDALRasterWriteAlgorithm::NAME ||
+            steps[i].alg->GetName() == GDALRasterInfoAlgorithm::NAME)
         {
             ReportError(CE_Failure, CPLE_AppDefined,
-                        "Only last step can be '%s'",
-                        GDALRasterWriteAlgorithm::NAME);
+                        "Only last step can be '%s' or '%s'",
+                        GDALRasterWriteAlgorithm::NAME,
+                        GDALRasterInfoAlgorithm::NAME);
             return false;
         }
     }
@@ -764,6 +789,8 @@ bool GDALPipelineAlgorithm::ParseCommandLineArguments(
             steps[i].alg->SetCallPath({steps[i].alg->GetName()});
             steps[i].alg->SetReferencePathForRelativePaths(
                 GetReferencePathForRelativePaths());
+            if (IsCalledFromCommandLine())
+                steps[i].alg->SetCalledFromCommandLine();
             steps[i].alreadyChangedType = true;
         }
         else if (steps[i].alg->GetInputType() != nLastStepOutputType)
@@ -896,17 +923,18 @@ GDALPipelineAlgorithm::GetUsageForCLI(bool shortUsage,
             ret += alg->GetUsageForCLI(shortUsage, stepUsageOptions);
         }
     }
+    for (const std::string &name :
+         {std::string(GDALRasterInfoAlgorithm::NAME) + RASTER_SUFFIX,
+          std::string(GDALRasterWriteAlgorithm::NAME) + RASTER_SUFFIX,
+          std::string(GDALVectorInfoAlgorithm::NAME) + VECTOR_SUFFIX,
+          std::string(GDALVectorWriteAlgorithm::NAME) + VECTOR_SUFFIX})
     {
         ret += '\n';
-        auto alg = std::make_unique<GDALRasterWriteAlgorithm>();
-        alg->SetCallPath({alg->GetName()});
-        ret += alg->GetUsageForCLI(shortUsage, stepUsageOptions);
-    }
-    {
-        ret += '\n';
-        auto alg = std::make_unique<GDALVectorWriteAlgorithm>();
+        auto alg = GetStepAlg(name);
         assert(alg);
-        alg->SetCallPath({alg->GetName()});
+        alg->SetCallPath({CPLString(alg->GetName())
+                              .replaceAll(RASTER_SUFFIX, "")
+                              .replaceAll(VECTOR_SUFFIX, "")});
         ret += alg->GetUsageForCLI(shortUsage, stepUsageOptions);
     }
 

apps/gdalalg_raster.cpp

@@ -77,7 +77,7 @@ class GDALRasterAlgorithm final : public GDALAlgorithm
 
         AddOutputStringArg(&m_output);
 
-        RegisterSubAlgorithm<GDALRasterInfoAlgorithm>();
+        RegisterSubAlgorithm<GDALRasterInfoAlgorithmStandalone>();
         RegisterSubAlgorithm<GDALRasterAspectAlgorithmStandalone>();
         RegisterSubAlgorithm<GDALRasterCalcAlgorithmStandalone>();
         RegisterSubAlgorithm<GDALRasterCleanCollarAlgorithm>();

apps/gdalalg_raster_convert.cpp

@@ -27,7 +27,7 @@
 /************************************************************************/
 
 GDALRasterConvertAlgorithm::GDALRasterConvertAlgorithm(
-    bool openForMixedRasterVector)
+    bool /* standalone */, bool openForMixedRasterVector)
     : GDALAlgorithm(NAME, DESCRIPTION, HELP_URL)
 {
     AddProgressArg();