resolve conflict

Ngone51 · Ngone51 · commit d46d6db67801 · 2019-12-05T22:17:09.000+08:00
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveMetastoreCatalogSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveMetastoreCatalogSuite.scala
@@ -46,7 +46,7 @@ class HiveMetastoreCatalogSuite extends TestHiveSingleton with SQLTestUtils {
   test("duplicated metastore relations") {
     val df = spark.sql("SELECT * FROM src")
     logInfo(df.queryExecution.toString)
-    df.as('a).join(df.as('b), $"a.key" === $"b.key")
+    df.as("a").join(df.as("b"), $"a.key" === $"b.key")
   }
 
   test("should not truncate struct type catalog string") {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class HiveMetastoreCatalogSuite extends TestHiveSingleton with SQLTestUtils {`
`46`	`46`	`test("duplicated metastore relations") {`
`47`	`47`	`val df = spark.sql("SELECT * FROM src")`
`48`	`48`	`logInfo(df.queryExecution.toString)`
`49`		`- df.as('a).join(df.as('b), $"a.key" === $"b.key")`
	`49`	`+ df.as("a").join(df.as("b"), $"a.key" === $"b.key")`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`test("should not truncate struct type catalog string") {`