Jackie-Jiang commented on code in PR #16728:
URL: https://github.com/apache/pinot/pull/16728#discussion_r2360840520
##########
pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultiStageBrokerRequestHandler.java:
##########
@@ -304,23 +294,34 @@ protected BrokerResponse handleRequestThrowing(long
requestId, String query, Sql
throws QueryException, WebApplicationException {
_queryLogger.log(requestId, query);
+ String cid = extractClientRequestId(sqlNodeAndOptions);
+ if (cid == null) {
+ cid = Long.toString(requestId);
+ }
Map<String, String> options = sqlNodeAndOptions.getOptions();
- long queryTimeoutMs = getTimeout(options);
- QueryThreadContext.setActiveDeadlineMs(System.currentTimeMillis() +
queryTimeoutMs);
- QueryThreadContext.setPassiveDeadlineMs(System.currentTimeMillis() +
queryTimeoutMs + getPassiveTimeout(options));
-
- Timer queryTimer = new Timer(queryTimeoutMs, TimeUnit.MILLISECONDS);
-
- try (QueryEnvironment.CompiledQuery compiledQuery =
- compileQuery(requestId, query, sqlNodeAndOptions, httpHeaders,
queryTimer)) {
- AtomicBoolean rlsFiltersApplied = new AtomicBoolean(false);
- checkAuthorization(requesterIdentity, requestContext, httpHeaders,
compiledQuery, rlsFiltersApplied);
-
- if (sqlNodeAndOptions.getSqlNode().getKind() == SqlKind.EXPLAIN) {
- return explain(compiledQuery, requestId, requestContext, queryTimer);
- } else {
- return query(compiledQuery, requestId, requesterIdentity,
requestContext, httpHeaders, queryTimer,
- rlsFiltersApplied.get());
+ String workloadName =
QueryOptionsUtils.getWorkloadName(sqlNodeAndOptions.getOptions());
+ long startTimeMs = requestContext.getRequestArrivalTimeMillis();
+ long timeoutMs = getTimeoutMs(options);
+ Timer queryTimer = new Timer(timeoutMs, TimeUnit.MILLISECONDS);
+ long activeDeadlineMs = startTimeMs + timeoutMs;
+ long passiveDeadlineMs = activeDeadlineMs +
getExtraPassiveTimeoutMs(options);
+
+ QueryExecutionContext executionContext =
+ new QueryExecutionContext(QueryExecutionContext.QueryType.MSE,
requestId, cid, workloadName, startTimeMs,
+ activeDeadlineMs, passiveDeadlineMs, _brokerId, _brokerId);
+ QueryThreadContext.MseWorkerInfo mseWorkerInfo = new
QueryThreadContext.MseWorkerInfo(0, 0);
+ try (QueryThreadContext ignore = QueryThreadContext.open(executionContext,
mseWorkerInfo, _threadAccountant)) {
+ try (QueryEnvironment.CompiledQuery compiledQuery =
compileQuery(requestId, query, sqlNodeAndOptions, httpHeaders,
+ queryTimer)) {
Review Comment:
Good call
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
