spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marmb...@apache.org
Subject spark git commit: [SPARK-4308][SQL] Follow up of #3175 for branch 1.1
Date Tue, 11 Nov 2014 00:57:40 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.1 86b1bd031 -> b3ef06b75


[SPARK-4308][SQL] Follow up of #3175 for branch 1.1

PR #3175 is for master branch only and can't be backported to branch 1.1 directly because
Hive 0.13.1 support.

Author: Cheng Lian <lian@databricks.com>

Closes #3176 from liancheng/fix-op-state-for-1.1 and squashes the following commits:

8791d87 [Cheng Lian] This is a follow up of #3175 for branch 1.1


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b3ef06b7
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b3ef06b7
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b3ef06b7

Branch: refs/heads/branch-1.1
Commit: b3ef06b757383754a9173e81e5179946b12c7922
Parents: 86b1bd0
Author: Cheng Lian <lian@databricks.com>
Authored: Mon Nov 10 16:57:34 2014 -0800
Committer: Michael Armbrust <michael@databricks.com>
Committed: Mon Nov 10 16:57:34 2014 -0800

----------------------------------------------------------------------
 .../sql/hive/thriftserver/server/SparkSQLOperationManager.scala     | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/b3ef06b7/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/server/SparkSQLOperationManager.scala
----------------------------------------------------------------------
diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/server/SparkSQLOperationManager.scala
b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/server/SparkSQLOperationManager.scala
index bd3f68d..b819d85 100644
--- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/server/SparkSQLOperationManager.scala
+++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/server/SparkSQLOperationManager.scala
@@ -199,6 +199,7 @@ private[thriftserver] class SparkSQLOperationManager(hiveContext: HiveContext)
           // Actually do need to catch Throwable as some failures don't inherit from Exception
and
           // HiveServer will silently swallow them.
           case e: Throwable =>
+            setState(OperationState.ERROR)
             logError("Error executing query:",e)
             throw new HiveSQLException(e.toString)
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message