change statement state by the current state

cenyuhai · cenyuhai · commit 196ab66af1e7 · 2016-12-02T13:54:23.000+08:00
diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkExecuteStatementOperation.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkExecuteStatementOperation.scala
@@ -254,9 +254,17 @@ private[hive] class SparkExecuteStatementOperation(
       case e: Throwable =>
         val currentState = getStatus().getState()
         logError(s"Error executing query, currentState $currentState, ", e)
-        setState(OperationState.ERROR)
         HiveThriftServer2.listener.onStatementError(
           statementId, e.getMessage, SparkUtils.exceptionString(e))
+        getStatus().getState() match {
+          case OperationState.INITIALIZED =>
+            setState(OperationState.CLOSED)
+          case OperationState.CANCELED =>
+          case OperationState.FINISHED =>
+          case _ =>
+            setState(OperationState.ERROR)
+        }
+
         throw new HiveSQLException(e.toString)
     }
     setState(OperationState.FINISHED)
