Skip to content

Commit fe31c3b

Browse files
yaooqinnulysses-you
authored andcommitted
[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 890d156 [Kent Yao] [KYUUBI #1489] Support operation log for ExecuteScala Authored-by: Kent Yao <yao@apache.org> Signed-off-by: ulysses-you <ulyssesyou@apache.org>
1 parent 627d66b commit fe31c3b

File tree

1 file changed

+5
-0
lines changed
  • externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation

1 file changed

+5
-0
lines changed

externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/ExecuteScala.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import org.apache.kyuubi.KyuubiSQLException
2626
import org.apache.kyuubi.engine.spark.ArrayFetchIterator
2727
import org.apache.kyuubi.engine.spark.repl.KyuubiSparkILoop
2828
import org.apache.kyuubi.operation.OperationType
29+
import org.apache.kyuubi.operation.log.OperationLog
2930
import org.apache.kyuubi.session.Session
3031

3132
/**
@@ -45,6 +46,9 @@ class ExecuteScala(
4546
override val statement: String)
4647
extends SparkOperation(OperationType.EXECUTE_STATEMENT, session) {
4748

49+
private val operationLog: OperationLog = OperationLog.createOperationLog(session, getHandle)
50+
override def getOperationLog: Option[OperationLog] = Option(operationLog)
51+
4852
override protected def resultSchema: StructType = {
4953
if (result == null || result.schema.isEmpty) {
5054
new StructType().add("output", "string")
@@ -55,6 +59,7 @@ class ExecuteScala(
5559

5660
override protected def runInternal(): Unit = {
5761
try {
62+
OperationLog.setCurrentOperationLog(operationLog)
5863
spark.sparkContext.setJobGroup(statementId, statement)
5964
Thread.currentThread().setContextClassLoader(spark.sharedState.jarClassLoader)
6065
repl.interpretWithRedirectOutError(statement) match {

0 commit comments

Comments
 (0)