sql: Fix autorouting for expensive functions

src/sql/src/plan/hir.rs

@@ -2391,7 +2391,7 @@ impl HirRelationExpr {
             use HirRelationExpr::*;
             use HirScalarExpr::*;
 
-            self.visit_children(|scalar: &HirScalarExpr| {
+            e.visit_children(|scalar: &HirScalarExpr| {
                 if let Err(_) = scalar.visit_pre(&mut |scalar: &HirScalarExpr| {
                     result |= match scalar {
                         Column(..)

test/sqllogictest/auto_route_expensive.slt

@@ -0,0 +1,75 @@
+# Copyright Materialize, Inc. and contributors. All rights reserved.
+#
+# Use of this software is governed by the Business Source License
+# included in the LICENSE file at the root of this repository.
+#
+# As of the Change Date specified in that file, in accordance with
+# the Business Source License, use of this software will be governed
+# by the Apache License, Version 2.0.
+
+# Test auto-routing to mz_catalog_server
+
+mode cockroach
+
+reset-server
+
+query T multiline
+EXPLAIN OPTIMIZED PLAN WITH(humanized expressions) AS VERBOSE TEXT FOR
+SELECT 1
+----
+Explained Query (fast path):
+  Constant
+    - (1)
+
+Target cluster: mz_catalog_server
+
+EOF
+
+query T multiline
+EXPLAIN OPTIMIZED PLAN WITH(humanized expressions) AS VERBOSE TEXT FOR
+SELECT 1 / 1
+----
+Explained Query (fast path):
+  Constant
+    - (1)
+
+Target cluster: quickstart
+
+EOF
+
+query T multiline
+EXPLAIN OPTIMIZED PLAN WITH(humanized expressions) AS VERBOSE TEXT FOR
+(SELECT 1) UNION ALL (SELECT 1 + 2)
+----
+Explained Query (fast path):
+  Constant
+    - (1)
+    - (3)
+
+Target cluster: quickstart
+
+EOF
+
+query T multiline
+EXPLAIN OPTIMIZED PLAN WITH(humanized expressions) AS VERBOSE TEXT FOR
+SELECT 1 WHERE EXISTS (SELECT 1 + 2)
+----
+Explained Query (fast path):
+  Constant
+    - (1)
+
+Target cluster: quickstart
+
+EOF
+
+query T multiline
+EXPLAIN OPTIMIZED PLAN WITH(humanized expressions) AS VERBOSE TEXT FOR
+SELECT 1 WHERE (SELECT 1 + 2) > 0
+----
+Explained Query (fast path):
+  Constant
+    - (1)
+
+Target cluster: quickstart
+
+EOF

test/sqllogictest/explain/physical_plan_as_text.slt

@@ -1650,7 +1650,7 @@ SELECT * FROM (
 Explained Query (fast path):
   Constant <empty>
 
-Target cluster: mz_catalog_server
+Target cluster: quickstart
 
 EOF
 

test/sqllogictest/explain/physical_plan_as_text_redacted.slt

@@ -1635,7 +1635,7 @@ SELECT * FROM (
 Explained Query (fast path):
   Constant <empty>
 
-Target cluster: mz_catalog_server
+Target cluster: quickstart
 
 EOF
 

test/sqllogictest/explain/raw_plan_as_text.slt

@@ -329,7 +329,7 @@ Return
     Get l0
     Get l1
 
-Target cluster: mz_catalog_server
+Target cluster: quickstart
 
 EOF
 

test/sqllogictest/transform/normalize_lets.slt

@@ -75,7 +75,7 @@ SELECT * FROM foo;
 Explained Query (fast path):
   Constant <empty>
 
-Target cluster: mz_catalog_server
+Target cluster: quickstart
 
 EOF
 
@@ -262,7 +262,7 @@ Explained Query:
   Return
     Get l0
 
-Target cluster: mz_catalog_server
+Target cluster: quickstart
 
 EOF
 
@@ -289,7 +289,7 @@ Explained Query:
   Return
     Get l0
 
-Target cluster: mz_catalog_server
+Target cluster: quickstart
 
 EOF
 
@@ -316,7 +316,7 @@ Explained Query:
   Return
     Get l0
 
-Target cluster: mz_catalog_server
+Target cluster: quickstart
 
 EOF
 
@@ -339,7 +339,7 @@ SELECT * FROM (
 Explained Query (fast path):
   Constant <empty>
 
-Target cluster: mz_catalog_server
+Target cluster: quickstart
 
 EOF
 
@@ -363,7 +363,7 @@ SELECT * FROM (
 Explained Query (fast path):
   Constant <empty>
 
-Target cluster: mz_catalog_server
+Target cluster: quickstart
 
 EOF