Make sure when we run a pipeline without a reader.

PDAL · Oct 20, 2020 · d1c05a5 · d1c05a5
1 parent 502b5fe
commit d1c05a5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/kernels/PipelineKernel.cpp b/kernels/PipelineKernel.cpp
@@ -127,6 +127,8 @@ int PipelineKernel::execute()
         try
         {
             m_manager.readPipeline(m_inputFile);
+            if (!m_manager.hasReader())
+                throw pdal_error("Pipeline does not start with a reader.");
             m_manager.prepare();
             root["valid"] = true;
             root["error_detail"] = "";
@@ -144,6 +146,8 @@ int PipelineKernel::execute()
     }
 
     m_manager.readPipeline(m_inputFile);
+    if (!m_manager.hasReader())
+        throw pdal_error("Pipeline does not start with a reader.");
     if (m_manager.execute(m_mode).m_mode == ExecMode::None)
         throw pdal_error("Couldn't run pipeline in requested execution mode.");
 

diff --git a/pdal/PipelineManager.cpp b/pdal/PipelineManager.cpp
@@ -33,6 +33,7 @@
 ****************************************************************************/
 
 #include <pdal/PipelineManager.hpp>
+#include <pdal/Reader.hpp>
 #include <pdal/StageFactory.hpp>
 #include <pdal/PipelineReaderJSON.hpp>
 #include <pdal/PDALUtils.hpp>
@@ -187,6 +188,12 @@ bool PipelineManager::pipelineStreamable() const
 }
 
 
+bool PipelineManager::hasReader() const
+{
+    return (dynamic_cast<Reader *>(m_stages.front()));
+}
+
+
 QuickInfo PipelineManager::preview() const
 {
     QuickInfo qi;

diff --git a/pdal/PipelineManager.hpp b/pdal/PipelineManager.hpp
@@ -129,6 +129,7 @@ class PDAL_DLL PipelineManager
     void executeStream(StreamPointTable& table);
     void validateStageOptions() const;
     bool pipelineStreamable() const;
+    bool hasReader() const;
 
     // Get the resulting point views.
     const PointViewSet& views() const

diff --git a/test/unit/apps/pcpipelineTestJSON.cpp b/test/unit/apps/pcpipelineTestJSON.cpp
@@ -469,4 +469,12 @@ TEST(json, issue_2438)
     EXPECT_TRUE(FileUtils::fileExists(file2));
 }
 
+//
+// Make sure that we throw an error if we use pipeline without a reader.
+//
+TEST(json, issue_3233)
+{
+    run_bad_pipeline("pipeline/filter-only.json", "", "start with a reader");
+}
+
 } // namespace pdal