apache/kyuubi
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fixes #3 handle parse exception

Browse Source
This commit is contained in:
Kent Yao 2018-03-15 20:10:38 +08:00
parent 8d3f1c7803
commit b44faa86fa
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/yaooqinn/kyuubi/operation/KyuubiOperation.scala
View File

@ -34,6 +34,7 @@ import org.apache.hive.service.cli._
import org.apache.hive.service.cli.thrift.TProtocolVersion import org.apache.hive.service.cli.thrift.TProtocolVersion
import org.apache.spark.SparkUtils import org.apache.spark.SparkUtils
import org.apache.spark.sql.{AnalysisException, DataFrame, Row, SparkSQLUtils} import org.apache.spark.sql.{AnalysisException, DataFrame, Row, SparkSQLUtils}
import org.apache.spark.sql.catalyst.parser.ParseException
import org.apache.spark.sql.types._ import org.apache.spark.sql.types._
import yaooqinn.kyuubi.Logging import yaooqinn.kyuubi.Logging
@ -381,20 +382,21 @@ class KyuubiOperation(session: KyuubiSession, statement: String) extends Logging
} catch { } catch {
case e: HiveSQLException => case e: HiveSQLException =>
if (!isClosedOrCanceled) { if (!isClosedOrCanceled) {
setState(OperationState.ERROR)
onStatementError(statementId, e.getMessage, SparkUtils.exceptionString(e)) onStatementError(statementId, e.getMessage, SparkUtils.exceptionString(e))
throw e throw e
} }
case e: AnalysisException => case e: ParseException =>
error(s"Error executing query, currentState ${getStatus.getState}, ", e) if (!isClosedOrCanceled) {
onStatementError(statementId, e.getMessage, SparkUtils.exceptionString(e))
throw new HiveSQLException(e.getMessage(), "ParseException", e)
}
case e: AnalysisException =>
if (!isClosedOrCanceled) { if (!isClosedOrCanceled) {
setState(OperationState.ERROR)
onStatementError(statementId, e.getMessage, SparkUtils.exceptionString(e)) onStatementError(statementId, e.getMessage, SparkUtils.exceptionString(e))
throw new HiveSQLException(e.getMessage(), "AnalysisException", e) throw new HiveSQLException(e.getMessage(), "AnalysisException", e)
} }
case e: Throwable => case e: Throwable =>
error(s"Error executing query, currentState ${getStatus.getState}, ", e)
if (!isClosedOrCanceled) { if (!isClosedOrCanceled) {
onStatementError(statementId, e.getMessage, SparkUtils.exceptionString(e)) onStatementError(statementId, e.getMessage, SparkUtils.exceptionString(e))
throw new HiveSQLException(e.toString) throw new HiveSQLException(e.toString)
@ -408,6 +410,7 @@ class KyuubiOperation(session: KyuubiSession, statement: String) extends Logging
private[this] def onStatementError( private[this] def onStatementError(
id: String, errorMessage: String, errorTrace: String): Unit = { id: String, errorMessage: String, errorTrace: String): Unit = {
error(s"Error executing query, currentState ${getStatus.getState}, $errorMessage")
setState(OperationState.ERROR) setState(OperationState.ERROR)
KyuubiServerMonitor.getListener(session.getUserName) KyuubiServerMonitor.getListener(session.getUserName)
.onStatementError(id, errorMessage, errorTrace) .onStatementError(id, errorMessage, errorTrace)