merge fixes

Author: shmuelhanoch

server/src/main/resources/transport/definitions/referable/esql_long_ranges.csv

@@ -1 +1 @@
-9226000
+9230000

server/src/main/resources/transport/upper_bounds/9.3.csv

@@ -1 +1 @@
-ingest_request_dynamic_template_params,9229000
+esql_long_ranges,9230000

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

@@ -879,6 +879,7 @@ private void preAnalyzeMainIndices(
                 indexMode == IndexMode.TIME_SERIES,
                 preAnalysis.useAggregateMetricDoubleWhenNotSupported(),
                 preAnalysis.useDenseVectorWhenNotSupported(),
+                preAnalysis.useDateRangeWhenNotSupported(),
                 indicesExpressionGrouper,
                 listener.delegateFailureAndWrap((l, indexResolution) -> {
                     EsqlCCSUtils.updateExecutionInfoWithUnavailableClusters(executionInfo, indexResolution.inner().failures());
@@ -909,6 +910,7 @@ private void preAnalyzeFlatMainIndices(
             indexMode == IndexMode.TIME_SERIES,
             preAnalysis.useAggregateMetricDoubleWhenNotSupported(),
             preAnalysis.useDenseVectorWhenNotSupported(),
+            preAnalysis.useDateRangeWhenNotSupported(),
             listener.delegateFailureAndWrap((l, indexResolution) -> {
                 EsqlCCSUtils.initCrossClusterState(indexResolution.inner().get(), executionInfo);
                 EsqlCCSUtils.updateExecutionInfoWithUnavailableClusters(executionInfo, indexResolution.inner().failures());

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

@@ -107,6 +107,7 @@ public void resolveIndices(String indexPattern, Set<String> fieldNames, ActionLi
             indexPattern,
             false,
             false,
+            false,
             DO_NOT_GROUP,
             listener.map(Versioned::inner)
         );
@@ -157,6 +158,7 @@ public void resolveFlatWorldIndicesVersioned(
             indexPattern,
             useAggregateMetricDoubleWhenNotSupported,
             useDenseVectorWhenNotSupported,
+            useDateRangeWhenNotSupported,
             (indexPattern1, fieldCapabilitiesResponse) -> Maps.transformValues(
                 EsqlResolvedIndexExpression.from(fieldCapabilitiesResponse),
                 v -> List.copyOf(v.expression())
@@ -170,6 +172,7 @@ private void doResolveIndices(
         String indexPattern,
         boolean useAggregateMetricDoubleWhenNotSupported,
         boolean useDenseVectorWhenNotSupported,
+        boolean useDateRangeWhenNotSupported,
         OriginalIndexExtractor originalIndexExtractor,
         ActionListener<Versioned<IndexResolution>> listener
     ) {
@@ -180,10 +183,10 @@ private void doResolveIndices(
                 Build.current().isSnapshot(),
                 useAggregateMetricDoubleWhenNotSupported,
                 useDenseVectorWhenNotSupported,
-                    useDateRangeWhenNotSupported
-                );
-                LOGGER.debug("minimum transport version {} {}", response.caps().minTransportVersion(), info.effectiveMinTransportVersion());
-                l.onResponse(new Versioned<>(mergedMappings(indexPattern, info, originalIndexExtractor), info.effectiveMinTransportVersion()));
+                useDateRangeWhenNotSupported
+            );
+            LOGGER.debug("minimum transport version {} {}", response.caps().minTransportVersion(), info.effectiveMinTransportVersion());
+            l.onResponse(new Versioned<>(mergedMappings(indexPattern, info, originalIndexExtractor), info.effectiveMinTransportVersion()));
         }));
     }