honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-22 12:56:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

SQL: Improve alias vs index resolution (#33393)

Browse Source 
Improve pattern resolution for aliases vs indices
This commit is contained in:
Costin Leau 2018-09-07 07:24:43 +03:00 committed by GitHub
parent ee73bc2f3f
commit 7b923ea604
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/index/IndexResolver.java
View File

@ -16,6 +16,8 @@ import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
import org.elasticsearch.action.admin.indices.get.GetIndexRequest.Feature;
import org.elasticsearch.action.admin.indices.get.GetIndexResponse;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.action.support.IndicesOptions.Option;
import org.elasticsearch.action.support.IndicesOptions.WildcardStates;
import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.metadata.AliasMetaData;
import org.elasticsearch.cluster.metadata.MappingMetaData;
@ -117,6 +119,10 @@ public class IndexResolver {
}
}
private static final IndicesOptions INDICES_ONLY_OPTIONS = new IndicesOptions(
EnumSet.of(Option.ALLOW_NO_INDICES, Option.IGNORE_UNAVAILABLE, Option.IGNORE_ALIASES), EnumSet.of(WildcardStates.OPEN));
private final Client client;
private final String clusterName;
@ -144,7 +150,6 @@ public class IndexResolver {
if (retrieveAliases) {
GetAliasesRequest aliasRequest = new GetAliasesRequest()
.local(true)
.indices(indices)
.aliases(indices)
.indicesOptions(IndicesOptions.lenientExpandOpen());
@ -176,7 +181,7 @@ public class IndexResolver {
.indices(indices)
.features(Feature.SETTINGS)
.includeDefaults(false)
.indicesOptions(IndicesOptions.lenientExpandOpen());
.indicesOptions(INDICES_ONLY_OPTIONS);
client.admin().indices().getIndex(indexRequest,
ActionListener.wrap(response -> filterResults(javaRegex, aliases, response, listener),

8
x-pack/qa/sql/src/main/resources/command.csv-spec
View File

@ -174,6 +174,14 @@ test_emp_copy |BASE TABLE
test_emp_with_nulls|BASE TABLE
;
showTablesIdentifierPatternOnAliases
SHOW TABLES "test*,-test_emp*";
name:s | type:s
test_alias |ALIAS
test_alias_emp |ALIAS
;
// DESCRIBE
describeSimpleLike