|
@@ -40,6 +40,7 @@ import org.elasticsearch.cluster.metadata.IndexMetadata;
|
|
|
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
|
|
|
import org.elasticsearch.cluster.metadata.ProjectMetadata;
|
|
|
import org.elasticsearch.cluster.node.DiscoveryNode;
|
|
|
+import org.elasticsearch.cluster.project.ProjectResolver;
|
|
|
import org.elasticsearch.cluster.routing.RecoverySource;
|
|
|
import org.elasticsearch.cluster.routing.ShardRouting;
|
|
|
import org.elasticsearch.cluster.service.ClusterService;
|
|
@@ -227,6 +228,7 @@ public class IndicesService extends AbstractLifecycleComponent
|
|
|
private final BigArrays bigArrays;
|
|
|
private final ScriptService scriptService;
|
|
|
private final ClusterService clusterService;
|
|
|
+ private final ProjectResolver projectResolver;
|
|
|
private final Client client;
|
|
|
private final FeatureService featureService;
|
|
|
private volatile Map<String, IndexService> indices = Map.of();
|
|
@@ -298,6 +300,7 @@ public class IndicesService extends AbstractLifecycleComponent
|
|
|
this.bigArrays = builder.bigArrays;
|
|
|
this.scriptService = builder.scriptService;
|
|
|
this.clusterService = builder.clusterService;
|
|
|
+ this.projectResolver = builder.projectResolver;
|
|
|
this.client = builder.client;
|
|
|
this.featureService = builder.featureService;
|
|
|
this.idFieldDataEnabled = INDICES_ID_FIELD_DATA_ENABLED_SETTING.get(clusterService.getSettings());
|
|
@@ -1775,11 +1778,12 @@ public class IndicesService extends AbstractLifecycleComponent
|
|
|
}
|
|
|
|
|
|
public CoordinatorRewriteContextProvider getCoordinatorRewriteContextProvider(LongSupplier nowInMillis) {
|
|
|
+ final var projectId = projectResolver.getProjectId();
|
|
|
return new CoordinatorRewriteContextProvider(
|
|
|
parserConfig,
|
|
|
client,
|
|
|
nowInMillis,
|
|
|
- clusterService::state,
|
|
|
+ () -> clusterService.state().projectState(projectId),
|
|
|
this::getTimestampFieldTypeInfo
|
|
|
);
|
|
|
}
|