[SPARK-42465][CONNECT] ProtoToPlanTestSuite should use analyzed plans instead of parsed plans.

connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala

@@ -299,11 +299,11 @@ class PlanGenerationTestSuite extends ConnectFunSuite with BeforeAndAfterAll wit
   }
 
   test("join inner_condition") {
-    left.join(right, fn.col("a") === fn.col("a"))
+    left.alias("l").join(right.alias("r"), fn.col("l.a") === fn.col("r.a"))
   }
 
   test("join condition") {
-    left.join(right, fn.col("id") === fn.col("id"), "left_anti")
+    left.as("l").join(right.as("r"), fn.col("l.id") === fn.col("r.id"), "left_anti")
   }
 
   test("crossJoin") {
@@ -347,7 +347,7 @@ class PlanGenerationTestSuite extends ConnectFunSuite with BeforeAndAfterAll wit
   }
 
   test("colRegex") {
-    simple.select(simple.colRegex("a|id"))
+    simple.select(simple.colRegex("`a|id`"))
   }
 
   test("as string") {
@@ -428,7 +428,7 @@ class PlanGenerationTestSuite extends ConnectFunSuite with BeforeAndAfterAll wit
   }
 
   test("unionByName") {
-    simple.unionByName(right)
+    simple.drop("b").unionByName(right.drop("payload"))
   }
 
   test("unionByName allowMissingColumns") {
@@ -718,13 +718,13 @@ class PlanGenerationTestSuite extends ConnectFunSuite with BeforeAndAfterAll wit
   }
 
   columnTest("as multi") {
-    fn.col("d").as(Array("v1", "v2", "v3"))
+    fn.expr("inline(map_values(f))").as(Array("v1", "v2", "v3"))
   }
 
   columnTest("as with metadata") {
     val builder = new MetadataBuilder
-    builder.putString("comment", "modified C field")
-    fn.col("c").as("c_mod", builder.build())
+    builder.putString("comment", "modified E field")
+    fn.col("e").as("e_mod", builder.build())
   }
 
   columnTest("cast") {
@@ -772,7 +772,7 @@ class PlanGenerationTestSuite extends ConnectFunSuite with BeforeAndAfterAll wit
   }
 
   columnTest("star with target") {
-    fn.col("str.*")
+    fn.col("d.*")
   }
 
   /* Function API */

connector/connect/common/src/test/resources/query-tests/explain-results/alias_string.explain

