commit 3a7b9c796df3f0c2e37b5d69d41aed0162502892
author Zuyu Zhang <zuyu@cs.wisc.edu> Sat May 05 14:28:59 2018 -0500
committer Zuyu Zhang <zuyu@cs.wisc.edu> Sat May 05 14:28:59 2018 -0500
tree bff422a562e69e99b9d1ce4dd2b6d5e9c3a2ce8b
parent 666102fff32d258a5a2c85e33bf8d8ebb5d3a9cf

Minor fix in EliminateEmptyNode.

query_optimizer/rules/EliminateEmptyNode.cpp

diff --git a/query_optimizer/rules/EliminateEmptyNode.cpp b/query_optimizer/rules/EliminateEmptyNode.cpp
index c025ebf..fd1c383 100644
--- a/query_optimizer/rules/EliminateEmptyNode.cpp
+++ b/query_optimizer/rules/EliminateEmptyNode.cpp
@@ -328,6 +328,15 @@
     }
   }
 
+  auto output = Apply(plan);
+  if (output == plan) {
+    return input;
+  }
+
+  if (output) {
+    return input->copyWithNewChildren({output});
+  }
+
 #ifdef QUICKSTEP_DEBUG
   {
     CHECK(!project_expressions.empty());
@@ -341,15 +350,6 @@
   }
 #endif
 
-  auto output = Apply(plan);
-  if (output == plan) {
-    return input;
-  }
-
-  if (output) {
-    return input->copyWithNewChildren({output});
-  }
-
   auto catalog_relation = std::make_unique<CatalogRelation>(
       catalog_database_, GetNewRelationName(catalog_database_->size()), -1, true);