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 705305de24 [ASTERIXDB-3632]: Change advisor index name
705305de24 is described below
commit 705305de242c69b6f9cc2ad7f00d4cd499ce8673
Author: preetham0202 <[email protected]>
AuthorDate: Mon Feb 16 17:14:14 2026 +0530
[ASTERIXDB-3632]: Change advisor index name
- user model changes: no
- storage format changes: no
- interface changes: no
Ext-ref: MB-66492
Change-Id: I1eb016363afdca9bd8707bd1f058068ed4aeba17
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20903
Integration-Tests: Jenkins <[email protected]>
Tested-by: Jenkins <[email protected]>
Reviewed-by: Preetham Poluparthi <[email protected]>
Reviewed-by: Ali Alsuliman <[email protected]>
---
.../asterix/optimizer/rules/cbo/indexadvisor/AdviseIndexRule.java | 4 ++--
.../index-advisor/array-simple-advise/array-simple-advise.4.adm | 2 +-
.../index-advisor/array-simple-advise/array-simple-advise.5.adm | 2 +-
.../index-advisor/array-simple-advise/array-simple-advise.6.adm | 2 +-
.../index-advisor/array-simple-advise/array-simple-advise.7.adm | 2 +-
.../index-advisor/array-simple-advise/array-simple-advise.8.adm | 2 +-
.../index-advisor/array-simple-advise/array-simple-advise.9.adm | 2 +-
.../results/cbo-join/index-advisor/join-advise/join-advise.4.adm | 2 +-
.../index-advisor/nested-array-index/nested-array-index.4.adm | 2 +-
.../index-advisor/nested-array-index/nested-array-index.5.adm | 2 +-
.../index-advisor/nested-array-index/nested-array-index.6.adm | 2 +-
.../index-advisor/nested-array-index/nested-array-index.7.adm | 2 +-
.../index-advisor/nested-array-index/nested-array-index.8.adm | 2 +-
.../index-advisor/nested-array-index/nested-array-index.9.adm | 2 +-
.../results/cbo-join/index-advisor/nested-fields/nested-fields.4.adm | 2 +-
.../cbo-join/index-advisor/self-join-advise/self-join-advise.4.adm | 2 +-
.../cbo-join/index-advisor/self-join-advise/self-join-advise.5.adm | 2 +-
.../cbo-join/index-advisor/self-join-advise/self-join-advise.6.adm | 2 +-
.../results/cbo-join/index-advisor/simple-advise/simple-advise.4.adm | 2 +-
.../cbo-join/index-advisor/simple-advise1/simple-advise1.4.adm | 2 +-
.../cbo-join/index-advisor/simple-advise1/simple-advise1.5.adm | 2 +-
.../cbo-join/index-advisor/simple-advise2/simple-advise2.4.adm | 2 +-
22 files changed, 23 insertions(+), 23 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 83c0b25d7f..61eee2a2a7 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
@@ -187,12 +187,12 @@ public class AdviseIndexRule implements
IAlgebraicRewriteRule {
}
public static String getIndexName(List<List<String>> fields) {
- return "idx_" + fields.stream().map(field -> String.join("_",
field)).collect(Collectors.joining("_"))
+ return "idx_adv_" + fields.stream().map(field -> String.join("_",
field)).collect(Collectors.joining("_"))
.replaceAll(" ", "");
}
public static String getArrayIndexName(List<Index.ArrayIndexElement>
fields) {
- return "array_idx_" + fields.stream().map(
+ return "idx_adv_array_" + fields.stream().map(
field -> field.getUnnestList().stream().map(f ->
String.join("_", f)).collect(Collectors.joining("_")))
.collect(Collectors.joining("_")).replaceAll(" ", "");
}
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.4.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.4.adm
index ce609584a0..c97cf386cd 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.4.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.4.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX array_idx_categories ON `Default`.`test`.`A`(UNNEST `categories` :
string) EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_array_categories ON `Default`.`test`.`A`(UNNEST `categories` :
string) EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.5.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.5.adm
index ce609584a0..c97cf386cd 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.5.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.5.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX array_idx_categories ON `Default`.`test`.`A`(UNNEST `categories` :
string) EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_array_categories ON `Default`.`test`.`A`(UNNEST `categories` :
string) EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.6.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.6.adm
index 6de913be1e..7937f1b8ec 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.6.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.6.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX array_idx_items ON `Default`.`test`.`A`(UNNEST `items` SELECT `qty`:
bigint, `price`: double) EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_array_items ON `Default`.`test`.`A`(UNNEST `items` SELECT `qty`:
bigint, `price`: double) EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.7.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.7.adm
index ce609584a0..c97cf386cd 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.7.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.7.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX array_idx_categories ON `Default`.`test`.`A`(UNNEST `categories` :
string) EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_array_categories ON `Default`.`test`.`A`(UNNEST `categories` :
string) EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.8.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.8.adm
index 6de913be1e..7937f1b8ec 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.8.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.8.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX array_idx_items ON `Default`.`test`.`A`(UNNEST `items` SELECT `qty`:
bigint, `price`: double) EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_array_items ON `Default`.`test`.`A`(UNNEST `items` SELECT `qty`:
bigint, `price`: double) EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.9.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.9.adm
index 89a2921d77..126461f76f 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.9.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/array-simple-advise/array-simple-advise.9.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX array_idx_orders ON `Default`.`test`.`A`(UNNEST `orders` SELECT
`delivery_time`: bigint) EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_array_orders ON `Default`.`test`.`A`(UNNEST `orders` SELECT
`delivery_time`: bigint) EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/join-advise/join-advise.4.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/join-advise/join-advise.4.adm
index 42da673db7..31d8375abc 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/join-advise/join-advise.4.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/join-advise/join-advise.4.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_b_1 ON `Default`.`test`.`B`(`b_1`);"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_b_1 ON `Default`.`test`.`B`(`b_1`);"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.4.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.4.adm
index 4cbabd355d..4b599d891f 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.4.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.4.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX array_idx_a_b_c ON `Default`.`test`.`A`(UNNEST `a`.`b`.`c` : string)
EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_array_a_b_c ON `Default`.`test`.`A`(UNNEST `a`.`b`.`c` : string)
EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.5.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.5.adm
index f84f55961d..e61fadbde2 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.5.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.5.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX array_idx_n1_n2_n3_n4_categories ON `Default`.`test`.`A`(UNNEST `n1`
UNNEST `n2` UNNEST `n3` UNNEST `n4` UNNEST `categories` : string) EXCLUDE
UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_array_n1_n2_n3_n4_categories ON `Default`.`test`.`A`(UNNEST `n1`
UNNEST `n2` UNNEST `n3` UNNEST `n4` UNNEST `categories` : string) EXCLUDE
UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.6.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.6.adm
index 0fb9292ffd..762853c17d 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.6.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.6.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX array_idx_f1_f2_f3_f4_f5_categories ON `Default`.`test`.`A`(UNNEST
`f1`.`f2`.`f3` UNNEST `f4`.`f5` UNNEST `categories` : string) EXCLUDE UNKNOWN
KEY;"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_array_f1_f2_f3_f4_f5_categories ON `Default`.`test`.`A`(UNNEST
`f1`.`f2`.`f3` UNNEST `f4`.`f5` UNNEST `categories` : string) EXCLUDE UNKNOWN
KEY;"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.7.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.7.adm
index 7e2456c6c0..a5241ff847 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.7.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.7.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX array_idx_g1_g2_g3_items ON `Default`.`test`.`A`(UNNEST `g1`.`g2` UNNEST
`g3` UNNEST `items` SELECT `qty`: bigint, `price`: double) EXCLUDE UNKNOWN
KEY;"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_array_g1_g2_g3_items ON `Default`.`test`.`A`(UNNEST `g1`.`g2`
UNNEST `g3` UNNEST `items` SELECT `qty`: bigint, `price`: double) EXCLUDE
UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.8.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.8.adm
index e7b785f979..67472b1b8a 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.8.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.8.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX array_idx_h1_h2_h3_h4_h5_categories ON `Default`.`test`.`A`(UNNEST
`h1`.`h2`.`h3` UNNEST `h4`.`h5` UNNEST `categories` : string) EXCLUDE UNKNOWN
KEY;"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_array_h1_h2_h3_h4_h5_categories ON `Default`.`test`.`A`(UNNEST
`h1`.`h2`.`h3` UNNEST `h4`.`h5` UNNEST `categories` : string) EXCLUDE UNKNOWN
KEY;"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.9.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.9.adm
index c7dd5c6494..83ae87cd9b 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.9.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-array-index/nested-array-index.9.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX array_idx_k1_k2_k3_k4_k5_k6 ON `Default`.`test`.`A`(UNNEST `k1`.`k2`
UNNEST `k3`.`k4` UNNEST `k5`.`k6` SELECT `qty`: bigint, `price`: double)
EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_array_k1_k2_k3_k4_k5_k6 ON `Default`.`test`.`A`(UNNEST `k1`.`k2`
UNNEST `k3`.`k4` UNNEST `k5`.`k6` SELECT `qty`: bigint, `price`: double)
EXCLUDE UNKNOWN KEY;"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-fields/nested-fields.4.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-fields/nested-fields.4.adm
index db990cb9bb..b472fd1839 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-fields/nested-fields.4.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/nested-fields/nested-fields.4.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_a_2_n_1field_n_2name ON `Default`.`test`.`A`(`a_2`.`n_1 field`.`n_2
name`);"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_a_2_n_1field_n_2name ON `Default`.`test`.`A`(`a_2`.`n_1
field`.`n_2 name`);"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/self-join-advise/self-join-advise.4.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/self-join-advise/self-join-advise.4.adm
index a1000b0d21..d184399215 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/self-join-advise/self-join-advise.4.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/self-join-advise/self-join-advise.4.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_a_2 ON `Default`.`test`.`A`(`a_2`);"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_a_2 ON `Default`.`test`.`A`(`a_2`);"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/self-join-advise/self-join-advise.5.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/self-join-advise/self-join-advise.5.adm
index a1000b0d21..d184399215 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/self-join-advise/self-join-advise.5.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/self-join-advise/self-join-advise.5.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_a_2 ON `Default`.`test`.`A`(`a_2`);"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_a_2 ON `Default`.`test`.`A`(`a_2`);"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/self-join-advise/self-join-advise.6.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/self-join-advise/self-join-advise.6.adm
index f39ecc2379..ee21c12202 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/self-join-advise/self-join-advise.6.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/self-join-advise/self-join-advise.6.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_a_3 ON `Default`.`test`.`A`(`a_3`);"},{"index_statement":"CREATE
INDEX idx_a_1 ON `Default`.`test`.`A`(`a_1`);"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_a_3 ON `Default`.`test`.`A`(`a_3`);"},{"index_statement":"CREATE
INDEX idx_adv_a_1 ON `Default`.`test`.`A`(`a_1`);"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise/simple-advise.4.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise/simple-advise.4.adm
index 55150dedd9..315b50df92 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise/simple-advise.4.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise/simple-advise.4.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[{"index_statement":"CREATE
INDEX idx_a_1 ON
`Default`.`test`.`A`(`a_1`);"}],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_b_2 ON `Default`.`test`.`B`(`b_2`);"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[{"index_statement":"CREATE
INDEX idx_a_1 ON
`Default`.`test`.`A`(`a_1`);"}],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_b_2 ON `Default`.`test`.`B`(`b_2`);"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise1/simple-advise1.4.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise1/simple-advise1.4.adm
index e2b4c29dde..e2fb759dc4 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise1/simple-advise1.4.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise1/simple-advise1.4.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_b ON `Default`.`test`.`A`(`b`);"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_b ON `Default`.`test`.`A`(`b`);"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise1/simple-advise1.5.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise1/simple-advise1.5.adm
index e7a4a4502b..01d584fa20 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise1/simple-advise1.5.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise1/simple-advise1.5.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_b ON `Default`.`test`.`A`(`b`);"},{"index_statement":"CREATE INDEX
idx_c ON `Default`.`test`.`B`(`c`);"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_b ON `Default`.`test`.`A`(`b`);"},{"index_statement":"CREATE
INDEX idx_adv_c ON `Default`.`test`.`B`(`c`);"}]}}}}]
\ No newline at end of file
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise2/simple-advise2.4.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise2/simple-advise2.4.adm
index f519cd1246..d3f7177c0e 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise2/simple-advise2.4.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/cbo-join/index-advisor/simple-advise2/simple-advise2.4.adm
@@ -1 +1 @@
-[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_a0_a1_a2 ON `Default`.`test`.`A`(`a0`,`a1`,`a2`);"}]}}}}]
\ No newline at end of file
+[{"#operator":"Advise","advice":{"#operator":"IndexAdvice","adviseinfo":{"current_indexes":[],"recommended_indexes":{"indexes":[{"index_statement":"CREATE
INDEX idx_adv_a0_a1_a2 ON `Default`.`test`.`A`(`a0`,`a1`,`a2`);"}]}}}}]
\ No newline at end of file
