This is an automated email from the ASF dual-hosted git repository.
preetham02 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 6573fb9c78 [ASTERIXDB-3632]: Fix missing array indexes in current
index detection
6573fb9c78 is described below
commit 6573fb9c7841ba365e05bada2d12060d6a7110bc
Author: preetham0202 <[email protected]>
AuthorDate: Wed Nov 19 12:01:02 2025 +0530
[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]>
---
.../rules/cbo/indexadvisor/AdviseIndexRule.java | 22 +++++++++---------
.../rules/cbo/indexadvisor/FakeIndexProvider.java | 2 +-
.../array-simple-advise.10.ddl.sqlpp | 23 ++++++++++++++++++
.../array-simple-advise.11.query.sqlpp | 27 ++++++++++++++++++++++
.../array-simple-advise/array-simple-advise.11.adm | 1 +
.../apache/asterix/metadata/entities/Index.java | 8 +++++++
6 files changed, 71 insertions(+), 12 deletions(-)
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 967d25d2e2..83c0b25d7f 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 @@ public class AdviseIndexRule implements
IAlgebraicRewriteRule {
&& 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 @@ public class AdviseIndexRule implements
IAlgebraicRewriteRule {
&& 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 @@ public class AdviseIndexRule implements
IAlgebraicRewriteRule {
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 cda2c02ce2..fc7206921d 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 @@ public class FakeIndexProvider implements IIndexProvider {
}
} 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 0000000000..ea1f7a99b1
--- /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 0000000000..c363519b1b
--- /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 0000000000..5221040dcb
--- /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 4709c138db..bb564de9b6 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 class Index implements IMetadataEntity<Index>,
Comparable<Index> {
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 {
