Merge pull request #8866 from Light-City/fix/logic

Issue: #8867 Fix: remove unused variables for logical_root.
duckdb · Nov 8, 2023 · 81e84e5 · 81e84e5
2 parents aa62b4a + ce39c03
commit 81e84e5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/src/include/duckdb/optimizer/rule.hpp b/src/include/duckdb/optimizer/rule.hpp
@@ -23,8 +23,6 @@ class Rule {
 
 	//! The expression rewriter this rule belongs to
 	ExpressionRewriter &rewriter;
-	//! The root
-	unique_ptr<LogicalOperatorMatcher> logical_root;
 	//! The expression matcher of the rule
 	unique_ptr<ExpressionMatcher> root;
 

diff --git a/src/optimizer/expression_rewriter.cpp b/src/optimizer/expression_rewriter.cpp
@@ -59,16 +59,8 @@ void ExpressionRewriter::VisitOperator(LogicalOperator &op) {
 
 	to_apply_rules.clear();
 	for (auto &rule : rules) {
-		if (rule->logical_root && !rule->logical_root->Match(op.type)) {
-			// this rule does not apply to this type of LogicalOperator
-			continue;
-		}
 		to_apply_rules.push_back(*rule);
 	}
-	if (to_apply_rules.empty()) {
-		// no rules to apply on this node
-		return;
-	}
 
 	VisitOperatorExpressions(op);