Repository: spark Updated Branches: refs/heads/master 5c6b08557 -> cddb9da07
[HOTFIX] SQL test compilation error from merge conflict Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/cddb9da0 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/cddb9da0 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/cddb9da0 Branch: refs/heads/master Commit: cddb9da074b3dfeef34b7fdb8d9a8b16513a819d Parents: 5c6b085 Author: Andrew Or <[email protected]> Authored: Tue May 10 11:46:02 2016 -0700 Committer: Andrew Or <[email protected]> Committed: Tue May 10 11:46:02 2016 -0700 ---------------------------------------------------------------------- .../scala/org/apache/spark/sql/internal/CatalogSuite.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/cddb9da0/sql/core/src/test/scala/org/apache/spark/sql/internal/CatalogSuite.scala ---------------------------------------------------------------------- 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 56f848b..d8a2c38 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)) } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
