Skip to content

Commit f6cb5d9

Browse files
committed
Perform premapping after optimization so FTFs can be optimized before the query builder is retrieved
1 parent 0e049ae commit f6cb5d9

File tree

1 file changed

+3
-2
lines changed
  • x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session

1 file changed

+3
-2
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlSession.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,11 @@ public void execute(EsqlQueryRequest request, EsqlExecutionInfo executionInfo, P
184184
new EsqlCCSUtils.CssPartialErrorsActionListener(executionInfo, listener) {
185185
@Override
186186
public void onResponse(LogicalPlan analyzedPlan) {
187+
LogicalPlan optimizedPlan = optimizedPlan(analyzedPlan);
187188
preMapper.preMapper(
188-
analyzedPlan,
189+
optimizedPlan,
189190
listener.delegateFailureAndWrap(
190-
(l, p) -> executeOptimizedPlan(request, executionInfo, planRunner, optimizedPlan(p), l)
191+
(l, p) -> executeOptimizedPlan(request, executionInfo, planRunner, p, l)
191192
)
192193
);
193194
}

0 commit comments

Comments
 (0)