[
https://issues.apache.org/jira/browse/HIVE-23814?focusedWorklogId=457510&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-457510
]
ASF GitHub Bot logged work on HIVE-23814:
-----------------------------------------
Author: ASF GitHub Bot
Created on: 11/Jul/20 04:31
Start Date: 11/Jul/20 04:31
Worklog Time Spent: 10m
Work Description: pvary commented on a change in pull request #1222:
URL: https://github.com/apache/hive/pull/1222#discussion_r453154061
##########
File path: ql/src/java/org/apache/hadoop/hive/ql/Driver.java
##########
@@ -139,205 +119,215 @@ public Driver(QueryState queryState, QueryInfo
queryInfo, HiveTxnManager txnMana
driverTxnHandler = new DriverTxnHandler(this, driverContext, driverState);
}
- /**
- * Compile a new query, but potentially reset taskID counter. Not resetting
task counter
- * is useful for generating re-entrant QL queries.
- * @param command The HiveQL query to compile
- * @param resetTaskIds Resets taskID counter if true.
- * @return 0 for ok
- */
- public int compile(String command, boolean resetTaskIds) {
- try {
- compile(command, resetTaskIds, false);
- return 0;
- } catch (CommandProcessorException cpr) {
- return cpr.getErrorCode();
- }
+ @Override
+ public Context getContext() {
+ return context;
}
- // deferClose indicates if the close/destroy should be deferred when the
process has been
- // interrupted, it should be set to true if the compile is called within
another method like
- // runInternal, which defers the close to the called in that method.
- @VisibleForTesting
- public void compile(String command, boolean resetTaskIds, boolean
deferClose) throws CommandProcessorException {
- preparForCompile(resetTaskIds);
-
- Compiler compiler = new Compiler(context, driverContext, driverState);
- QueryPlan plan = compiler.compile(command, deferClose);
- driverContext.setPlan(plan);
-
- compileFinished(deferClose);
+ @Override
+ public HiveConf getConf() {
+ return driverContext.getConf();
}
- private void compileFinished(boolean deferClose) {
- if (DriverState.getDriverState().isAborted() && !deferClose) {
- closeInProcess(true);
- }
+ @Override
+ public CommandProcessorResponse run() throws CommandProcessorException {
+ return run(null, true);
}
- private void preparForCompile(boolean resetTaskIds) throws
CommandProcessorException {
- driverTxnHandler.createTxnManager();
- DriverState.setDriverState(driverState);
- prepareContext();
- setQueryId();
+ @Override
+ public CommandProcessorResponse run(String command) throws
CommandProcessorException {
+ return run(command, false);
+ }
- if (resetTaskIds) {
- TaskFactory.resetId();
+ private CommandProcessorResponse run(String command, boolean
alreadyCompiled) throws CommandProcessorException {
+ try {
+ runInternal(command, alreadyCompiled);
+ return new CommandProcessorResponse(getSchema(), null);
+ } catch (CommandProcessorException cpe) {
+ processRunException(cpe);
+ throw cpe;
}
}
- private void prepareContext() throws CommandProcessorException {
- if (context != null && context.getExplainAnalyze() !=
AnalyzeState.RUNNING) {
- // close the existing ctx etc before compiling a new query, but does not
destroy driver
- closeInProcess(false);
- }
+ private void runInternal(String command, boolean alreadyCompiled) throws
CommandProcessorException {
+ DriverState.setDriverState(driverState);
+ setInitialStateForRun(alreadyCompiled);
+ // a flag that helps to set the correct driver state in finally block by
tracking if
+ // the method has been returned by an error or not.
+ boolean isFinishedWithError = true;
try {
- if (context == null) {
- context = new Context(driverContext.getConf());
+ HiveDriverRunHookContext hookContext = new
HiveDriverRunHookContextImpl(driverContext.getConf(),
+ alreadyCompiled ? context.getCmd() : command);
+ runPreDriverHooks(hookContext);
+
+ if (!alreadyCompiled) {
+ compileInternal(command, true);
+ } else {
+
driverContext.getPlan().setQueryStartTime(driverContext.getQueryDisplay().getQueryStartTime());
}
- } catch (IOException e) {
- throw new CommandProcessorException(e);
- }
- context.setHiveTxnManager(driverContext.getTxnManager());
- context.setStatsSource(driverContext.getStatsSource());
- context.setHDFSCleanup(true);
+ // Reset the PerfLogger so that it doesn't retain any previous values.
+ // Any value from compilation phase can be obtained through the map set
in queryDisplay during compilation.
+ PerfLogger perfLogger = SessionState.getPerfLogger(true);
- driverTxnHandler.setContext(context);
- }
+ // the reason that we set the txn manager for the cxt here is because
each query has its own ctx object.
+ // The txn mgr is shared across the same instance of Driver, which can
run multiple queries.
+ context.setHiveTxnManager(driverContext.getTxnManager());
- private void setQueryId() {
- String queryId =
Strings.isNullOrEmpty(driverContext.getQueryState().getQueryId()) ?
- QueryPlan.makeQueryId() : driverContext.getQueryState().getQueryId();
+ DriverUtils.checkInterrupted(driverState, driverContext, "at acquiring
the lock.", null, null);
- SparkSession ss = SessionState.get().getSparkSession();
- if (ss != null) {
- ss.onQuerySubmission(queryId);
- }
- driverContext.getQueryDisplay().setQueryId(queryId);
+ lockAndRespond();
+ validateTxnListState();
+ execute();
+ driverTxnHandler.handleTransactionAfterExecution();
- setTriggerContext(queryId);
- }
+
driverContext.getQueryDisplay().setPerfLogStarts(QueryDisplay.Phase.EXECUTION,
perfLogger.getStartTimes());
+
driverContext.getQueryDisplay().setPerfLogEnds(QueryDisplay.Phase.EXECUTION,
perfLogger.getEndTimes());
- private void setTriggerContext(String queryId) {
- long queryStartTime;
- // query info is created by SQLOperation which will have start time of the
operation. When JDBC Statement is not
- // used queryInfo will be null, in which case we take creation of Driver
instance as query start time (which is also
- // the time when query display object is created)
- if (driverContext.getQueryInfo() != null) {
- queryStartTime = driverContext.getQueryInfo().getBeginTime();
- } else {
- queryStartTime = driverContext.getQueryDisplay().getQueryStartTime();
+ runPostDriverHooks(hookContext);
+ isFinishedWithError = false;
+ } finally {
+ if (driverState.isAborted()) {
+ closeInProcess(true);
+ } else {
+ releaseResources();
Review comment:
Putting this to the "else" part seems counterintuitive for me
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 457510)
Time Spent: 50m (was: 40m)
> Clean up Driver
> ---------------
>
> Key: HIVE-23814
> URL: https://issues.apache.org/jira/browse/HIVE-23814
> Project: Hive
> Issue Type: Sub-task
> Components: Hive
> Reporter: Miklos Gergely
> Assignee: Miklos Gergely
> Priority: Major
> Labels: pull-request-available
> Time Spent: 50m
> Remaining Estimate: 0h
>
> Driver is now cut down to it's minimal size by extracting all of it's sub
> tasks to separate classes. The rest should be cleaned up by
> * moving out some smaller parts of the code to sub task and utility classes
> wherever it is still possible
> * cut large functions to meaningful and manageable parts
> * re-order the functions to follow the order of processing
> * fix checkstyle issues
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
