Fix optimisation for new operator types

Signed-off-by: Heinz N. Gies <heinz@licenser.net>
tremor-rs · May 11, 2021 · 816dd5a · 816dd5a
1 parent 0e71acb
commit 816dd5a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/tremor-pipeline/src/executable_graph.rs b/tremor-pipeline/src/executable_graph.rs
@@ -348,7 +348,7 @@ impl ExecutableGraph {
             .iter()
             .enumerate()
             .filter_map(|(id, e)| {
-                if e.skippable() && e.kind == NodeKind::Operator {
+                if e.skippable() && e.kind.skippable() {
                     Some(id)
                 } else {
                     None

diff --git a/tremor-pipeline/src/lib.rs b/tremor-pipeline/src/lib.rs
@@ -211,6 +211,12 @@ pub enum NodeKind {
     Script,
 }
 
+impl NodeKind {
+    fn skippable(&self) -> bool {
+        matches!(self, Self::Operator | Self::Select | Self::Script)
+    }
+}
+
 impl Default for NodeKind {
     fn default() -> Self {
         Self::Operator