Handle views in ResolveIndexAction #143561
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -359,8 +359,6 @@ public IndexAbstraction resolveWriteIndexAbstraction(ProjectMetadata project, Do | |
| + " indices without one being designated as a write index" | ||
| ); | ||
| } | ||
| } | ||
| SystemResourceAccess.checkSystemIndexAccess(context, threadContext, ia.getWriteIndex()); | ||
| return ia; | ||
|
|
@@ -1524,6 +1522,13 @@ private static boolean ensureAliasOrIndexExists(Context context, String name, In | |
| throw infe; | ||
| } | ||
| } | ||
| if (indexAbstraction.getType() == Type.VIEW && context.getOptions().wildcardOptions().resolveViews() == false) { | ||
|
Contributor
Author
There was a problem hiding this comment. This skips view when targeted directly by name. Eventually (but before it is released) we should replace
Contributor
There was a problem hiding this comment. Something to note is that |
||
| if (ignoreUnavailable) { | ||
| return false; | ||
| } else { | ||
| throw notFoundException(name); | ||
| } | ||
| } | ||
| if (context.options.allowSelectors()) { | ||
| // Ensure that the selectors are present and that they are compatible with the abstractions they are used with | ||
| assert selector != null : "Earlier logic should have parsed selectors or added the default selectors already"; | ||
|
|
||
This file contains hidden or 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 hidden or 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,83 @@ | ||
| /* | ||
| * 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; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.esql.action; | ||
|
|
||
| import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; | ||
| import org.elasticsearch.action.admin.indices.resolve.ResolveIndexAction; | ||
| import org.elasticsearch.cluster.metadata.View; | ||
| import org.elasticsearch.index.IndexNotFoundException; | ||
| import org.elasticsearch.xpack.esql.view.PutViewAction; | ||
| import org.hamcrest.Matcher; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; | ||
| import static org.hamcrest.Matchers.containsInAnyOrder; | ||
| import static org.hamcrest.Matchers.containsString; | ||
| import static org.hamcrest.Matchers.emptyIterable; | ||
|
|
||
| public class ResolveIndexActionIT extends AbstractEsqlIntegTestCase { | ||
|
|
||
| public void testResolveIndex() { | ||
| assertAcked(client().admin().indices().create(new CreateIndexRequest("my-index-1"))); | ||
| assertAcked(client().admin().indices().create(new CreateIndexRequest("other-index-2"))); | ||
|
|
||
| assertAcked( | ||
| client().execute( | ||
| PutViewAction.INSTANCE, | ||
| new PutViewAction.Request(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, new View("my-view-1", "ROW r=1")) | ||
| ) | ||
| ); | ||
|
|
||
| verifyResolvedIndices( | ||
| new ResolveIndexAction.Request(new String[] { "my-index-1" }), | ||
| containsInAnyOrder("my-index-1"), | ||
| emptyIterable(), | ||
| emptyIterable() | ||
| ); | ||
| verifyResolvedIndices( | ||
| new ResolveIndexAction.Request(new String[] { "my-index-*" }), | ||
| containsInAnyOrder("my-index-1"), | ||
| emptyIterable(), | ||
| emptyIterable() | ||
| ); | ||
|
|
||
| // matched view is not returned, but it does not fail request | ||
|
Contributor
There was a problem hiding this comment. Should this comment move a few lines down and a new comment be here, since we are indeed failing the request when an explicit view name is used. |
||
| expectThrows( | ||
| IndexNotFoundException.class, | ||
| containsString("no such index [my-view-1]"), | ||
| () -> resolveIndices(new ResolveIndexAction.Request(new String[] { "my-view-1" })) | ||
| ); | ||
| verifyResolvedIndices( | ||
| new ResolveIndexAction.Request(new String[] { "my-*" }), | ||
| containsInAnyOrder("my-index-1"), | ||
| emptyIterable(), | ||
| emptyIterable() | ||
| ); | ||
| } | ||
|
|
||
| private ResolveIndexAction.Response resolveIndices(ResolveIndexAction.Request request) { | ||
| return client().admin().indices().resolveIndex(request).actionGet(); | ||
| } | ||
|
|
||
| private void verifyResolvedIndices( | ||
| ResolveIndexAction.Request request, | ||
| Matcher<Iterable<? extends String>> indicesMatcher, | ||
| Matcher<Iterable<? extends String>> aliasesMatcher, | ||
| Matcher<Iterable<? extends String>> dataStreamsMatcher | ||
| ) { | ||
| var response = resolveIndices(request); | ||
| assertThat(toStringList(response.getIndices()), indicesMatcher); | ||
| assertThat(toStringList(response.getAliases()), aliasesMatcher); | ||
| assertThat(toStringList(response.getDataStreams()), dataStreamsMatcher); | ||
| } | ||
|
|
||
| private static List<String> toStringList(List<? extends ResolveIndexAction.ResolvedIndexAbstraction> list) { | ||
| return list.stream().map(ResolveIndexAction.ResolvedIndexAbstraction::getName).toList(); | ||
| } | ||
| } | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -272,14 +272,13 @@ setup: | |
| query: 'FROM test | WHERE animal == "dog"' | ||
|
|
||
| - do: | ||
| catch: /no such index \[myview\]/ | ||
| search: | ||
| index: myview | ||
| body: { query: { match_all: {} } } | ||
|
|
||
|
Contributor
Author
There was a problem hiding this comment. This change also causes a
Contributor
There was a problem hiding this comment. I think the change in behaviour makes sense. |
||
| - do: | ||
| catch: /no such index \[myview\]/ | ||
|
Contributor
There was a problem hiding this comment. I think the change in behaviour makes sense. But I also note that we should get the old error message if we write to write to a view, and there is no test for that. We could add such a test in a separate PR, or here. |
||
| index: | ||
| index: myview | ||
| id: "1" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Inlined method used only in test. We should not have test only code in production