You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ul...@apache.org on 2021/12/07 10:22:52 UTC
[incubator-kyuubi] branch master updated: [KYUUBI #1489] Support operation log for ExecuteScala
This is an automated email from the ASF dual-hosted git repository.
ulyssesyou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new fe31c3b [KYUUBI #1489] Support operation log for ExecuteScala
fe31c3b is described below
commit fe31c3b62ffc1d65aad4f2816b616a9d64cc38c8
Author: Kent Yao <ya...@apache.org>
AuthorDate: Tue Dec 7 18:22:41 2021 +0800
[KYUUBI #1489] Support operation log for ExecuteScala
<!--
Thanks for sending a pull request!
Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
2. If the PR is related to an issue in https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
-->
### _Why are the changes needed?_
<!--
Please clarify why the changes are needed. For instance,
1. If you add a feature, you can talk about the use case of it.
2. If you fix a bug, you can clarify why it is a bug.
-->
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
- [ ] Add screenshots for manual tests if appropriate
- [x] [Run test](https://kyuubi.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request
Closes #1518 from yaooqinn/1498.
Closes #1489
890d1561 [Kent Yao] [KYUUBI #1489] Support operation log for ExecuteScala
Authored-by: Kent Yao <ya...@apache.org>
Signed-off-by: ulysses-you <ul...@apache.org>
---
.../org/apache/kyuubi/engine/spark/operation/ExecuteScala.scala | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/ExecuteScala.scala b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/ExecuteScala.scala
index 0278cc6..d14f739 100644
--- a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/ExecuteScala.scala
+++ b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/ExecuteScala.scala
@@ -26,6 +26,7 @@ import org.apache.kyuubi.KyuubiSQLException
import org.apache.kyuubi.engine.spark.ArrayFetchIterator
import org.apache.kyuubi.engine.spark.repl.KyuubiSparkILoop
import org.apache.kyuubi.operation.OperationType
+import org.apache.kyuubi.operation.log.OperationLog
import org.apache.kyuubi.session.Session
/**
@@ -45,6 +46,9 @@ class ExecuteScala(
override val statement: String)
extends SparkOperation(OperationType.EXECUTE_STATEMENT, session) {
+ private val operationLog: OperationLog = OperationLog.createOperationLog(session, getHandle)
+ override def getOperationLog: Option[OperationLog] = Option(operationLog)
+
override protected def resultSchema: StructType = {
if (result == null || result.schema.isEmpty) {
new StructType().add("output", "string")
@@ -55,6 +59,7 @@ class ExecuteScala(
override protected def runInternal(): Unit = {
try {
+ OperationLog.setCurrentOperationLog(operationLog)
spark.sparkContext.setJobGroup(statementId, statement)
Thread.currentThread().setContextClassLoader(spark.sharedState.jarClassLoader)
repl.interpretWithRedirectOutError(statement) match {