diff options
| author | Cheng Lian <lian.cs.zju@gmail.com> | 2014-07-28 12:07:30 -0700 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2014-07-28 12:07:30 -0700 |
| commit | a7a9d14479ea6421513a962ff0f45cb969368bab (patch) | |
| tree | 76c4ec208e31cabea38e6e2ec6deaa7667dbf46a /sql/catalyst | |
| parent | 255b56f9f530e8594a7e6055ae07690454c66799 (diff) | |
| download | spark-a7a9d14479ea6421513a962ff0f45cb969368bab.tar.gz spark-a7a9d14479ea6421513a962ff0f45cb969368bab.tar.bz2 spark-a7a9d14479ea6421513a962ff0f45cb969368bab.zip | |
[SPARK-2410][SQL] Merging Hive Thrift/JDBC server (with Maven profile fix)
JIRA issue: [SPARK-2410](https://issues.apache.org/jira/browse/SPARK-2410)
Another try for #1399 & #1600. Those two PR breaks Jenkins builds because we made a separate profile `hive-thriftserver` in sub-project `assembly`, but the `hive-thriftserver` module is defined outside the `hive-thriftserver` profile. Thus every time a pull request that doesn't touch SQL code will also execute test suites defined in `hive-thriftserver`, but tests fail because related .class files are not included in the assembly jar.
In the most recent commit, module `hive-thriftserver` is moved into its own profile to fix this problem. All previous commits are squashed for clarity.
Author: Cheng Lian <lian.cs.zju@gmail.com>
Closes #1620 from liancheng/jdbc-with-maven-fix and squashes the following commits:
629988e [Cheng Lian] Moved hive-thriftserver module definition into its own profile
ec3c7a7 [Cheng Lian] Cherry picked the Hive Thrift 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, 2 insertions, 3 deletions
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 6decde3fcd..531bfddbf2 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 1d5f033f0d..a357c6ffb8 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,8 +43,7 @@ case class NativeCommand(cmd: String) extends Command { */ case class SetCommand(key: Option[String], value: Option[String]) extends Command { override def output = Seq( - BoundReference(0, AttributeReference("key", StringType, nullable = false)()), - BoundReference(1, AttributeReference("value", StringType, nullable = false)())) + BoundReference(1, AttributeReference("", StringType, nullable = false)())) } /** |