disable cache experiment

Author: angelamayxie

sql/analyzer/resolve_subqueries.go

@@ -369,17 +369,17 @@ func cacheSubqueryAliasesInJoins(ctx *sql.Context, a *Analyzer, n sql.Node, scop
 			leftChild = false
 		}
 
-		if len(newChildren) == 0 && !doCache {
+		if len(newChildren) == 0 {
 			return n, transform.SameTree, nil
 		}
 
 		ret := n
 		if len(newChildren) > 0 {
 			ret, _ = ret.WithChildren(ctx, newChildren...)
 		}
-		if doCache {
-			ret = plan.NewCachedResults(n, a.CachedResultsManager)
-		}
+		//if doCache {
+		//	ret = plan.NewCachedResults(n, a.CachedResultsManager)
+		//}
 		return ret, transform.NewTree, nil
 	}
 	return recurse(n, false, false, false)

sql/rowexec/other_iters.go

@@ -207,6 +207,7 @@ func (i *cachedResultsIter) cleanUp() {
 
 func (i *cachedResultsIter) Close(ctx *sql.Context) error {
 	i.cleanUp()
+	i.parent.Dispose(ctx)
 	return i.iter.Close(ctx)
 }
 
@@ -248,9 +249,6 @@ func (h *hashLookupGeneratingIter) Next(ctx *sql.Context) (sql.Row, error) {
 }
 
 func (h *hashLookupGeneratingIter) Close(c *sql.Context) error {
-	if cr, ok := h.n.Child.(*plan.CachedResults); ok {
-		cr.Dispose(c)
-	}
 	return h.childIter.Close(c)
 }