diff options
| author | Michael Armbrust <michael@databricks.com> | 2014-07-25 15:36:57 -0700 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2014-07-25 15:36:57 -0700 |
| commit | afd757a241f41d7f8c458ef8f1f9ce8ed12986e5 (patch) | |
| tree | 136e49b3392763acd5f952b70a50137cb96e9c75 /sql/catalyst | |
| parent | 37ad3b724590dcf42bcdbfaf91b7a11914501945 (diff) | |
| download | spark-afd757a241f41d7f8c458ef8f1f9ce8ed12986e5.tar.gz spark-afd757a241f41d7f8c458ef8f1f9ce8ed12986e5.tar.bz2 spark-afd757a241f41d7f8c458ef8f1f9ce8ed12986e5.zip | |
Revert "[SPARK-2410][SQL] Merging Hive Thrift/JDBC server"
This reverts commit 06dc0d2c6b69c5d59b4d194ced2ac85bfe2e05e2.
#1399 is making Jenkins fail. We should investigate and put this back after its passing tests.
Author: Michael Armbrust <michael@databricks.com>
Closes #1594 from marmbrus/revertJDBC and squashes the following commits:
59748da [Michael Armbrust] Revert "[SPARK-2410][SQL] Merging Hive Thrift/JDBC server"
Diffstat (limited to 'sql/catalyst')
| -rw-r--r-- | sql/catalyst/pom.xml | 2 | ||||
| -rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/commands.scala | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 531bfddbf2..6decde3fcd 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -32,7 +32,7 @@ <name>Spark Project Catalyst</name> <url>http://spark.apache.org/</url> <properties> - <sbt.project.name>catalyst</sbt.project.name> + <sbt.project.name>catalyst</sbt.project.name> </properties> <dependencies> diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/commands.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/commands.scala index a357c6ffb8..1d5f033f0d 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/commands.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/commands.scala @@ -43,7 +43,8 @@ case class NativeCommand(cmd: String) extends Command { */ case class SetCommand(key: Option[String], value: Option[String]) extends Command { override def output = Seq( - BoundReference(1, AttributeReference("", StringType, nullable = false)())) + BoundReference(0, AttributeReference("key", StringType, nullable = false)()), + BoundReference(1, AttributeReference("value", StringType, nullable = false)())) } /** |