forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into kderusso/query-rules-type-stats
- Loading branch information
Showing
751 changed files
with
13,985 additions
and
6,155 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,6 @@ BWC_VERSION: | |
| - "8.13.4" | ||
| - "8.14.3" | ||
| - "8.15.4" | ||
| - "8.16.0" | ||
| - "8.16.1" | ||
| - "8.17.0" | ||
| - "9.0.0" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| BWC_VERSION: | ||
| - "8.15.4" | ||
| - "8.16.0" | ||
| - "8.16.1" | ||
| - "8.17.0" | ||
| - "9.0.0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 133 additions & 0 deletions
133
.../org/elasticsearch/benchmark/indices/resolution/IndexNameExpressionResolverBenchmark.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.benchmark.indices.resolution; | ||
|
|
||
| import org.elasticsearch.action.IndicesRequest; | ||
| import org.elasticsearch.action.support.IndicesOptions; | ||
| import org.elasticsearch.cluster.ClusterName; | ||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.cluster.metadata.DataStream; | ||
| import org.elasticsearch.cluster.metadata.IndexMetadata; | ||
| import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; | ||
| import org.elasticsearch.cluster.metadata.Metadata; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.util.concurrent.ThreadContext; | ||
| import org.elasticsearch.index.Index; | ||
| import org.elasticsearch.index.IndexVersion; | ||
| import org.elasticsearch.indices.SystemIndices; | ||
| import org.openjdk.jmh.annotations.Benchmark; | ||
| import org.openjdk.jmh.annotations.BenchmarkMode; | ||
| import org.openjdk.jmh.annotations.Fork; | ||
| import org.openjdk.jmh.annotations.Mode; | ||
| import org.openjdk.jmh.annotations.OutputTimeUnit; | ||
| import org.openjdk.jmh.annotations.Param; | ||
| import org.openjdk.jmh.annotations.Scope; | ||
| import org.openjdk.jmh.annotations.Setup; | ||
| import org.openjdk.jmh.annotations.State; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| @State(Scope.Benchmark) | ||
| @Fork(3) | ||
| @BenchmarkMode(Mode.AverageTime) | ||
| @OutputTimeUnit(TimeUnit.MILLISECONDS) | ||
| @SuppressWarnings("unused") // invoked by benchmarking framework | ||
| public class IndexNameExpressionResolverBenchmark { | ||
|
|
||
| private static final String DATA_STREAM_PREFIX = "my-ds-"; | ||
| private static final String INDEX_PREFIX = "my-index-"; | ||
|
|
||
| @Param( | ||
| { | ||
| // # data streams | # indices | ||
| " 1000| 100", | ||
| " 5000| 500", | ||
| " 10000| 1000" } | ||
| ) | ||
| public String resourceMix = "100|10"; | ||
|
|
||
| @Setup | ||
| public void setUp() { | ||
| final String[] params = resourceMix.split("\\|"); | ||
|
|
||
| int numDataStreams = toInt(params[0]); | ||
| int numIndices = toInt(params[1]); | ||
|
|
||
| Metadata.Builder mb = Metadata.builder(); | ||
| String[] indices = new String[numIndices + numDataStreams * (numIndices + 1)]; | ||
| int position = 0; | ||
| for (int i = 1; i <= numIndices; i++) { | ||
| String indexName = INDEX_PREFIX + i; | ||
| createIndexMetadata(indexName, mb); | ||
| indices[position++] = indexName; | ||
| } | ||
|
|
||
| for (int i = 1; i <= numDataStreams; i++) { | ||
| String dataStreamName = DATA_STREAM_PREFIX + i; | ||
| List<Index> backingIndices = new ArrayList<>(); | ||
| for (int j = 1; j <= numIndices; j++) { | ||
| String backingIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, j); | ||
| backingIndices.add(createIndexMetadata(backingIndexName, mb).getIndex()); | ||
| indices[position++] = backingIndexName; | ||
| } | ||
| indices[position++] = dataStreamName; | ||
| mb.put(DataStream.builder(dataStreamName, backingIndices).build()); | ||
| } | ||
| int mid = indices.length / 2; | ||
| clusterState = ClusterState.builder(ClusterName.DEFAULT).metadata(mb).build(); | ||
| resolver = new IndexNameExpressionResolver(new ThreadContext(Settings.EMPTY), new SystemIndices(List.of())); | ||
| indexListRequest = new Request(IndicesOptions.lenientExpandOpenHidden(), indices); | ||
| starRequest = new Request(IndicesOptions.lenientExpandOpenHidden(), "*"); | ||
| String[] mixed = indices.clone(); | ||
| mixed[mid] = "my-*"; | ||
| mixedRequest = new Request(IndicesOptions.lenientExpandOpenHidden(), mixed); | ||
| } | ||
|
|
||
| private IndexMetadata createIndexMetadata(String indexName, Metadata.Builder mb) { | ||
| IndexMetadata indexMetadata = IndexMetadata.builder(indexName) | ||
| .settings(Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())) | ||
| .numberOfShards(1) | ||
| .numberOfReplicas(0) | ||
| .build(); | ||
| mb.put(indexMetadata, false); | ||
| return indexMetadata; | ||
| } | ||
|
|
||
| private IndexNameExpressionResolver resolver; | ||
| private ClusterState clusterState; | ||
| private Request starRequest; | ||
| private Request indexListRequest; | ||
| private Request mixedRequest; | ||
|
|
||
| @Benchmark | ||
| public String[] resolveResourcesListToConcreteIndices() { | ||
| return resolver.concreteIndexNames(clusterState, indexListRequest); | ||
| } | ||
|
|
||
| @Benchmark | ||
| public String[] resolveAllStarToConcreteIndices() { | ||
| return resolver.concreteIndexNames(clusterState, starRequest); | ||
| } | ||
|
|
||
| @Benchmark | ||
| public String[] resolveMixedConcreteIndices() { | ||
| return resolver.concreteIndexNames(clusterState, mixedRequest); | ||
| } | ||
|
|
||
| private int toInt(String v) { | ||
| return Integer.parseInt(v.trim()); | ||
| } | ||
|
|
||
| record Request(IndicesOptions indicesOptions, String... indices) implements IndicesRequest { | ||
|
|
||
| } | ||
| } |
Oops, something went wrong.