>From Preetham Poluparthi <[email protected]>: Preetham Poluparthi has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20587?usp=email )
Change subject: [ASTERIXDB-3632]: Fix missing array indexes in current index detection ...................................................................... [ASTERIXDB-3632]: Fix missing array indexes in current index detection - user model changes: no - storage format changes: no - interface changes: no Ext-ref: MB-69429 Details: Previously, in the index advisor, array indexes were not being added to the list of current indexes even when they already existed, causing them to always appear under recommended_indexes. This change updates the detection logic so existing array indexes are correctly recognized and excluded from recommendations. Change-Id: I785d6394ef5d328d1edf36fb07e28cd9e143b3b9 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20587 Reviewed-by: Preetham Poluparthi <[email protected]> Reviewed-by: Ali Alsuliman <[email protected]> Tested-by: Preetham Poluparthi <[email protected]> --- M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/indexadvisor/AdviseIndexRule.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/indexadvisor/FakeIndexProvider.java A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cbo-join/index-advisor/array-simple-advise/array-simple-advise.10.ddl.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cbo-join/index-advisor/array-simple-advise/array-simple-advise.11.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.11.adm M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Index.java 6 files changed, 71 insertions(+), 12 deletions(-) Approvals: Preetham Poluparthi: Looks good to me, but someone else must approve; Verified Anon. E. Moose #1000171: Ali Alsuliman: Looks good to me, approved diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/indexadvisor/AdviseIndexRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/indexadvisor/AdviseIndexRule.java index 967d25d..83c0b25 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/indexadvisor/AdviseIndexRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/indexadvisor/AdviseIndexRule.java @@ -142,14 +142,13 @@ && actualIndex.getIndexDetails() instanceof Index.ValueIndexDetails valueIndexDetails) { indexAdvisor.addPresentAdviseString(getCreateIndexClause(actualIndex.getIndexName(), valueIndexDetails.getKeyFieldNames(), databaseName, dataverse, datasetName)); - return; + } else { + indexAdvisor.addRecommendedAdviseString(getCreateIndexClause( + getIndexName(((Index.ValueIndexDetails) fakeIndex.getIndexDetails()).getKeyFieldNames()), + ((Index.ValueIndexDetails) fakeIndex.getIndexDetails()).getKeyFieldNames(), databaseName, + dataverse, datasetName)); } - indexAdvisor.addRecommendedAdviseString(getCreateIndexClause( - getIndexName(((Index.ValueIndexDetails) fakeIndex.getIndexDetails()).getKeyFieldNames()), - ((Index.ValueIndexDetails) fakeIndex.getIndexDetails()).getKeyFieldNames(), databaseName, - dataverse, datasetName)); - } else if (fakeIndex.getIndexDetails() instanceof Index.ArrayIndexDetails fakeArrayIndexDetails) { Index actualIndex = lookupArrayIndex(databaseName, dataverse, datasetName, ((Index.ArrayIndexDetails) fakeIndex.getIndexDetails()).getElementList(), actualIndexProvider); @@ -157,11 +156,12 @@ && actualIndex.getIndexDetails() instanceof Index.ArrayIndexDetails arrayIndexDetails) { indexAdvisor.addPresentAdviseString(getCreateArrayIndexClause(actualIndex.getIndexName(), arrayIndexDetails, databaseName, dataverse, datasetName)); - } + } else { - indexAdvisor.addRecommendedAdviseString( - getCreateArrayIndexClause(getArrayIndexName(fakeArrayIndexDetails.getElementList()), - fakeArrayIndexDetails, databaseName, dataverse, datasetName)); + indexAdvisor.addRecommendedAdviseString( + getCreateArrayIndexClause(getArrayIndexName(fakeArrayIndexDetails.getElementList()), + fakeArrayIndexDetails, databaseName, dataverse, datasetName)); + } } } @@ -224,7 +224,7 @@ builder.append(" "); } - if (projectList.isEmpty() || (projectList.size() == 1 && projectList.getFirst().isEmpty())) { + if (projectList.isEmpty() || (projectList.size() == 1 && projectList.getFirst() == null)) { builder.append(": "); builder.append(typeList.getFirst()); } else { diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/indexadvisor/FakeIndexProvider.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/indexadvisor/FakeIndexProvider.java index cda2c02..fc72069 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/indexadvisor/FakeIndexProvider.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/indexadvisor/FakeIndexProvider.java @@ -100,7 +100,7 @@ } } else { List<List<String>> projectListWrapper = new ArrayList<>(); - projectListWrapper.add(projectList); + projectListWrapper.add(projectList.isEmpty() ? null : projectList); List<IAType> typeList = new ArrayList<>(); typeList.add(iaType); diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cbo-join/index-advisor/array-simple-advise/array-simple-advise.10.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cbo-join/index-advisor/array-simple-advise/array-simple-advise.10.ddl.sqlpp new file mode 100644 index 0000000..ea1f7a9 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cbo-join/index-advisor/array-simple-advise/array-simple-advise.10.ddl.sqlpp @@ -0,0 +1,23 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + +CREATE INDEX array_idx_categories ON A(UNNEST categories : string) EXCLUDE UNKNOWN KEY; \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cbo-join/index-advisor/array-simple-advise/array-simple-advise.11.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cbo-join/index-advisor/array-simple-advise/array-simple-advise.11.query.sqlpp new file mode 100644 index 0000000..c363519 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cbo-join/index-advisor/array-simple-advise/array-simple-advise.11.query.sqlpp @@ -0,0 +1,27 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +use test; + + +ADVISE +SELECT p +FROM A p +WHERE "Food" IN p.categories; diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.11.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.11.adm new file mode 100644 index 0000000..5221040 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.11.adm @@ -0,0 +1 @@ +[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[{"index_statement":"CREATE INDEX array_idx_categories ON `Default`.`test`.`A`(UNNEST `categories` : string) EXCLUDE UNKNOWN KEY;"}],"recommended_indexes":{"indexes":[]}}}}] \ No newline at end of file diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Index.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Index.java index 4709c13..bb564de 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Index.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Index.java @@ -576,6 +576,14 @@ public int getSourceIndicator() { return sourceIndicator; } + + @Override + public boolean equals(Object obj) { + return obj instanceof ArrayIndexElement && Objects.equals(unnestList, ((ArrayIndexElement) obj).unnestList) + && Objects.equals(projectList, ((ArrayIndexElement) obj).projectList) + && Objects.equals(typeList, ((ArrayIndexElement) obj).typeList) + && sourceIndicator == ((ArrayIndexElement) obj).sourceIndicator; + } } public static class SampleIndexDetails extends AbstractIndexDetails { -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20587?usp=email To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I785d6394ef5d328d1edf36fb07e28cd9e143b3b9 Gerrit-Change-Number: 20587 Gerrit-PatchSet: 6 Gerrit-Owner: Preetham Poluparthi <[email protected]> Gerrit-Reviewer: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Preetham Poluparthi <[email protected]>
