Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit 0ea2d8c

Browse files
zouchenjungatorsmile
authored andcommitted
[SPARK-22496][SQL] thrift server adds operation logs
## What changes were proposed in this pull request? since hive 2.0+ upgrades log4j to log4j2,a lot of [changes](https://issues.apache.org/jira/browse/HIVE-11304) are made working on it. as spark is not to ready to update its inner hive version(1.2.1) , so I manage to make little changes. the function registerCurrentOperationLog is moved from SQLOperstion to its parent class ExecuteStatementOperation so spark can use it. ## How was this patch tested? manual test Closes apache#19721 from ChenjunZou/operation-log. Author: zouchenjun <zouchenjun@youzan.com> Closes apache#19961 from ChenjunZou/spark-22496.
1 parent 59daf91 commit 0ea2d8c

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/operation/ExecuteStatementOperation.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import org.apache.hadoop.hive.ql.processors.CommandProcessor;
2525
import org.apache.hadoop.hive.ql.processors.CommandProcessorFactory;
26+
import org.apache.hadoop.hive.ql.session.OperationLog;
2627
import org.apache.hive.service.cli.HiveSQLException;
2728
import org.apache.hive.service.cli.OperationType;
2829
import org.apache.hive.service.cli.session.HiveSession;
@@ -67,4 +68,16 @@ protected void setConfOverlay(Map<String, String> confOverlay) {
6768
this.confOverlay = confOverlay;
6869
}
6970
}
71+
72+
protected void registerCurrentOperationLog() {
73+
if (isOperationLogEnabled) {
74+
if (operationLog == null) {
75+
LOG.warn("Failed to get current OperationLog object of Operation: " +
76+
getHandle().getHandleIdentifier());
77+
isOperationLogEnabled = false;
78+
return;
79+
}
80+
OperationLog.setCurrentOperationLog(operationLog);
81+
}
82+
}
7083
}

sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/operation/SQLOperation.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -274,18 +274,6 @@ private Hive getSessionHive() throws HiveSQLException {
274274
}
275275
}
276276

277-
private void registerCurrentOperationLog() {
278-
if (isOperationLogEnabled) {
279-
if (operationLog == null) {
280-
LOG.warn("Failed to get current OperationLog object of Operation: " +
281-
getHandle().getHandleIdentifier());
282-
isOperationLogEnabled = false;
283-
return;
284-
}
285-
OperationLog.setCurrentOperationLog(operationLog);
286-
}
287-
}
288-
289277
private void cleanup(OperationState state) throws HiveSQLException {
290278
setState(state);
291279
if (shouldRunAsync()) {

sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkExecuteStatementOperation.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ private[hive] class SparkExecuteStatementOperation(
170170
override def run(): Unit = {
171171
val doAsAction = new PrivilegedExceptionAction[Unit]() {
172172
override def run(): Unit = {
173+
registerCurrentOperationLog()
173174
try {
174175
execute()
175176
} catch {

0 commit comments

Comments
 (0)