Skip to content

Additional index resolution integration tests #130608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 7, 2025
Merged

Additional index resolution integration tests #130608

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
093503c
Additional index resolution integration tests
idegtiarenko Jul 4, 2025
d950313
hidden pattern test case
idegtiarenko Jul 7, 2025
32620cc
Merge branch 'main' into additional_index_resolution_cases
idegtiarenko Jul 7, 2025
95cb9cb
add unavailable test case
idegtiarenko Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions ...l/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/IndexResolutionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.elasticsearch.action.datastreams.CreateDataStreamAction;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.CollectionUtils;
import org.elasticsearch.datastreams.DataStreamsPlugin;
import org.elasticsearch.index.IndexNotFoundException;
Expand Down Expand Up @@ -108,12 +110,44 @@ public void testDoesNotResolveClosedIndex() {
assertAcked(client().admin().indices().prepareCreate("index-1"));
indexRandom(true, "index-1", 10);
assertAcked(client().admin().indices().prepareClose("index-1"));
assertAcked(client().admin().indices().prepareCreate("index-2"));
indexRandom(true, "index-2", 15);

expectThrows(
ClusterBlockException.class,
containsString("index [index-1] blocked by: [FORBIDDEN/4/index closed]"),
() -> run(syncEsqlQueryRequest().query("FROM index-1"))
);
expectThrows(
ClusterBlockException.class,
containsString("index [index-1] blocked by: [FORBIDDEN/4/index closed]"),
() -> run(syncEsqlQueryRequest().query("FROM index-1,index-2"))
);
try (var response = run(syncEsqlQueryRequest().query("FROM index-*"))) {
assertOk(response);
assertResultCount(response, 15);// only index-2 records match
}
}

public void testHiddenIndices() {
assertAcked(client().admin().indices().prepareCreate("my-index-1"));
indexRandom(true, "my-index-1", 10);
assertAcked(
client().admin()
.indices()
.prepareCreate(".hidden-index-1")
.setSettings(Settings.builder().put(IndexMetadata.SETTING_INDEX_HIDDEN, true))
);
indexRandom(true, ".hidden-index-1", 15);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be good to have a test with .hidden-* as well. I guess it's supposed to return 15 as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to FROM *-index-1 it looks like we only matching non-hidden indices.
But with .hidden-* we supply a hidden pattern. Let me add it 👍


try (var response = run(syncEsqlQueryRequest().query("FROM .hidden-index-1"))) {
assertOk(response);
assertResultCount(response, 15);
}
try (var response = run(syncEsqlQueryRequest().query("FROM *-index-1"))) {
assertOk(response);
assertResultCount(response, 10); // only non hidden index matches
}
}

public void testPartialResolution() {
Expand All @@ -134,4 +168,14 @@ public void testPartialResolution() {
private static void assertOk(EsqlQueryResponse response) {
assertThat(response.isPartial(), equalTo(false));
}

private static void assertResultCount(EsqlQueryResponse response, long rows) {
long count = 0;
var iterator = response.column(0);
while (iterator.hasNext()) {
iterator.next();
count++;
}
assertThat(count, equalTo(rows));
}
}