Merge pull request #12617 from knz/opt-filters2

sql: implement filter propagation.
cockroachdb · Jan 12, 2017 · b8da7e8 · b8da7e8
2 parents 3e31754 + 2209f37
commit b8da7e8
Show file tree

Hide file tree

Showing 12 changed files with 955 additions and 81 deletions.
diff --git a/pkg/sql/expand_plan.go b/pkg/sql/expand_plan.go
@@ -279,20 +279,11 @@ func (p *planner) expandSelectNode(s *renderNode) (planNode, error) {
 	limitCount, limitOffset := s.top.limit.estimateLimit()
 
 	maybeScanNode := s.source.plan
-	var whereFilter parser.TypedExpr
-	where, ok := maybeScanNode.(*filterNode)
-	if ok {
-		whereFilter = where.filter
+	if where, ok := maybeScanNode.(*filterNode); ok {
 		maybeScanNode = where.source.plan
 	}
 
 	if scan, ok := maybeScanNode.(*scanNode); ok {
-		if whereFilter != nil {
-			// Migrate the filter to the scan node.
-			// (Will be done soon by filter propagation.)
-			scan.filter = scan.filterVars.Rebind(whereFilter)
-		}
-
 		var analyzeOrdering analyzeOrderingFn
 		if ordering != nil {
 			analyzeOrdering = func(indexOrdering orderingInfo) (matchingCols, totalCols int) {