update after merging main

Author: fang-xing-esql

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/EsPhysicalOperationProviders.java

@@ -349,7 +349,7 @@ List<ValuesSourceReaderOperator.FieldInfo> extractFields(FieldExtractExec fieldE
         List<ValuesSourceReaderOperator.FieldInfo> fieldInfos = new ArrayList<>(attributes.size());
         Set<String> nullsFilteredFields = new HashSet<>();
         fieldExtractExec.forEachDown(EsQueryExec.class, queryExec -> {
-            QueryBuilder q = queryExec.query();
+            QueryBuilder q = queryExec.queryBuilderAndTags().get(0).query();
             if (q != null) {
                 nullsFilteredFields.addAll(nullsFilteredFieldsAfterSourceQuery(q));
             }

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/planner/EsPhysicalOperationProvidersTests.java

@@ -91,10 +91,10 @@ record TestCase(QueryBuilder query, List<String> nullsFilteredFields) {
                 IndexMode.STANDARD,
                 Map.of(),
                 List.of(),
-                testCase.query,
                 null,
                 null,
-                10
+                10,
+                List.of(new EsQueryExec.QueryBuilderAndTags(testCase.query, List.of()))
             );
             FieldExtractExec fieldExtractExec = new FieldExtractExec(
                 Source.EMPTY,