diff options
| author | Andrew Or <andrew@databricks.com> | 2016-05-10 11:46:02 -0700 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2016-05-10 11:46:02 -0700 |
| commit | cddb9da074b3dfeef34b7fdb8d9a8b16513a819d (patch) | |
| tree | ff91ca0ebd54c02fe9f5d5bd8b89fef8fa52044a | |
| parent | 5c6b0855787c080d3e233eb09c05c025395e7cb3 (diff) | |
| download | spark-cddb9da074b3dfeef34b7fdb8d9a8b16513a819d.tar.gz spark-cddb9da074b3dfeef34b7fdb8d9a8b16513a819d.tar.bz2 spark-cddb9da074b3dfeef34b7fdb8d9a8b16513a819d.zip | |
[HOTFIX] SQL test compilation error from merge conflict
| -rw-r--r-- | sql/core/src/test/scala/org/apache/spark/sql/internal/CatalogSuite.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/internal/CatalogSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/internal/CatalogSuite.scala index 56f848b9a9..d8a2c3821b 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/internal/CatalogSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/internal/CatalogSuite.scala @@ -279,10 +279,10 @@ class CatalogSuite assert(tableFields == Seq("nama", "databasa", "descripta", "typa", false)) assert(functionFields == Seq("nama", "descripta", "classa", false)) assert(columnFields == Seq("nama", "descripta", "typa", false, true, true)) - val dbString = CatalogImpl.makeDataset(Seq(db), sparkSession).showString(10) - val tableString = CatalogImpl.makeDataset(Seq(table), sparkSession).showString(10) - val functionString = CatalogImpl.makeDataset(Seq(function), sparkSession).showString(10) - val columnString = CatalogImpl.makeDataset(Seq(column), sparkSession).showString(10) + val dbString = CatalogImpl.makeDataset(Seq(db), spark).showString(10) + val tableString = CatalogImpl.makeDataset(Seq(table), spark).showString(10) + val functionString = CatalogImpl.makeDataset(Seq(function), spark).showString(10) + val columnString = CatalogImpl.makeDataset(Seq(column), spark).showString(10) dbFields.foreach { f => assert(dbString.contains(f.toString)) } tableFields.foreach { f => assert(tableString.contains(f.toString)) } functionFields.foreach { f => assert(functionString.contains(f.toString)) } |