fix bug when transition status from "CLOSED" to "FINISHED"

cenyuhai · cenyuhai · commit 501d121cd385 · 2016-12-06T17:30:56.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
@@ -262,14 +262,24 @@ private[hive] class SparkExecuteStatementOperation(
           case OperationState.CANCELED =>
           case OperationState.FINISHED =>
           case OperationState.CLOSED =>
+          case OperationState.ERROR =>
           case _ =>
             setState(OperationState.ERROR)
         }
 
         throw new HiveSQLException(e.toString)
     }
-    setState(OperationState.FINISHED)
     HiveThriftServer2.listener.onStatementFinish(statementId)
+    getStatus().getState() match {
+      case OperationState.INITIALIZED =>
+        setState(OperationState.CLOSED)
+      case OperationState.CANCELED =>
+      case OperationState.FINISHED =>
+      case OperationState.CLOSED =>
+      case OperationState.ERROR =>
+      case _ =>
+        setState(OperationState.FINISHED)
+    }
   }
 
   override def cancel(): Unit = {
