From d53c6b7004922b1035ef55040c2853893517765b Mon Sep 17 00:00:00 2001
From: Gengliang Wang <gengliang@apache.org>
Date: Thu, 5 Jan 2023 21:03:16 -0800
Subject: [PATCH] move test case

---
 .../org/apache/spark/sql/SQLQuerySuite.scala  | 39 -------------------
 .../sql/connector/MetadataColumnSuite.scala   | 39 +++++++++++++++++++
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
index b1b3ec97d1e6e..3d171a04cafad 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
@@ -4596,45 +4596,6 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
       sql("SELECT /*+ hash(t2) */ * FROM t1 join t2 on c1 = c2")
     }
   }
-
-  test("SPARK-41538: Metadata column should be appended at the end of project") {
-    val tableName = "table_1"
-    val viewName = "view_1"
-    withTable(tableName) {
-      withView(viewName) {
-        sql(s"CREATE TABLE $tableName (a ARRAY<STRING>, s STRUCT<id: STRING>) USING parquet")
-        val id = "id1"
-        sql(s"INSERT INTO $tableName values(ARRAY('a'), named_struct('id', '$id'))")
-        sql(
-          s"""
-             |CREATE VIEW $viewName (id)
-             |AS WITH source AS (
-             |    SELECT * FROM $tableName
-             |),
-             |renamed AS (
-             |    SELECT s.id FROM source
-             |)
-             |SELECT id FROM renamed
-             |""".stripMargin)
-        val query =
-          s"""
-             |with foo AS (
-             |  SELECT '$id' as id
-             |),
-             |bar AS (
-             |  SELECT '$id' as id
-             |)
-             |SELECT
-             |  1
-             |FROM foo
-             |FULL OUTER JOIN bar USING(id)
-             |FULL OUTER JOIN $viewName USING(id)
-             |WHERE foo.id IS NOT NULL
-             |""".stripMargin
-        checkAnswer(sql(query), Row(1))
-      }
-    }
-  }
 }
 
 case class Foo(bar: Option[String])
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/connector/MetadataColumnSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/connector/MetadataColumnSuite.scala
index 2fd3c2b105d7a..4f617bc707b60 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/connector/MetadataColumnSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/connector/MetadataColumnSuite.scala
@@ -348,6 +348,45 @@ class MetadataColumnSuite extends DatasourceV2SQLBase {
       assert(df.union(fieldNameMismatchDf).queryExecution.analyzed.metadataOutput.isEmpty)
     }
   }
+
+  test("SPARK-41538: Metadata column should be appended at the end of project") {
+    val tableName = "table_1"
+    val viewName = "view_1"
+    withTable(tableName) {
+      withView(viewName) {
+        sql(s"CREATE TABLE $tableName (a ARRAY<STRING>, s STRUCT<id: STRING>) USING parquet")
+        val id = "id1"
+        sql(s"INSERT INTO $tableName values(ARRAY('a'), named_struct('id', '$id'))")
+        sql(
+          s"""
+             |CREATE VIEW $viewName (id)
+             |AS WITH source AS (
+             |    SELECT * FROM $tableName
+             |),
+             |renamed AS (
+             |    SELECT s.id FROM source
+             |)
+             |SELECT id FROM renamed
+             |""".stripMargin)
+        val query =
+          s"""
+             |with foo AS (
+             |  SELECT '$id' as id
+             |),
+             |bar AS (
+             |  SELECT '$id' as id
+             |)
+             |SELECT
+             |  1
+             |FROM foo
+             |FULL OUTER JOIN bar USING(id)
+             |FULL OUTER JOIN $viewName USING(id)
+             |WHERE foo.id IS NOT NULL
+             |""".stripMargin
+        checkAnswer(sql(query), Row(1))
+      }
+    }
+  }
 }
 
 class MetadataTestTable(