@@ -1 +1,2 @@
-LocalRelation <empty>, [none#0L, none#1, none#2]
+SubqueryAlias fooz
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/alias_symbol.explain

@@ -1 +1,2 @@
-LocalRelation <empty>, [none#0L, none#1, none#2]
+SubqueryAlias bob
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/apply.explain

@@ -1,2 +1,2 @@
-'Project ['a]
-+- LocalRelation <empty>, [none#0L, none#1, none#2]
+Project [a#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/as_string.explain

@@ -1 +1,2 @@
-LocalRelation <empty>, [none#0L, none#1, none#2]
+SubqueryAlias foo
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/as_symbol.explain

@@ -1 +1,2 @@
-LocalRelation <empty>, [none#0L, none#1, none#2]
+SubqueryAlias bar
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/coalesce.explain

@@ -1,2 +1,2 @@
 Repartition 5, false
-+- LocalRelation <empty>, [none#0L, none#1, none#2]
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/col.explain

@@ -1,2 +1,2 @@
-'Project ['id, 'b]
-+- LocalRelation <empty>, [none#0L, none#1, none#2]
+Project [id#0L, b#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/colRegex.explain

@@ -1,2 +1,2 @@
-'Project ['a|id]
-+- LocalRelation <empty>, [none#0L, none#1, none#2]
+Project [id#0L, a#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_add.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`+`('a, 'b), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(cast(a#0 as double) + b#0) AS (a + b)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_alias.explain

@@ -1,2 +1,2 @@
-'Project ['a AS #0]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [a#0 AS b#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_and.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('and('`>`('a, 10), '`<`('b, 0.5)), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [((a#0 > 10) AND (b#0 < 0.5)) AS ((a > 10) AND (b < 0.5))#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_apply.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('f[super_duper_key], None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [f#0[super_duper_key] AS f[super_duper_key]#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_as_multi.explain

@@ -1,2 +1,3 @@
-'Project ['d AS (v1, v2, v3)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [v1#0L, v2#0, v3#0]
++- Generate inline(map_values(f#0)), false, [v1#0L, v2#0, v3#0]
+   +- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_as_with_metadata.explain

@@ -1,2 +1,2 @@
-'Project ['c AS #0]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [e#0 AS e_mod#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_asc.explain

@@ -1,2 +1,2 @@
-'Sort ['a ASC NULLS FIRST], true
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Sort [a#0 ASC NULLS FIRST], true
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_asc_nulls_first.explain

@@ -1,2 +1,2 @@
-'Sort ['a ASC NULLS FIRST], true
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Sort [a#0 ASC NULLS FIRST], true
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_asc_nulls_last.explain

@@ -1,2 +1,2 @@
-'Sort ['a ASC NULLS LAST], true
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Sort [a#0 ASC NULLS LAST], true
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_between.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('and('`>=`('a, 10), '`<=`('a, 20)), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [((a#0 >= 10) AND (a#0 <= 20)) AS ((a >= 10) AND (a <= 20))#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_bitwiseAND.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`&`('a, 255), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(a#0 & 255) AS (a & 255)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_bitwiseOR.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`|`('a, 7), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(a#0 | 7) AS (a | 7)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_bitwiseXOR.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`^`('a, 78), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(a#0 ^ 78) AS (a ^ 78)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_cast.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias(cast('a as bigint), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [cast(a#0 as bigint) AS a#0L]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_contains.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('contains('g, baz), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [Contains(g#0, baz) AS contains(g, baz)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_desc.explain

@@ -1,2 +1,2 @@
-'Sort ['b DESC NULLS LAST], true
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Sort [b#0 DESC NULLS LAST], true
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_desc_nulls_first.explain

@@ -1,2 +1,2 @@
-'Sort ['b DESC NULLS FIRST], true
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Sort [b#0 DESC NULLS FIRST], true
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_desc_nulls_last.explain

@@ -1,2 +1,2 @@
-'Sort ['b DESC NULLS LAST], true
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Sort [b#0 DESC NULLS LAST], true
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_divide.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`/`('a, 'b), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(cast(a#0 as double) / cast(b#0 as double)) AS (a / b)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_dropFields.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias(update_fields(update_fields('d, dropfield(a)), dropfield(c)), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [update_fields(d#0, dropfield(a), dropfield(c)) AS update_fields(d, dropfield(), dropfield())#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_endsWith.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('endswith('g, suffix_), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [EndsWith(g#0, suffix_) AS endswith(g, suffix_)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_eqNullSafe.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`<=>`('a, 'b), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(cast(a#0 as double) <=> b#0) AS (a <=> b)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_equals.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`=`('a, 'b), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(cast(a#0 as double) = b#0) AS (a = b)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_geq.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`>=`('a, 'b), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(cast(a#0 as double) >= b#0) AS (a >= b)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_getField.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('d[b], None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [d#0.b AS d.b#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_getItem.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('e[3], None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [e#0[3] AS e[3]#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_gt.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`>`('a, 'b), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(cast(a#0 as double) > b#0) AS (a > b)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_ilike.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('like('g, %fOb%), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [g#0 LIKE %fOb% AS g LIKE %fOb%#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_isNaN.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('isNaN('b), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [isnan(b#0) AS isnan(b)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_isNotNull.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('isNotNull('g), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [isnotnull(g#0) AS (g IS NOT NULL)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_isNull.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('isNull('g), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [isnull(g#0) AS (g IS NULL)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_isin.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('g IN (hello,world,foo), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [g#0 IN (hello,world,foo) AS (g IN (hello, world, foo))#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_leq.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`<=`('a, 'b), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(cast(a#0 as double) <= b#0) AS (a <= b)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_like.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('like('g, %bob%), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [g#0 LIKE %bob% AS g LIKE %bob%#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_lt.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`<`('a, 'b), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(cast(a#0 as double) < b#0) AS (a < b)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_modulo.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`%`('a, 10), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(a#0 % 10) AS (a % 10)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_multiply.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`*`('a, 'b), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(cast(a#0 as double) * b#0) AS (a * b)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_not.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`!`(true), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [NOT true AS (NOT true)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_not_equals.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`!`('`=`('a, 'b)), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [NOT (cast(a#0 as double) = b#0) AS (NOT (a = b))#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_or.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('or('`>`('a, 10), '`<`('b, 0.5)), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [((a#0 > 10) OR (b#0 < 0.5)) AS ((a > 10) OR (b < 0.5))#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_rlike.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('like('g, ^[0-9]*$), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [g#0 LIKE ^[0-9]*$ AS g LIKE ^[0-9]*$#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_star.explain

@@ -1,2 +1,2 @@
-'Project [*]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_star_with_target.explain

@@ -1,2 +1,2 @@
-'Project [str.*]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [d#0.id AS id#0L, d#0.a AS a#0, d#0.b AS b#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_startsWith.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('startswith('g, prefix_), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [StartsWith(g#0, prefix_) AS startswith(g, prefix_)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_substr.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('substr('g, 8, 3), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [substr(g#0, 8, 3) AS substr(g, 8, 3)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_subtract.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('`-`('a, 'b), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [(cast(a#0 as double) - b#0) AS (a - b)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_unary_minus.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias('negative(1), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [-1 AS negative(1)#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_when_otherwise.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias(CASE WHEN '`<`('a, 10) THEN low WHEN '`<`('a, 20) THEN medium ELSE high END, None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [CASE WHEN (a#0 < 10) THEN low WHEN (a#0 < 20) THEN medium ELSE high END AS CASE WHEN (a < 10) THEN low WHEN (a < 20) THEN medium ELSE high END#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/column_withField.explain

@@ -1,2 +1,2 @@
-'Project [unresolvedalias(update_fields('d, WithField(x, xq)), None)]
-+- LocalRelation <empty>, [none#0L, none#1, none#2, none#3, none#4, none#5, none#6]
+Project [update_fields(d#0, WithField(x, xq)) AS update_fields(d, WithField(xq))#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0, d#0, e#0, f#0, g#0]

connector/connect/common/src/test/resources/query-tests/explain-results/crossJoin.explain

@@ -1,3 +1,3 @@
 'Join Cross
-:- LocalRelation <empty>, [none#0L, none#1, none#2]
-+- LocalRelation <empty>, [none#0, none#1L, none#2]
+:- LocalRelation <empty>, [id#0L, a#0, b#0]
++- LocalRelation <empty>, [a#0, id#0L, payload#0]

connector/connect/common/src/test/resources/query-tests/explain-results/describe.explain

@@ -1,6 +1,6 @@
-Project [none#2, element_at(none#0, none#2, None, false) AS #0, element_at(none#1, none#2, None, false) AS #1]
-+- !Project [none#0, none#1, none#2]
-   +- Generate explode([count,mean,stddev,min,max]), false, [none#0]
-      +- !Aggregate [map(cast(count as string), cast(count(none#0L) as string), cast(mean as string), cast(avg(none#0L) as string), cast(stddev as string), cast(stddev_samp(cast(none#0L as double)) as string), cast(min as string), cast(min(none#0L) as string), cast(max as string), cast(max(none#0L) as string)) AS #0, map(cast(count as string), cast(count(none#1) as string), cast(mean as string), cast(avg(none#1) as string), cast(stddev as string), cast(stddev_samp(none#1) as string), cast(min as string), cast(min(none#1) as string), cast(max as string), cast(max(none#1) as string)) AS #1]
-         +- Project [none#0L, none#2]
-            +- LocalRelation <empty>, [none#0L, none#1, none#2]
+Project [summary#0, element_at(id#0, summary#0, None, false) AS id#0, element_at(b#0, summary#0, None, false) AS b#0]
++- Project [id#0, b#0, summary#0]
+   +- Generate explode([count,mean,stddev,min,max]), false, [summary#0]
+      +- Aggregate [map(cast(count as string), cast(count(id#0L) as string), cast(mean as string), cast(avg(id#0L) as string), cast(stddev as string), cast(stddev_samp(cast(id#0L as double)) as string), cast(min as string), cast(min(id#0L) as string), cast(max as string), cast(max(id#0L) as string)) AS id#0, map(cast(count as string), cast(count(b#0) as string), cast(mean as string), cast(avg(b#0) as string), cast(stddev as string), cast(stddev_samp(b#0) as string), cast(min as string), cast(min(b#0) as string), cast(max as string), cast(max(b#0) as string)) AS b#0]
+         +- Project [id#0L, b#0]
+            +- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/distinct.explain

@@ -1,2 +1,2 @@
-Deduplicate [none#0L, none#1, none#2]
-+- LocalRelation <empty>, [none#0L, none#1, none#2]
+Deduplicate [id#0L, a#0, b#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates.explain

@@ -1,2 +1,2 @@
-Deduplicate [none#0L, none#1, none#2]
-+- LocalRelation <empty>, [none#0L, none#1, none#2]
+Deduplicate [id#0L, a#0, b#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_names_array.explain

@@ -1,2 +1,2 @@
-Deduplicate [none#1, none#0L]
-+- LocalRelation <empty>, [none#0L, none#1, none#2]
+Deduplicate [a#0, id#0L]
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_names_seq.explain

@@ -1,2 +1,2 @@
-Deduplicate [none#1, none#2]
-+- LocalRelation <empty>, [none#0L, none#1, none#2]
+Deduplicate [a#0, b#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_varargs.explain

@@ -1,2 +1,2 @@
-Deduplicate [none#1, none#2, none#0L]
-+- LocalRelation <empty>, [none#0L, none#1, none#2]
+Deduplicate [a#0, b#0, id#0L]
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/drop_multiple_column.explain

@@ -1,2 +1,2 @@
-Project [none#1]
-+- LocalRelation <empty>, [none#0L, none#1, none#2]
+Project [a#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/drop_multiple_strings.explain

@@ -1,2 +1,2 @@
 Project
-+- LocalRelation <empty>, [none#0L, none#1, none#2]
++- LocalRelation <empty>, [id#0L, a#0, b#0]

connector/connect/common/src/test/resources/query-tests/explain-results/drop_single_column.explain

@@ -1,2 +1,2 @@
-Project [none#0L, none#1]
-+- LocalRelation <empty>, [none#0L, none#1, none#2]
+Project [id#0L, a#0]
++- LocalRelation <empty>, [id#0L, a#0, b#0]