Skip to content

Commit 09da047

Browse files
committed
Fix: Pagination of index aliases is not supported
Signed-off-by: Aparajita Pandey <aparajita.pandey@uber.com>
1 parent cbcdbd6 commit 09da047

1 file changed

Lines changed: 2 additions & 9 deletions

File tree

legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import java.util.stream.StreamSupport;
2727
import org.apache.logging.log4j.LogManager;
2828
import org.apache.logging.log4j.Logger;
29-
import org.opensearch.action.admin.indices.alias.get.GetAliasesRequest;
30-
import org.opensearch.action.admin.indices.alias.get.GetAliasesResponse;
3129
import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsRequest;
3230
import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
3331
import org.opensearch.common.document.DocumentField;
@@ -163,11 +161,6 @@ private void populateResultSetFromDefaultCursor(DefaultCursor cursor) {
163161
private void loadFromEsState(Query query) {
164162
String indexName = fetchIndexName(query);
165163
String[] fieldNames = fetchFieldsAsArray(query);
166-
GetAliasesResponse getAliasesResponse =
167-
client.admin().indices().getAliases(new GetAliasesRequest(indexName)).actionGet();
168-
if (getAliasesResponse != null && !getAliasesResponse.getAliases().isEmpty()) {
169-
indexName = getAliasesResponse.getAliases().keySet().iterator().next();
170-
}
171164
// Reset boolean in the case of JOIN query where multiple calls to loadFromEsState() are made
172165
selectAll = isSimpleQuerySelectAll(query) || isJoinQuerySelectAll(query, fieldNames);
173166

@@ -180,11 +173,11 @@ private void loadFromEsState(Query query) {
180173
client.admin().indices().getFieldMappings(request).actionGet();
181174

182175
Map<String, Map<String, FieldMappingMetadata>> mappings = response.mappings();
183-
if (mappings.isEmpty() || !mappings.containsKey(indexName)) {
176+
if (mappings.size() != 1) {
184177
throw new IllegalArgumentException(
185178
String.format("Index type %s does not exist", query.getFrom()));
186179
}
187-
Map<String, FieldMappingMetadata> typeMappings = mappings.get(indexName);
180+
Map<String, FieldMappingMetadata> typeMappings = mappings.values().iterator().next();
188181

189182
this.indexName = this.indexName == null ? indexName : (this.indexName + "|" + indexName);
190183
this.columns.addAll(

0 commit comments

Comments
 (0)