[SPARK-15289] SQL test compilation error from merge conflict

• Type: Bug
• Status: Closed
• Priority: Blocker
• Resolution: Fixed
• Affects Version/s: 2.0.0
• Fix Version/s: 2.0.0
• Component/s: Build, SQL
• Target Version/s: 2.0.0
• Assignee: Andrew Or
• Reporter: Piotr Milanowski
• Created: 12/May/16 07:53
• Updated: 16/May/16 08:17
• Resolved: 12/May/16 16:21

Description

Spark build fails during SQL build. Concerns commit 6b69b8c0c778f4cba2b281fe3ad225dc922f82d6, but also earlier ones; build works e.g. for commit c6d23b6604e85bcddbd1fb6a2c1c3edbfd2be2c1.

Run with command:
./dev/make-distribution.sh -Pyarn -Phadoop-2.6 -Phive -Phive-thriftserver -Dhadoop.version=2.6.0 -DskipTests

Result:

[error] /home/bpol0421/various/spark/sql/core/src/test/scala/org/apache/spark/sql/internal/CatalogSuite.scala:282: not found: value sparkSession
[error]     val dbString = CatalogImpl.makeDataset(Seq(db), sparkSession).showString(10)
[error]                                                     ^
[error] /home/bpol0421/various/spark/sql/core/src/test/scala/org/apache/spark/sql/internal/CatalogSuite.scala:283: not found: value sparkSession
[error]     val tableString = CatalogImpl.makeDataset(Seq(table), sparkSession).showString(10)
[error]                                                           ^
[error] /home/bpol0421/various/spark/sql/core/src/test/scala/org/apache/spark/sql/internal/CatalogSuite.scala:284: not found: value sparkSession
[error]     val functionString = CatalogImpl.makeDataset(Seq(function), sparkSession).showString(10)
[error]                                                                 ^
[error] /home/bpol0421/various/spark/sql/core/src/test/scala/org/apache/spark/sql/internal/CatalogSuite.scala:285: not found: value sparkSession
[error]     val columnString = CatalogImpl.makeDataset(Seq(column), sparkSession).showString(10)
[error]                                                             ^