You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2026/01/15 21:36:29 UTC

(asterixdb) branch master updated (76badfbf42 -> ef1dac546a)

This is an automated email from the ASF dual-hosted git repository.

mblow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git


    from 76badfbf42 [NO ISSUE][RT]: Refactor: Remove code duplication in stable sort operators
     new 629fac4a68 [ASTERIXDB-3671][IDX] Incorrect result with array index and index nested loop join
     new bd0e9b44a2 Merge branch 'neo' into 'trinity'
     new 426ad651c6 Merge branch 'trinity' into 'morpheus'
     new 933d132e6d [ASTERIXDB-3451][STO] Avoid unlocking twice when pin fails
     new d66c907a92 Merge branch 'gerrit/neo' into 'gerrit/trinity'
     new 785239ab6a Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new 0249eb936d [ASTERIXDB-3677][COMP] Push limit to index-search of UNNEST_MAP op
     new 1c5a87019b [NO ISSUE][*DB][STO] Fix IndexOutOfBoundsException when flushPtr is 0
     new 5d620afaca [NO ISSUE][*DB][NET] Upgrade Netty to 4.1.128.Final
     new f7b9749abc Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new e19235751d [ASTERIXDB-3682][COMP] Push extracted assign to join branch
     new ec3f822acd [NO ISSUE][RT] Truncate warning message to writeUTF limit
     new b9488a5e3d [ASTERIXDB-3683][COMP] Fix isomorphic window joins
     new ee3d1d12f0 Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new 3ec12d4a2d [NO ISSUE][HYR][NET] Advance Netty to 4.1.130.Final
     new fce80c4500 [NO ISSUE][*DB][EXT] Advance msgpack-core to 0.9.11
     new 27932b29d1 Merge branch 'gerrit/neo' into 'gerrit/trinity'
     new ab29f7603d Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new 0646f96bf6 [ASTERIXDB-3689][HYR][NET] MuxDemux negotiation hardening
     new c219e3d13a Merge branch 'gerrit/neo' into 'gerrit/trinity'
     new 3578f0a554 Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new ef1dac546a Merge branch 'gerrit/morpheus' into 'master'

The 22 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../rules/ByNameToByIndexFieldAccessRule.java      |  65 ++++-
 .../optimizer/rules/LoadRecordFieldsRule.java      |  54 ++--
 .../rules/PushLimitIntoPrimarySearchRule.java      |  12 +-
 .../asterix/app/function/QueryIndexDatasource.java |  32 ++-
 .../asterix/app/function/QueryIndexRewriter.java   |  23 +-
 .../ASTERIXDB-3682-field-access-in-join.sqlpp      | 107 +++++++
 .../queries/limit/pushdown_to_index_search.sqlpp}  |  28 +-
 .../ASTERIXDB-3682-field-access-in-join.plan       | 312 +++++++++++++++++++++
 .../results/limit/pushdown_to_index_search.plan    |  38 +++
 ...push-limit-to-join-primary-lookup.01.ddl.sqlpp} |  15 +-
 ...h-limit-to-join-primary-lookup.02.update.sqlpp} |  19 +-
 ...sh-limit-to-join-primary-lookup.03.query.sqlpp} |  16 +-
 ...push-limit-to-join-primary-lookup.99.ddl.sqlpp} |   0
 .../query_index/q01/q01.001.ddl.sqlpp              |   7 +-
 .../query_index/q01/q01.002.update.sqlpp           |   7 +
 .../q01.032.query.sqlpp}                           |   5 +-
 .../q01.033.query.sqlpp}                           |   5 +-
 .../q01.034.query.sqlpp}                           |   5 +-
 .../q01.035.query.sqlpp}                           |   5 +-
 .../queries_sqlpp/tpcds/q90/q90.4.query.sqlpp      |  43 +++
 .../isomorphic/isomorphic.1.ddl.sqlpp}             |  20 +-
 .../isomorphic/isomorphic.2.update.sqlpp}          |  14 +-
 .../isomorphic/isomorphic.3.query.sqlpp}           |  17 +-
 .../isomorphic/isomorphic.4.query.sqlpp}           |  17 +-
 .../isomorphic/isomorphic.5.query.sqlpp}           |  17 +-
 .../push-limit-to-join-primary-lookup.03.adm}      |   0
 .../runtimets/results/query_index/q01/q01.028.plan |  22 +-
 .../runtimets/results/query_index/q01/q01.029.plan |  22 +-
 .../runtimets/results/query_index/q01/q01.031.plan |  22 +-
 .../runtimets/results/query_index/q01/q01.032.adm  |  16 ++
 .../runtimets/results/query_index/q01/q01.033.adm  |   7 +
 .../runtimets/results/query_index/q01/q01.034.plan |  18 ++
 .../runtimets/results/query_index/q01/q01.035.plan |  18 ++
 .../runtimets/results/tpcds/q90/q90.2.plan         | 250 +++++++++++++++++
 .../results/window/isomorphic/isomorphic.3.adm     | 100 +++++++
 .../results/window/isomorphic/isomorphic.4.adm     | 100 +++++++
 .../results/window/isomorphic/isomorphic.5.adm     |  50 ++++
 .../runtimets/results_cbo/tpcds/q90/q90.2.plan     | 250 +++++++++++++++++
 .../runtimets/results_column/tpcds/q90/q90.2.plan  | 250 +++++++++++++++++
 .../src/test/resources/runtimets/sqlpp_queries.xml |  11 +-
 .../asterix/metadata/utils/KeyFieldTypeUtil.java   |  19 ++
 .../visitors/IsomorphismOperatorVisitor.java       |  40 +--
 .../org/apache/hyracks/api/exceptions/Warning.java |   3 +-
 .../hyracks/api/util/JavaSerializationUtils.java   |  37 +++
 .../hyracks/net/protocols/muxdemux/MuxDemux.java   |  42 ++-
 .../hyracks/net/protocols/tcp/TCPEndpoint.java     |  74 ++---
 hyracks-fullstack/pom.xml                          |   2 +-
 47 files changed, 2031 insertions(+), 205 deletions(-)
 create mode 100644 asterixdb/asterix-app/src/test/resources/optimizerts/queries/ASTERIXDB-3682-field-access-in-join.sqlpp
 copy asterixdb/asterix-app/src/test/resources/{runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp => optimizerts/queries/limit/pushdown_to_index_search.sqlpp} (58%)
 create mode 100644 asterixdb/asterix-app/src/test/resources/optimizerts/results/ASTERIXDB-3682-field-access-in-join.plan
 create mode 100644 asterixdb/asterix-app/src/test/resources/optimizerts/results/limit/pushdown_to_index_search.plan
 copy asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/{query_index/negative/negative.005.query.sqlpp => limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.01.ddl.sqlpp} (74%)
 copy asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/{query_index/negative/negative.005.query.sqlpp => limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.02.update.sqlpp} (58%)
 copy asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/{query_index/negative/negative.005.query.sqlpp => limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.query.sqlpp} (70%)
 copy asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/{aggregate-sql/median/median.99.ddl.sqlpp => limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.99.ddl.sqlpp} (100%)
 copy asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/{negative/negative.005.query.sqlpp => q01/q01.032.query.sqlpp} (85%)
 copy asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/{negative/negative.005.query.sqlpp => q01/q01.033.query.sqlpp} (85%)
 copy asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/{negative/negative.005.query.sqlpp => q01/q01.034.query.sqlpp} (84%)
 copy asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/{negative/negative.005.query.sqlpp => q01/q01.035.query.sqlpp} (84%)
 create mode 100644 asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q90/q90.4.query.sqlpp
 copy asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/{query_index/negative/negative.005.query.sqlpp => window/isomorphic/isomorphic.1.ddl.sqlpp} (74%)
 copy asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/{query_index/negative/negative.005.query.sqlpp => window/isomorphic/isomorphic.2.update.sqlpp} (74%)
 copy asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/{query_index/negative/negative.005.query.sqlpp => window/isomorphic/isomorphic.3.query.sqlpp} (60%)
 copy asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/{query_index/negative/negative.005.query.sqlpp => window/isomorphic/isomorphic.4.query.sqlpp} (65%)
 rename asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/{query_index/negative/negative.005.query.sqlpp => window/isomorphic/isomorphic.5.query.sqlpp} (64%)
 copy asterixdb/asterix-app/src/test/resources/runtimets/results/{objects/object_unwrap/object_unwrap.5.adm => limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.adm} (100%)
 create mode 100644 asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.032.adm
 create mode 100644 asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.033.adm
 create mode 100644 asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.034.plan
 create mode 100644 asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.035.plan
 create mode 100644 asterixdb/asterix-app/src/test/resources/runtimets/results/tpcds/q90/q90.2.plan
 create mode 100644 asterixdb/asterix-app/src/test/resources/runtimets/results/window/isomorphic/isomorphic.3.adm
 create mode 100644 asterixdb/asterix-app/src/test/resources/runtimets/results/window/isomorphic/isomorphic.4.adm
 create mode 100644 asterixdb/asterix-app/src/test/resources/runtimets/results/window/isomorphic/isomorphic.5.adm
 create mode 100644 asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/tpcds/q90/q90.2.plan
 create mode 100644 asterixdb/asterix-app/src/test/resources/runtimets/results_column/tpcds/q90/q90.2.plan


(asterixdb) 10/22: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit f7b9749abc800f7c989697c4288c2f697827fb55
Merge: 785239ab6a 5d620afaca
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sat Dec 20 09:18:10 2025 -0500

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [ASTERIXDB-3677][COMP] Push limit to index-search of UNNEST_MAP op (MB-69534)
     * [NO ISSUE][*DB][STO] Fix IndexOutOfBoundsException when flushPtr is 0 (MB-69772)
     * [NO ISSUE][*DB][NET] Upgrade Netty to 4.1.128.Final (MB-69749)
    
    Ext-ref: MB-69534,MB-69772,MB-69749
    Change-Id: I103779db6de5ec98f553e3222981c1695903bf32

 .../rules/PushLimitIntoPrimarySearchRule.java      |  12 +-
 .../asterix/app/function/QueryIndexDatasource.java |  22 ++-
 .../asterix/app/function/QueryIndexRewriter.java   |  23 ++-
 .../queries/limit/pushdown_to_index_search.sqlpp}  |  28 ++-
 .../results/limit/pushdown_to_index_search.plan    |  44 +++++
 ...push-limit-to-join-primary-lookup.01.ddl.sqlpp} |  15 +-
 ...h-limit-to-join-primary-lookup.02.update.sqlpp} |  19 +-
 ...sh-limit-to-join-primary-lookup.03.query.sqlpp} |  15 +-
 ...push-limit-to-join-primary-lookup.99.ddl.sqlpp} |   4 +-
 .../query_index/q01/q01.001.ddl.sqlpp              |   7 +-
 .../query_index/q01/q01.002.update.sqlpp           |   7 +
 .../q01.032.query.sqlpp}                           |   5 +-
 .../q01.033.query.sqlpp}                           |   5 +-
 .../q01.034.query.sqlpp}                           |   5 +-
 .../q01.035.query.sqlpp}                           |   5 +-
 .../queries_sqlpp/tpcds/q90/q90.4.query.sqlpp      |  43 +++++
 .../push-limit-to-join-primary-lookup.03.adm       |   2 +
 .../runtimets/results/query_index/q01/q01.032.adm  |  16 ++
 .../runtimets/results/query_index/q01/q01.033.adm  |   7 +
 .../runtimets/results/query_index/q01/q01.034.plan |  20 ++
 .../runtimets/results/query_index/q01/q01.035.plan |  20 ++
 .../runtimets/results/tpcds/q90/q90.2.plan         | 210 +++++++++++++++++++++
 .../src/test/resources/runtimets/sqlpp_queries.xml |   6 +-
 .../common/context/GlobalVirtualBufferCache.java   |   2 +-
 .../asterix/metadata/utils/KeyFieldTypeUtil.java   |  19 ++
 hyracks-fullstack/pom.xml                          |   2 +-
 26 files changed, 528 insertions(+), 35 deletions(-)



(asterixdb) 12/22: [NO ISSUE][RT] Truncate warning message to writeUTF limit

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit ec3f822acd6e6d2013936498af218f3c551d0310
Author: Ali Alsuliman <al...@gmail.com>
AuthorDate: Wed Jan 7 16:49:43 2026 -0800

    [NO ISSUE][RT] Truncate warning message to writeUTF limit
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Details:
    When serializing the warnings, truncate the message to
    the UTF-8 limit of 65535 since DataOutput.writeUTF()
    has a hard limit.
    
    Ext-ref: MB-69956
    
    Change-Id: Ic18a027bc88da8813c6f58c40f6eef236fdb1d14
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20769
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Ali Alsuliman <al...@gmail.com>
    Reviewed-by: Ian Maxon <im...@apache.org>
---
 .../org/apache/hyracks/api/exceptions/Warning.java |  3 +-
 .../hyracks/api/util/JavaSerializationUtils.java   | 37 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/Warning.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/Warning.java
index 5f01559d03..8705f368a8 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/Warning.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/Warning.java
@@ -26,6 +26,7 @@ import java.util.Objects;
 
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.hyracks.api.util.ErrorMessageUtil;
+import org.apache.hyracks.api.util.JavaSerializationUtils;
 
 public class Warning implements Serializable {
 
@@ -85,7 +86,7 @@ public class Warning implements Serializable {
     public void writeFields(DataOutput output) throws IOException {
         output.writeUTF(component);
         output.writeInt(code);
-        output.writeUTF(message);
+        JavaSerializationUtils.writeTruncatedUTF(output, message);
         SourceLocation.writeFields(srcLocation, output);
         writeParams(output, params);
     }
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java
index 8e2420498e..90a82dbd6f 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java
@@ -20,6 +20,7 @@ package org.apache.hyracks.api.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.DataOutput;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
@@ -34,10 +35,46 @@ import org.apache.hyracks.api.comm.IJavaSerializationProvider;
 
 public class JavaSerializationUtils {
     private static IJavaSerializationProvider serProvider = DefaultJavaSerializationProvider.INSTANCE;
+    private static final int MAX_UTF_BYTES = 65535;
+    private static final int SAFE_CHAR_LIMIT = MAX_UTF_BYTES / 3;
 
     private JavaSerializationUtils() {
     }
 
+    /**
+     * This is to be used when small strings are the usual case. For strings whose modified UTF-8 bytes count is larger
+     * than 65535, then it truncates the string to a one that is less than 65535.
+     */
+    public static void writeTruncatedUTF(DataOutput out, String s) throws IOException {
+        if (s.length() <= SAFE_CHAR_LIMIT) {
+            out.writeUTF(s);
+            return;
+        }
+        truncateToUTFLimit(out, s);
+    }
+
+    private static void truncateToUTFLimit(DataOutput out, String s) throws IOException {
+        int modifiedUtf8Len = 0;
+        int i = 0;
+        while (i < s.length()) {
+            int c = s.charAt(i);
+            int bytes;
+            if (c >= 0x0001 && c <= 0x007F) {
+                bytes = 1;
+            } else if (c <= 0x07FF) {
+                bytes = 2;
+            } else {
+                bytes = 3;
+            }
+            modifiedUtf8Len += bytes;
+            if (modifiedUtf8Len > MAX_UTF_BYTES) {
+                break;
+            }
+            i++;
+        }
+        out.writeUTF(i == s.length() ? s : s.substring(0, i));
+    }
+
     public static byte[] serialize(Serializable jobSpec) throws IOException {
         if (jobSpec instanceof byte[]) {
             return (byte[]) jobSpec;


(asterixdb) 17/22: Merge branch 'gerrit/neo' into 'gerrit/trinity'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 27932b29d1f3330e084a1d44f2d989d3598a4a25
Merge: b9488a5e3d fce80c4500
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sat Jan 10 21:54:08 2026 -0500

    Merge branch 'gerrit/neo' into 'gerrit/trinity'
    
     * [NO ISSUE][HYR][NET] Advance Netty to 4.1.130.Final (MB-70073)
     * [NO ISSUE][*DB][EXT] Advance msgpack-core to 0.9.11 (MB-70074)
    
    Ext-ref: MB-70073,MB-70074
    Change-Id: Iafecf89871ad0a111d5aea5f7c1b0ab92cd79fa5

 asterixdb/pom.xml         | 2 +-
 hyracks-fullstack/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)



(asterixdb) 07/22: [ASTERIXDB-3677][COMP] Push limit to index-search of UNNEST_MAP op

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 0249eb936d872b357cdcf8f83728373178d0ed65
Author: Ali Alsuliman <al...@gmail.com>
AuthorDate: Mon Dec 8 17:36:15 2025 -0800

    [ASTERIXDB-3677][COMP] Push limit to index-search of UNNEST_MAP op
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Details:
    - Push limit to index-search of UNNEST_MAP op.
    - Enable query-index() on array indexes.
    - Fix FD computation for query-index().
    
    Ext-ref: MB-69534
    
    Change-Id: I4a7d0fe690fcefd845f60814d5a4477cd6bc4e6f
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20592
    Reviewed-by: Ali Alsuliman <al...@gmail.com>
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Preetham Poluparthi <pr...@apache.org>
    Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Peeyush Gupta <pe...@couchbase.com>
---
 .../rules/PushLimitIntoPrimarySearchRule.java      |  12 +-
 .../asterix/app/function/QueryIndexDatasource.java |  22 ++-
 .../asterix/app/function/QueryIndexRewriter.java   |  23 ++-
 .../queries/limit/pushdown_to_index_search.sqlpp}  |  28 ++-
 .../results/limit/pushdown_to_index_search.plan    |  44 +++++
 ...push-limit-to-join-primary-lookup.01.ddl.sqlpp} |  15 +-
 ...h-limit-to-join-primary-lookup.02.update.sqlpp} |  19 +-
 ...sh-limit-to-join-primary-lookup.03.query.sqlpp} |  15 +-
 ...push-limit-to-join-primary-lookup.99.ddl.sqlpp} |   4 +-
 .../query_index/q01/q01.001.ddl.sqlpp              |   7 +-
 .../query_index/q01/q01.002.update.sqlpp           |   7 +
 .../q01.032.query.sqlpp}                           |   5 +-
 .../q01.033.query.sqlpp}                           |   5 +-
 .../q01.034.query.sqlpp}                           |   5 +-
 .../q01.035.query.sqlpp}                           |   5 +-
 .../queries_sqlpp/tpcds/q90/q90.4.query.sqlpp      |  43 +++++
 .../push-limit-to-join-primary-lookup.03.adm       |   2 +
 .../runtimets/results/query_index/q01/q01.032.adm  |  16 ++
 .../runtimets/results/query_index/q01/q01.033.adm  |   7 +
 .../runtimets/results/query_index/q01/q01.034.plan |  20 ++
 .../runtimets/results/query_index/q01/q01.035.plan |  20 ++
 .../runtimets/results/tpcds/q90/q90.2.plan         | 210 +++++++++++++++++++++
 .../src/test/resources/runtimets/sqlpp_queries.xml |   6 +-
 .../asterix/metadata/utils/KeyFieldTypeUtil.java   |  19 ++
 24 files changed, 526 insertions(+), 33 deletions(-)

diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushLimitIntoPrimarySearchRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushLimitIntoPrimarySearchRule.java
index d95a95257a..3e6e575fd5 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushLimitIntoPrimarySearchRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushLimitIntoPrimarySearchRule.java
@@ -142,6 +142,16 @@ public class PushLimitIntoPrimarySearchRule implements IAlgebraicRewriteRule {
             case UNNEST_MAP:
                 UnnestMapOperator unnestMap = (UnnestMapOperator) child;
                 if (isUnnestMapPushable(unnestMap, selectedVariables)) {
+                    // set only the limit if the unnest-map is propagating the input vars.
+                    // when the unnest-map op is propagating the input vars, currently the index-search runtime fails to
+                    // evaluate the select-condition because at the time the select-condition is evaluated, the tuple
+                    // has only the index-search vars while the select-condition expects the tuple to have both the
+                    // input vars + index-search vars. the index-search runtime needs to be fixed to construct the
+                    // complete tuple vars first, then evaluate the select-condition.
+                    if (unnestMap.propagatesInput()) {
+                        unnestMap.setOutputLimit(outputLimit);
+                        return true;
+                    }
                     unnestMap.setSelectCondition(selectConditionRef);
                     unnestMap.setOutputLimit(outputLimit);
                     changed = true;
@@ -180,7 +190,7 @@ public class PushLimitIntoPrimarySearchRule implements IAlgebraicRewriteRule {
             return false;
         }
         ILogicalExpression unnestExpr = op.getExpressionRef().getValue();
-        if (op.propagatesInput() || unnestExpr.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
+        if (unnestExpr.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
             return false;
         }
         AbstractFunctionCallExpression f = (AbstractFunctionCallExpression) unnestExpr;
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexDatasource.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexDatasource.java
index 1c036f87e4..1c6d2cc964 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexDatasource.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexDatasource.java
@@ -21,6 +21,7 @@ package org.apache.asterix.app.function;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 
 import org.apache.asterix.common.cluster.IClusterStateManager;
 import org.apache.asterix.metadata.api.IDatasourceFunction;
@@ -33,6 +34,7 @@ import org.apache.asterix.om.types.IAType;
 import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
 import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
 import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.common.utils.ListSet;
 import org.apache.hyracks.algebricks.common.utils.Pair;
 import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
 import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
@@ -41,12 +43,14 @@ import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSourceProperties
 import org.apache.hyracks.algebricks.core.algebra.metadata.IProjectionInfo;
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.IOperatorSchema;
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator;
+import org.apache.hyracks.algebricks.core.algebra.properties.FunctionalDependency;
 import org.apache.hyracks.algebricks.core.algebra.properties.ILocalStructuralProperty;
 import org.apache.hyracks.algebricks.core.algebra.properties.INodeDomain;
+import org.apache.hyracks.algebricks.core.algebra.properties.IPartitioningProperty;
 import org.apache.hyracks.algebricks.core.algebra.properties.LocalOrderProperty;
 import org.apache.hyracks.algebricks.core.algebra.properties.OrderColumn;
-import org.apache.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty;
 import org.apache.hyracks.algebricks.core.algebra.properties.StructuralPropertiesVector;
+import org.apache.hyracks.algebricks.core.algebra.properties.UnorderedPartitionedProperty;
 import org.apache.hyracks.algebricks.core.jobgen.impl.JobGenContext;
 import org.apache.hyracks.api.dataflow.IOperatorDescriptor;
 import org.apache.hyracks.api.job.JobSpecification;
@@ -93,6 +97,11 @@ public class QueryIndexDatasource extends FunctionDataSource {
         return storageLocations;
     }
 
+    @Override
+    public void computeFDs(List<LogicalVariable> scanVariables, List<FunctionalDependency> fdList) {
+        // no op
+    }
+
     @Override
     public boolean isScanAccessPathALeaf() {
         // the index scan op is not a leaf op. the ETS op will start the scan of the index. we need the ETS op below
@@ -122,14 +131,21 @@ public class QueryIndexDatasource extends FunctionDataSource {
     @Override
     public IDataSourcePropertiesProvider getPropertiesProvider() {
         return scanVariables -> {
+            // scanVariables should be SKs + PKs
             List<ILocalStructuralProperty> propsLocal = new ArrayList<>(1);
-            //TODO(ali): consider primary keys?
+            //TODO(ali): local ordering should be gone in compute-storage separation setup similar to data-scan
             List<OrderColumn> secKeys = new ArrayList<>(numSecKeys);
             for (int i = 0; i < numSecKeys; i++) {
                 secKeys.add(new OrderColumn(scanVariables.get(i), OrderOperator.IOrder.OrderKind.ASC));
             }
             propsLocal.add(new LocalOrderProperty(secKeys));
-            return new StructuralPropertiesVector(new RandomPartitioningProperty(domain), propsLocal);
+            int numPKs = ds.getPrimaryKeys().size();
+            Set<LogicalVariable> pVars = new ListSet<>();
+            for (int i = 0, j = numSecKeys; i < numPKs; i++, j++) {
+                pVars.add(scanVariables.get(j));
+            }
+            IPartitioningProperty pp = new UnorderedPartitionedProperty(pVars, domain);
+            return new StructuralPropertiesVector(pp, propsLocal);
         };
     }
 
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexRewriter.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexRewriter.java
index e0ff9c2ee0..d4789239a7 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexRewriter.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexRewriter.java
@@ -127,8 +127,10 @@ public class QueryIndexRewriter extends FunctionRewriter implements IResultTypeC
         AlgebricksAbsolutePartitionConstraint secPartitionConstraint =
                 (AlgebricksAbsolutePartitionConstraint) secIdxHelper.getSecondaryPartitionConstraint();
         INodeDomain domain = mp.findNodeDomain(ds.getNodeGroupName());
+        ARecordType dsType = (ARecordType) mp.findType(ds);
+        ARecordType metaType = DatasetUtil.getMetaType(mp, ds);
         ARecordType recType = computeRecType(f, mp, null, null, null);
-        int numSecKeys = ((Index.ValueIndexDetails) idx.getIndexDetails()).getKeyFieldNames().size();
+        int numSecKeys = KeyFieldTypeUtil.getNumSecondaryKeys(idx, dsType, metaType);
         return new QueryIndexDatasource(ds, idx.getIndexName(), domain, secPartitionConstraint, recType, numSecKeys);
     }
 
@@ -144,7 +146,9 @@ public class QueryIndexRewriter extends FunctionRewriter implements IResultTypeC
         ARecordType dsType = (ARecordType) metadataProvider.findType(dataset);
         ARecordType metaType = DatasetUtil.getMetaType(metadataProvider, dataset);
         List<IAType> dsKeyTypes = KeyFieldTypeUtil.getPartitoningKeyTypes(dataset, dsType, metaType);
-        List<Pair<IAType, Boolean>> secKeyTypes = KeyFieldTypeUtil.getBTreeIndexKeyTypes(index, dsType, metaType);
+        List<Pair<IAType, Boolean>> secKeyTypes = index.getIndexType() == DatasetConfig.IndexType.BTREE
+                ? KeyFieldTypeUtil.getBTreeIndexKeyTypes(index, dsType, metaType)
+                : KeyFieldTypeUtil.getArrayIndexKeyTypes(index, dsType, metaType);
         int numPrimaryKeys = dsKeyTypes.size();
         int numSecKeys = secKeyTypes.size();
         String[] fieldNames = new String[numSecKeys + numPrimaryKeys];
@@ -187,6 +191,9 @@ public class QueryIndexRewriter extends FunctionRewriter implements IResultTypeC
         if (dataset == null) {
             throw new CompilationException(ErrorCode.UNKNOWN_DATASET_IN_DATAVERSE, loc, dsName, dvName);
         }
+        if (dataset.isCorrelated()) {
+            throw new CompilationException(ErrorCode.OPERATION_NOT_SUPPORTED_ON_PRIMARY_INDEX, loc, dsName);
+        }
         return dataset;
     }
 
@@ -200,12 +207,12 @@ public class QueryIndexRewriter extends FunctionRewriter implements IResultTypeC
             throw new CompilationException(ErrorCode.OPERATION_NOT_SUPPORTED_ON_PRIMARY_INDEX, loc, idxName);
         }
         DatasetConfig.IndexType idxType = index.getIndexType();
-        // currently, only normal secondary indexes are supported
-        if (idxType != DatasetConfig.IndexType.BTREE || Index.IndexCategory.of(idxType) != Index.IndexCategory.VALUE
-                || index.isPrimaryKeyIndex()) {
-            throw new CompilationException(ErrorCode.COMPILATION_FUNC_EXPRESSION_CANNOT_UTILIZE_INDEX,
-                    f.getSourceLocation(), LogRedactionUtil.userData(f.toString()));
+        // currently, only normal and array secondary indexes are supported
+        if ((idxType == DatasetConfig.IndexType.BTREE && !index.isPrimaryKeyIndex())
+                || idxType == DatasetConfig.IndexType.ARRAY) {
+            return index;
         }
-        return index;
+        throw new CompilationException(ErrorCode.COMPILATION_FUNC_EXPRESSION_CANNOT_UTILIZE_INDEX,
+                f.getSourceLocation(), LogRedactionUtil.userData(f.toString()));
     }
 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/limit/pushdown_to_index_search.sqlpp
similarity index 58%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/optimizerts/queries/limit/pushdown_to_index_search.sqlpp
index cf3a0e362e..abdc0a40c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/limit/pushdown_to_index_search.sqlpp
@@ -17,6 +17,30 @@
  * under the License.
  */
 
+/*
+ * Description: Tests that LIMIT is pushed down to index-search in indexnl join
+ */
+
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
 USE test;
-// cannot use array index
-FROM query_index("test", "ds1", "ds1_array_idx") as v SELECT VALUE v;
\ No newline at end of file
+
+CREATE TYPE openType AS OPEN {
+  id:string
+};
+
+CREATE DATASET ds1(openType) PRIMARY KEY id;
+CREATE DATASET ds2(openType) PRIMARY KEY id;
+
+SELECT
+    ds1.field1,
+    ds1.field2,
+    ds1.field3,
+    ds1.field4,
+    comp_field,
+    ds2.fieldX
+FROM ds1 AS ds1
+JOIN ds2 AS ds2
+    ON ds2.id /*+ indexnl */ = (ds1.field2 || ":" || TO_STRING(ds1.field3) || ":" || ds1.field4)
+    LET comp_field = (REPLACE(ds1.field1, "-", "") || "03")
+LIMIT 2;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/limit/pushdown_to_index_search.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/limit/pushdown_to_index_search.plan
new file mode 100644
index 0000000000..172833102e
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/limit/pushdown_to_index_search.plan
@@ -0,0 +1,44 @@
+distribute result [$$54]
+-- DISTRIBUTE_RESULT  |UNPARTITIONED|
+  exchange
+  -- ONE_TO_ONE_EXCHANGE  |UNPARTITIONED|
+    limit 2
+    -- STREAM_LIMIT  |UNPARTITIONED|
+      project ([$$54])
+      -- STREAM_PROJECT  |PARTITIONED|
+        exchange
+        -- SORT_MERGE_EXCHANGE [$$60(ASC) ]  |PARTITIONED|
+          project ([$$60, $$54])
+          -- STREAM_PROJECT  |PARTITIONED|
+            assign [$$54] <- [{"field1": $$55, "field2": $$56, "field3": $$57, "field4": $$58, "comp_field": string-concat(ordered-list-constructor(replace($$55, "-", ""), "03")), "fieldX": $$ds2.getField("fieldX")}]
+            -- ASSIGN  |PARTITIONED|
+              limit 2
+              -- STREAM_LIMIT  |PARTITIONED|
+                project ([$$55, $$58, $$57, $$56, $$60, $$ds2])
+                -- STREAM_PROJECT  |PARTITIONED|
+                  exchange
+                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                    unnest-map [$$60, $$ds2] <- index-search("ds2", 0, "test", "ds2", true, true, 1, $$62, 1, $$62, true, true, true) limit 2
+                    -- BTREE_SEARCH  |PARTITIONED|
+                      exchange
+                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                        order (ASC, $$62)
+                        -- STABLE_SORT [$$62(ASC)]  |PARTITIONED|
+                          exchange
+                          -- HASH_PARTITION_EXCHANGE [$$62]  |PARTITIONED|
+                            assign [$$62] <- [string-concat(ordered-list-constructor($$56, ":", to-string($$57), ":", $$58))]
+                            -- ASSIGN  |PARTITIONED|
+                              project ([$$55, $$58, $$57, $$56])
+                              -- STREAM_PROJECT  |PARTITIONED|
+                                assign [$$55, $$58, $$57, $$56] <- [$$ds1.getField("field1"), $$ds1.getField("field4"), $$ds1.getField("field3"), $$ds1.getField("field2")]
+                                -- ASSIGN  |PARTITIONED|
+                                  project ([$$ds1])
+                                  -- STREAM_PROJECT  |PARTITIONED|
+                                    exchange
+                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                      data-scan []<-[$$59, $$ds1] <- test.ds1
+                                      -- DATASOURCE_SCAN  |PARTITIONED|
+                                        exchange
+                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                          empty-tuple-source
+                                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.01.ddl.sqlpp
similarity index 74%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.01.ddl.sqlpp
index cf3a0e362e..25bfa4ef4c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.01.ddl.sqlpp
@@ -17,6 +17,17 @@
  * under the License.
  */
 
+/*
+ * Description: Tests that LIMIT is pushed down to index-search in indexnl join
+ */
+
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
 USE test;
-// cannot use array index
-FROM query_index("test", "ds1", "ds1_array_idx") as v SELECT VALUE v;
\ No newline at end of file
+
+CREATE TYPE openType AS OPEN {
+  id:string
+};
+
+CREATE DATASET ds1(openType) PRIMARY KEY id;
+CREATE DATASET ds2(openType) PRIMARY KEY id;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.02.update.sqlpp
similarity index 58%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.02.update.sqlpp
index cf3a0e362e..868ce4e5f2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.02.update.sqlpp
@@ -18,5 +18,20 @@
  */
 
 USE test;
-// cannot use array index
-FROM query_index("test", "ds1", "ds1_array_idx") as v SELECT VALUE v;
\ No newline at end of file
+
+UPSERT INTO ds1([
+{"id": "1", "field1": "f1", "field2": "1", "field3": "1", "field4": "1"},
+{"id": "2", "field1": "f2", "field2": "1", "field3": "1", "field4": "2"},
+{"id": "3", "field1": "f3", "field2": "1", "field3": "1", "field4": "3"},
+{"id": "4", "field1": "f4", "field2": "1", "field3": "1", "field4": "4"},
+{"id": "5", "field1": "f5", "field2": "1", "field3": "1", "field4": "5"},
+{"id": "6", "field1": "f6", "field2": "1", "field3": "1", "field4": "6"}
+]
+);
+
+UPSERT INTO ds2([
+{"id": "1:1:1", "fieldX": 10},
+{"id": "1:1:2", "fieldX": 11},
+{"id": "1:1:3", "fieldX": 12}
+]
+);
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.query.sqlpp
similarity index 73%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.query.sqlpp
index cf3a0e362e..39e4ce97a0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.query.sqlpp
@@ -18,5 +18,16 @@
  */
 
 USE test;
-// cannot use array index
-FROM query_index("test", "ds1", "ds1_array_idx") as v SELECT VALUE v;
\ No newline at end of file
+
+SELECT
+    ds1.field1,
+    ds1.field2,
+    ds1.field3,
+    ds1.field4,
+    comp_field,
+    ds2.fieldX
+FROM ds1 AS ds1
+JOIN ds2 AS ds2
+    ON ds2.id /*+ indexnl */ = (ds1.field2 || ":" || TO_STRING(ds1.field3) || ":" || ds1.field4)
+    LET comp_field = (REPLACE(ds1.field1, "-", "") || "03")
+LIMIT 2;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.99.ddl.sqlpp
similarity index 88%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.99.ddl.sqlpp
index cf3a0e362e..36b2bab543 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.99.ddl.sqlpp
@@ -17,6 +17,4 @@
  * under the License.
  */
 
-USE test;
-// cannot use array index
-FROM query_index("test", "ds1", "ds1_array_idx") as v SELECT VALUE v;
\ No newline at end of file
+DROP DATAVERSE test IF EXISTS;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.001.ddl.sqlpp
index 270a1d47d1..1a6023f20e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.001.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.001.ddl.sqlpp
@@ -24,10 +24,12 @@ USE test;
 CREATE TYPE t1 AS { id: int };
 CREATE TYPE t2 AS { id: int, age: int };
 CREATE TYPE t3 AS { id: int, age: int?, dept: string? };
+CREATE TYPE t4 AS { id: int, ages: [int]};
 
 CREATE DATASET ds1(t1) PRIMARY KEY id;
 CREATE DATASET ds2(t2) PRIMARY KEY id;
 CREATE DATASET ds3(t3) PRIMARY KEY id;
+CREATE DATASET ds4(t4) PRIMARY KEY id;
 
 CREATE INDEX ds1_age ON ds1(age: int);
 CREATE INDEX ds1_dept ON ds1(dept: string);
@@ -42,4 +44,7 @@ CREATE INDEX ds2_dept_age ON ds2(dept: string, age);
 CREATE INDEX ds3_age ON ds3(age);
 CREATE INDEX ds3_dept ON ds3(dept);
 CREATE INDEX ds3_age_dept ON ds3(age, dept);
-CREATE INDEX ds3_dept_age ON ds3(dept, age);
\ No newline at end of file
+CREATE INDEX ds3_dept_age ON ds3(dept, age);
+
+CREATE INDEX ds4_array_idx1 ON ds4(UNNEST ages) EXCLUDE UNKNOWN KEY;
+CREATE INDEX ds4_array_idx2 ON ds4(UNNEST ages_op1 : int) EXCLUDE UNKNOWN KEY;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.002.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.002.update.sqlpp
index 04fd66f6ef..3dd8ffa3f2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.002.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.002.update.sqlpp
@@ -62,4 +62,11 @@ UPSERT INTO ds3 ([
 {"id":12, "age": null, "dept": null},
 {"id":13, "age": null              },
 {"id":14,              "dept": null}
+]);
+
+UPSERT INTO ds4 ([
+{"id":1, "ages": [1,9,2,3], "ages_op1": [111,999,222,333]},
+{"id":2, "ages": [1,9,2,3], "ages_op1": null},
+{"id":3, "ages": [1,9,2,3]},
+{"id":4, "ages": [1,9,2,7], "ages_op1": [11,99,null,77]}
 ]);
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.032.query.sqlpp
similarity index 85%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.032.query.sqlpp
index cf3a0e362e..de6f4e92d4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.032.query.sqlpp
@@ -18,5 +18,6 @@
  */
 
 USE test;
-// cannot use array index
-FROM query_index("test", "ds1", "ds1_array_idx") as v SELECT VALUE v;
\ No newline at end of file
+SET `compiler.sort.parallel` "false";
+SELECT v.SK0 AS age, v.PK0
+FROM query_index("test", "ds4", "ds4_array_idx1") as v ORDER BY v.SK0, v.PK0;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.033.query.sqlpp
similarity index 85%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.033.query.sqlpp
index cf3a0e362e..03487ed891 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.033.query.sqlpp
@@ -18,5 +18,6 @@
  */
 
 USE test;
-// cannot use array index
-FROM query_index("test", "ds1", "ds1_array_idx") as v SELECT VALUE v;
\ No newline at end of file
+SET `compiler.sort.parallel` "false";
+SELECT v.SK0 AS age, v.PK0
+FROM query_index("test", "ds4", "ds4_array_idx2") as v ORDER BY v.SK0, v.PK0;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.034.query.sqlpp
similarity index 84%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.034.query.sqlpp
index cf3a0e362e..6dc41b3f66 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.034.query.sqlpp
@@ -18,5 +18,6 @@
  */
 
 USE test;
-// cannot use array index
-FROM query_index("test", "ds1", "ds1_array_idx") as v SELECT VALUE v;
\ No newline at end of file
+SET `compiler.sort.parallel` "false";
+EXPLAIN SELECT v.SK0 AS age, v.PK0
+FROM query_index("test", "ds4", "ds4_array_idx1") as v ORDER BY v.SK0, v.PK0;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.035.query.sqlpp
similarity index 84%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.035.query.sqlpp
index cf3a0e362e..1144f5a7cd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/negative/negative.005.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/query_index/q01/q01.035.query.sqlpp
@@ -18,5 +18,6 @@
  */
 
 USE test;
-// cannot use array index
-FROM query_index("test", "ds1", "ds1_array_idx") as v SELECT VALUE v;
\ No newline at end of file
+SET `compiler.sort.parallel` "false";
+EXPLAIN SELECT v.SK0 AS age, v.PK0
+FROM query_index("test", "ds4", "ds4_array_idx2") as v ORDER BY v.SK0, v.PK0;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q90/q90.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q90/q90.4.query.sqlpp
new file mode 100644
index 0000000000..d23d33e637
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q90/q90.4.query.sqlpp
@@ -0,0 +1,43 @@
+/*
+ * 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 tpcds;
+set `compiler.parallelism` "3";
+explain select ((array_count((select 1 as amc
+         from web_sales ws1, household_demographics , time_dim, web_page
+         where ws1.ws_sold_time_sk = time_dim.t_time_sk
+         and ws1.ws_ship_hdemo_sk = household_demographics.hd_demo_sk
+         and ws1.ws_web_page_sk = web_page.wp_web_page_sk
+         and time_dim.t_hour >= 6
+         and time_dim.t_hour <= 6+1
+         and household_demographics.hd_dep_count = 8
+         and web_page.wp_char_count >= 5000
+         and web_page.wp_char_count <= 5200 limit 10))) *1.0 /(array_count((select 1 as pmc
+         from web_sales ws2, household_demographics , time_dim, web_page
+         where ws2.ws_sold_time_sk = time_dim.t_time_sk
+         and ws2.ws_ship_hdemo_sk = household_demographics.hd_demo_sk
+         and ws2.ws_web_page_sk = web_page.wp_web_page_sk
+         and time_dim.t_hour >= 14
+         and time_dim.t_hour <= 14+1
+         and household_demographics.hd_dep_count = 8
+         and web_page.wp_char_count >= 5000
+         and web_page.wp_char_count <= 5200 limit 10)))) am_pm_ratio
+ order by am_pm_ratio
+ limit 100;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.adm
new file mode 100644
index 0000000000..c61af0f3dc
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.adm
@@ -0,0 +1,2 @@
+{ "comp_field": "f103", "field1": "f1", "field2": "1", "field3": "1", "field4": "1", "fieldX": 10 }
+{ "comp_field": "f203", "field1": "f2", "field2": "1", "field3": "1", "field4": "2", "fieldX": 11 }
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.032.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.032.adm
new file mode 100644
index 0000000000..93f066504f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.032.adm
@@ -0,0 +1,16 @@
+{ "age": 1, "PK0": 1 }
+{ "age": 1, "PK0": 2 }
+{ "age": 1, "PK0": 3 }
+{ "age": 1, "PK0": 4 }
+{ "age": 2, "PK0": 1 }
+{ "age": 2, "PK0": 2 }
+{ "age": 2, "PK0": 3 }
+{ "age": 2, "PK0": 4 }
+{ "age": 3, "PK0": 1 }
+{ "age": 3, "PK0": 2 }
+{ "age": 3, "PK0": 3 }
+{ "age": 7, "PK0": 4 }
+{ "age": 9, "PK0": 1 }
+{ "age": 9, "PK0": 2 }
+{ "age": 9, "PK0": 3 }
+{ "age": 9, "PK0": 4 }
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.033.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.033.adm
new file mode 100644
index 0000000000..2e728ef6a3
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.033.adm
@@ -0,0 +1,7 @@
+{ "age": 11, "PK0": 4 }
+{ "age": 77, "PK0": 4 }
+{ "age": 99, "PK0": 4 }
+{ "age": 111, "PK0": 1 }
+{ "age": 222, "PK0": 1 }
+{ "age": 333, "PK0": 1 }
+{ "age": 999, "PK0": 1 }
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.034.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.034.plan
new file mode 100644
index 0000000000..30f0d1e7a1
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.034.plan
@@ -0,0 +1,20 @@
+distribute result [$$16] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+-- DISTRIBUTE_RESULT  |PARTITIONED|
+  exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+    project ([$$16]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+    -- STREAM_PROJECT  |PARTITIONED|
+      assign [$$16] <- [{"age": $$19, "PK0": $$20}] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+      -- ASSIGN  |PARTITIONED|
+        exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+        -- SORT_MERGE_EXCHANGE [$$19(ASC), $$20(ASC) ]  |PARTITIONED|
+          order (ASC, $$19) (ASC, $$20) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+          -- STABLE_SORT [$$19(ASC), $$20(ASC)]  |PARTITIONED|
+            exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+              data-scan []<-[$$19, $$20] <- test.ds4.ds4_array_idx1.query-index [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
+              -- DATASOURCE_SCAN  |PARTITIONED|
+                exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                  empty-tuple-source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.035.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.035.plan
new file mode 100644
index 0000000000..5255c02f54
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.035.plan
@@ -0,0 +1,20 @@
+distribute result [$$16] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+-- DISTRIBUTE_RESULT  |PARTITIONED|
+  exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+    project ([$$16]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+    -- STREAM_PROJECT  |PARTITIONED|
+      assign [$$16] <- [{"age": $$19, "PK0": $$20}] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+      -- ASSIGN  |PARTITIONED|
+        exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+        -- SORT_MERGE_EXCHANGE [$$19(ASC), $$20(ASC) ]  |PARTITIONED|
+          order (ASC, $$19) (ASC, $$20) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+          -- STABLE_SORT [$$19(ASC), $$20(ASC)]  |PARTITIONED|
+            exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+              data-scan []<-[$$19, $$20] <- test.ds4.ds4_array_idx2.query-index [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
+              -- DATASOURCE_SCAN  |PARTITIONED|
+                exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                  empty-tuple-source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpcds/q90/q90.2.plan b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpcds/q90/q90.2.plan
new file mode 100644
index 0000000000..9021e07eae
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpcds/q90/q90.2.plan
@@ -0,0 +1,210 @@
+distribute result [$$166] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+-- DISTRIBUTE_RESULT  |LOCAL|
+  exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+  -- ONE_TO_ONE_EXCHANGE  |LOCAL|
+    limit 100 [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+    -- STREAM_LIMIT  |LOCAL|
+      project ([$$166]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+      -- STREAM_PROJECT  |LOCAL|
+        assign [$$166] <- [{"am_pm_ratio": $#1}] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+        -- ASSIGN  |LOCAL|
+          limit 100 [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+          -- STREAM_LIMIT  |LOCAL|
+            exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+            -- ONE_TO_ONE_EXCHANGE  |LOCAL|
+              order (topK: 100) (ASC, $#1) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+              -- STABLE_SORT [topK: 100] [$#1(ASC)]  |LOCAL|
+                exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                -- ONE_TO_ONE_EXCHANGE  |LOCAL|
+                  project ([$#1]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                  -- STREAM_PROJECT  |LOCAL|
+                    assign [$#1] <- [numeric-divide(numeric-multiply($$196, 1.0), $$183)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                    -- ASSIGN  |LOCAL|
+                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                      -- ONE_TO_ONE_EXCHANGE  |LOCAL|
+                        join (true) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                        -- NESTED_LOOP  |LOCAL|
+                          exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                          -- ONE_TO_ONE_EXCHANGE  |LOCAL|
+                            aggregate [$$196] <- [agg-sql-sum($$197)] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                            -- AGGREGATE  |LOCAL|
+                              aggregate [$$197] <- [agg-sql-count(1)] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                              -- AGGREGATE  |LOCAL|
+                                limit 10 [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                                -- STREAM_LIMIT  |UNPARTITIONED|
+                                  project ([]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                                  -- STREAM_PROJECT  |PARTITIONED|
+                                    exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                                    -- SORT_MERGE_EXCHANGE [$$173(ASC) ]  |PARTITIONED|
+                                      limit 10 [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                                      -- STREAM_LIMIT  |PARTITIONED|
+                                        project ([$$173]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                                        -- STREAM_PROJECT  |PARTITIONED|
+                                          select (and(ge($$167, 5000), le($$167, 5200))) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1.3E7]
+                                          -- STREAM_SELECT  |PARTITIONED|
+                                            project ([$$173, $$167]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+                                            -- STREAM_PROJECT  |PARTITIONED|
+                                              assign [$$167] <- [$$web_page.getField(10)] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+                                              -- ASSIGN  |PARTITIONED|
+                                                project ([$$173, $$web_page]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                  exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                    unnest-map [$$173, $$web_page] <- index-search("web_page", 0, "tpcds", "web_page", true, true, 1, $$181, 1, $$181, true, true, true) limit 10 [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
+                                                    -- BTREE_SEARCH  |PARTITIONED|
+                                                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                        order (ASC, $$181) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                        -- STABLE_SORT [$$181(ASC)]  |PARTITIONED|
+                                                          exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                          -- HASH_PARTITION_EXCHANGE [$$181]  |PARTITIONED|
+                                                            project ([$$181]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                              select (and(ge($$168, 6), le($$168, 7))) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 9000000.0]
+                                                              -- STREAM_SELECT  |PARTITIONED|
+                                                                project ([$$181, $$168]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                  assign [$$168] <- [$$time_dim.getField(3)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                  -- ASSIGN  |PARTITIONED|
+                                                                    project ([$$181, $$time_dim]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                        unnest-map [$$172, $$time_dim] <- index-search("time_dim", 0, "tpcds", "time_dim", true, true, 1, $$184, 1, $$184, true, true, true) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
+                                                                        -- BTREE_SEARCH  |PARTITIONED|
+                                                                          exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            order (ASC, $$184) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                            -- STABLE_SORT [$$184(ASC)]  |PARTITIONED|
+                                                                              exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                              -- HASH_PARTITION_EXCHANGE [$$184]  |PARTITIONED|
+                                                                                project ([$$181, $$184]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                                  select (eq($$household_demographics.getField(3), 8)) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 5000000.0]
+                                                                                  -- STREAM_SELECT  |PARTITIONED|
+                                                                                    project ([$$181, $$184, $$household_demographics]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                        unnest-map [$$171, $$household_demographics] <- index-search("household_demographics", 0, "tpcds", "household_demographics", true, true, 1, $$186, 1, $$186, true, true, true) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
+                                                                                        -- BTREE_SEARCH  |PARTITIONED|
+                                                                                          exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                            order (ASC, $$186) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                            -- STABLE_SORT [$$186(ASC)]  |PARTITIONED|
+                                                                                              exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                              -- HASH_PARTITION_EXCHANGE [$$186]  |PARTITIONED|
+                                                                                                project ([$$181, $$184, $$186]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                  assign [$$181, $$184, $$186] <- [$$ws1.getField(12), $$ws1.getField(1), $$ws1.getField(10)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                  -- ASSIGN  |PARTITIONED|
+                                                                                                    project ([$$ws1]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                      assign [$$ws1] <- [$$ws2] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                      -- ASSIGN  |PARTITIONED|
+                                                                                                        exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                          replicate [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                          -- REPLICATE  |PARTITIONED|
+                                                                                                            exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                              project ([$$ws2]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                                exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                                  data-scan []<-[$$174, $$175, $$ws2] <- tpcds.web_sales [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
+                                                                                                                  -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                                                    exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                                      empty-tuple-source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                      -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                          exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                          -- ONE_TO_ONE_EXCHANGE  |LOCAL|
+                            aggregate [$$183] <- [agg-sql-sum($$198)] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                            -- AGGREGATE  |LOCAL|
+                              aggregate [$$198] <- [agg-sql-count(1)] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                              -- AGGREGATE  |LOCAL|
+                                limit 10 [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                                -- STREAM_LIMIT  |UNPARTITIONED|
+                                  project ([]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                                  -- STREAM_PROJECT  |PARTITIONED|
+                                    exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                                    -- SORT_MERGE_EXCHANGE [$$178(ASC) ]  |PARTITIONED|
+                                      limit 10 [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                                      -- STREAM_LIMIT  |PARTITIONED|
+                                        project ([$$178]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
+                                        -- STREAM_PROJECT  |PARTITIONED|
+                                          select (and(ge($$179, 5000), le($$179, 5200))) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1.3E7]
+                                          -- STREAM_SELECT  |PARTITIONED|
+                                            project ([$$178, $$179]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+                                            -- STREAM_PROJECT  |PARTITIONED|
+                                              assign [$$179] <- [$$web_page.getField(10)] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+                                              -- ASSIGN  |PARTITIONED|
+                                                project ([$$178, $$web_page]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                  exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
+                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                    unnest-map [$$178, $$web_page] <- index-search("web_page", 0, "tpcds", "web_page", true, true, 1, $$190, 1, $$190, true, true, true) limit 10 [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
+                                                    -- BTREE_SEARCH  |PARTITIONED|
+                                                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                        order (ASC, $$190) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                        -- STABLE_SORT [$$190(ASC)]  |PARTITIONED|
+                                                          exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                          -- HASH_PARTITION_EXCHANGE [$$190]  |PARTITIONED|
+                                                            project ([$$190]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                              select (and(ge($$180, 14), le($$180, 15))) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 9000000.0]
+                                                              -- STREAM_SELECT  |PARTITIONED|
+                                                                project ([$$190, $$180]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                  assign [$$180] <- [$$time_dim.getField(3)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                  -- ASSIGN  |PARTITIONED|
+                                                                    project ([$$190, $$time_dim]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                        unnest-map [$$177, $$time_dim] <- index-search("time_dim", 0, "tpcds", "time_dim", true, true, 1, $$188, 1, $$188, true, true, true) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
+                                                                        -- BTREE_SEARCH  |PARTITIONED|
+                                                                          exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            order (ASC, $$188) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                            -- STABLE_SORT [$$188(ASC)]  |PARTITIONED|
+                                                                              exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                              -- HASH_PARTITION_EXCHANGE [$$188]  |PARTITIONED|
+                                                                                project ([$$190, $$188]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                                  select (eq($$household_demographics.getField(3), 8)) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 5000000.0]
+                                                                                  -- STREAM_SELECT  |PARTITIONED|
+                                                                                    project ([$$190, $$188, $$household_demographics]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                        unnest-map [$$176, $$household_demographics] <- index-search("household_demographics", 0, "tpcds", "household_demographics", true, true, 1, $$192, 1, $$192, true, true, true) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
+                                                                                        -- BTREE_SEARCH  |PARTITIONED|
+                                                                                          exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                            order (ASC, $$192) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                            -- STABLE_SORT [$$192(ASC)]  |PARTITIONED|
+                                                                                              exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                              -- HASH_PARTITION_EXCHANGE [$$192]  |PARTITIONED|
+                                                                                                project ([$$190, $$192, $$188]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                  assign [$$190, $$192, $$188] <- [$$ws2.getField(12), $$ws2.getField(10), $$ws2.getField(1)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                  -- ASSIGN  |PARTITIONED|
+                                                                                                    exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                      replicate [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                      -- REPLICATE  |PARTITIONED|
+                                                                                                        exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                          project ([$$ws2]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                            exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                              data-scan []<-[$$174, $$175, $$ws2] <- tpcds.web_sales [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
+                                                                                                              -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                                                exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                                  empty-tuple-source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
index 44bbeacc18..edba9c2b4f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
@@ -9841,7 +9841,6 @@
         <expected-error>ASX1105: Operation not supported on primary index ds1</expected-error>
         <expected-error>ASX1026: The given function expression query-index("test", "ds1", "pk_idx") cannot utilize index</expected-error>
         <expected-error>ASX1026: The given function expression query-index("test", "ds1", "sample_idx_1_ds1") cannot utilize index</expected-error>
-        <expected-error>ASX1026: The given function expression query-index("test", "ds1", "ds1_array_idx") cannot utilize index</expected-error>
       </compilation-unit>
     </test-case>
   </test-group>
@@ -15508,6 +15507,11 @@
         <output-dir compare="Text">push-limit-to-external-scan-select</output-dir>
       </compilation-unit>
     </test-case>
+    <test-case FilePath="limit">
+      <compilation-unit name="push-limit-to-join-primary-lookup">
+        <output-dir compare="Text">push-limit-to-join-primary-lookup</output-dir>
+      </compilation-unit>
+    </test-case>
     <test-case FilePath="limit">
       <compilation-unit name="push-limit-to-primary-scan">
         <output-dir compare="Text">push-limit-to-primary-scan</output-dir>
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/KeyFieldTypeUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/KeyFieldTypeUtil.java
index fd20b3c337..fcbe2988d3 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/KeyFieldTypeUtil.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/KeyFieldTypeUtil.java
@@ -161,6 +161,25 @@ public class KeyFieldTypeUtil {
         return indexKeyTypes;
     }
 
+    /**
+     * @see KeyFieldTypeUtil#getBTreeIndexKeyTypes(Index, ARecordType, ARecordType)
+     */
+    public static List<Pair<IAType, Boolean>> getArrayIndexKeyTypes(Index index, ARecordType recordType,
+            ARecordType metaRecordType) throws AlgebricksException {
+        Index.ArrayIndexDetails indexDetails = (Index.ArrayIndexDetails) index.getIndexDetails();
+        List<Pair<IAType, Boolean>> indexKeyTypes = new ArrayList<>();
+        for (Index.ArrayIndexElement e : indexDetails.getElementList()) {
+            for (int i = 0; i < e.getProjectList().size(); i++) {
+                ARecordType sourceType =
+                        (e.getSourceIndicator() == Index.RECORD_INDICATOR) ? recordType : metaRecordType;
+                Pair<IAType, Boolean> keyPairType = ArrayIndexUtil.getNonNullableOpenFieldType(e.getTypeList().get(i),
+                        e.getUnnestList(), e.getProjectList().get(i), sourceType);
+                indexKeyTypes.add(keyPairType);
+            }
+        }
+        return indexKeyTypes;
+    }
+
     /**
      * Get the types of RTree index key fields
      *


(asterixdb) 15/22: [NO ISSUE][HYR][NET] Advance Netty to 4.1.130.Final

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 3ec12d4a2d48eec92a2c2f8f116ea80e589f4445
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Jan 9 20:39:18 2026 -0500

    [NO ISSUE][HYR][NET] Advance Netty to 4.1.130.Final
    
    Ext-ref: MB-70073
    Change-Id: I949f9ea9cdf4b0c89c9bcb9c89d61dde2c1184d5
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20785
    Reviewed-by: Michael Blow <mb...@apache.org>
    Tested-by: Michael Blow <mb...@apache.org>
---
 hyracks-fullstack/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 1b02754ee1..a9fd58d12c 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -76,7 +76,7 @@
     <snappy.version>1.1.10.5</snappy.version>
     <jackson.version>2.19.2</jackson.version>
     <jackson-databind.version>${jackson.version}</jackson-databind.version>
-    <netty.version>4.1.125.Final</netty.version>
+    <netty.version>4.1.130.Final</netty.version>
 
     <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
     <implementation.url>https://asterixdb.apache.org/</implementation.url>


(asterixdb) 18/22: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit ab29f7603dc1c5a9498dec1357364a878ae3dc59
Merge: ee3d1d12f0 27932b29d1
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Mon Jan 12 05:41:00 2026 -0500

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [NO ISSUE][HYR][NET] Advance Netty to 4.1.130.Final (MB-70073)
     * [NO ISSUE][*DB][EXT] Advance msgpack-core to 0.9.11 (MB-70074)
    
    Ext-ref: MB-70073,MB-70074
    Change-Id: I03760acf0722486b35db81972723ae3f0c67ea1a

 asterixdb/pom.xml         | 2 +-
 hyracks-fullstack/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)



(asterixdb) 14/22: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit ee3d1d12f0ec458bfc7a7d8687ff3ca3d329feec
Merge: f7b9749abc b9488a5e3d
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Jan 9 18:09:15 2026 -0500

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [ASTERIXDB-3682][COMP] Push extracted assign to join branch (MB-69958)
     * [NO ISSUE][RT] Truncate warning message to writeUTF limit (MB-69956)
     * [ASTERIXDB-3683][COMP] Fix isomorphic window joins (MB-69788)
    
    Ext-ref: MB-69788,MB-69956,MB-69956,MB-69958
    Change-Id: I6a8d4106b478796dd33fe60db4055bc66d1fd708

 asterixdb/NOTICE                                   |   2 +-
 .../rules/ByNameToByIndexFieldAccessRule.java      |  65 +++-
 .../optimizer/rules/LoadRecordFieldsRule.java      |  54 ++--
 .../ASTERIXDB-3682-field-access-in-join.sqlpp      | 107 +++++++
 .../ASTERIXDB-3682-field-access-in-join.plan       | 348 +++++++++++++++++++++
 .../window/isomorphic/isomorphic.1.ddl.sqlpp       |  36 +++
 .../window/isomorphic/isomorphic.2.update.sqlpp    |  30 ++
 .../window/isomorphic/isomorphic.3.query.sqlpp     |  33 ++
 .../window/isomorphic/isomorphic.4.query.sqlpp     |  33 ++
 .../window/isomorphic/isomorphic.5.query.sqlpp     |  33 ++
 .../results/window/isomorphic/isomorphic.3.adm     | 100 ++++++
 .../results/window/isomorphic/isomorphic.4.adm     | 100 ++++++
 .../results/window/isomorphic/isomorphic.5.adm     |  50 +++
 .../src/test/resources/runtimets/sqlpp_queries.xml |   5 +
 hyracks-fullstack/NOTICE                           |   2 +-
 .../visitors/IsomorphismOperatorVisitor.java       |  40 +--
 .../org/apache/hyracks/api/exceptions/Warning.java |   3 +-
 .../hyracks/api/util/JavaSerializationUtils.java   |  37 +++
 18 files changed, 1001 insertions(+), 77 deletions(-)


(asterixdb) 19/22: [ASTERIXDB-3689][HYR][NET] MuxDemux negotiation hardening

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 0646f96bf6aa3549b3875e856329c66aa6913d84
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Jan 14 10:35:13 2026 -0500

    [ASTERIXDB-3689][HYR][NET] MuxDemux negotiation hardening
    
    Ext-ref: MB-70113,MB-70114
    Change-Id: I3887c992ad73f501f074ff5756f6204506043d65
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20795
    Reviewed-by: Ian Maxon <im...@apache.org>
    Tested-by: Michael Blow <mb...@apache.org>
    Reviewed-by: Michael Blow <mb...@apache.org>
---
 .../hyracks/net/protocols/muxdemux/MuxDemux.java   | 42 +++++++++---
 .../hyracks/net/protocols/tcp/TCPEndpoint.java     | 74 ++++++++++++----------
 2 files changed, 73 insertions(+), 43 deletions(-)

diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MuxDemux.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MuxDemux.java
index 3189ea11d2..0837b294b0 100644
--- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MuxDemux.java
+++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MuxDemux.java
@@ -30,6 +30,8 @@ import org.apache.hyracks.net.protocols.tcp.ITCPConnectionListener;
 import org.apache.hyracks.net.protocols.tcp.TCPConnection;
 import org.apache.hyracks.net.protocols.tcp.TCPEndpoint;
 import org.apache.hyracks.util.JSONUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -43,6 +45,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
  * @author vinayakb
  */
 public class MuxDemux {
+    private static final Logger LOGGER = LogManager.getLogger();
+
     private final InetSocketAddress localAddress;
 
     private final IChannelOpenListener channelOpenListener;
@@ -56,7 +60,7 @@ public class MuxDemux {
 
     private final MuxDemuxPerformanceCounters perfCounters;
 
-    private final IChannelInterfaceFactory channelInterfaceFatory;
+    private final IChannelInterfaceFactory channelInterfaceFactory;
 
     /**
      * Constructor.
@@ -80,7 +84,7 @@ public class MuxDemux {
         this.localAddress = localAddress;
         this.channelOpenListener = listener;
         this.maxConnectionAttempts = maxConnectionAttempts;
-        this.channelInterfaceFatory = channelInterfaceFactory;
+        this.channelInterfaceFactory = channelInterfaceFactory;
         outgoingConnectionMap = new HashMap<>();
         incomingConnectionMap = new HashMap<>();
         this.tcpEndpoint = new TCPEndpoint(new ITCPConnectionListener() {
@@ -90,7 +94,10 @@ public class MuxDemux {
                 synchronized (MuxDemux.this) {
                     mConn = outgoingConnectionMap.get(connection.getRemoteAddress());
                 }
-                assert mConn != null;
+                if (mConn == null) {
+                    throw new IllegalStateException(
+                            "connectionEstablished called for unknown connection: " + connection.getRemoteAddress());
+                }
                 mConn.setTCPConnection(connection);
                 connection.setEventListener(mConn);
                 connection.setAttachment(mConn);
@@ -110,10 +117,19 @@ public class MuxDemux {
                 MultiplexedConnection mConn;
                 synchronized (MuxDemux.this) {
                     mConn = outgoingConnectionMap.get(remoteAddress);
-                    assert mConn != null;
+                    if (mConn == null) {
+                        throw new IllegalStateException(
+                                "connectionFailure called for unknown connection: " + remoteAddress);
+                    }
                     int nConnectionAttempts = mConn.getConnectionAttempts();
                     if (nConnectionAttempts > MuxDemux.this.maxConnectionAttempts) {
-                        outgoingConnectionMap.remove(remoteAddress);
+                        if (outgoingConnectionMap.remove(remoteAddress) == null) {
+                            LOGGER.warn("connection to {} failed after {} attempts, but connection was already removed",
+                                    remoteAddress, nConnectionAttempts);
+                        } else {
+                            LOGGER.debug("connection to {} failed after {} attempts, giving up", remoteAddress,
+                                    nConnectionAttempts);
+                        }
                         mConn.setConnectionFailure(new IOException(remoteAddress.toString() + ": " + error, error));
                     } else {
                         mConn.setConnectionAttempts(nConnectionAttempts + 1);
@@ -126,9 +142,19 @@ public class MuxDemux {
             public void connectionClosed(TCPConnection connection) {
                 synchronized (MuxDemux.this) {
                     if (connection.getType() == TCPConnection.ConnectionType.OUTGOING) {
-                        outgoingConnectionMap.remove(connection.getRemoteAddress());
+                        if (outgoingConnectionMap.remove(connection.getRemoteAddress()) == null) {
+                            LOGGER.warn("outgoing connection to {} already removed on close",
+                                    connection.getRemoteAddress());
+                        } else {
+                            LOGGER.debug("removed outgoing connection to {} on close", connection.getRemoteAddress());
+                        }
                     } else if (connection.getType() == TCPConnection.ConnectionType.INCOMING) {
-                        incomingConnectionMap.remove(connection.getRemoteAddress());
+                        if (incomingConnectionMap.remove(connection.getRemoteAddress()) == null) {
+                            LOGGER.warn("incoming connection from {} already removed on close",
+                                    connection.getRemoteAddress());
+                        } else {
+                            LOGGER.debug("removed incoming connection from {} on close", connection.getRemoteAddress());
+                        }
                     }
                 }
             }
@@ -200,7 +226,7 @@ public class MuxDemux {
      * @return
      */
     public IChannelInterfaceFactory getChannelInterfaceFactory() {
-        return channelInterfaceFatory;
+        return channelInterfaceFactory;
     }
 
     public synchronized JsonNode getState() {
diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPEndpoint.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPEndpoint.java
index b75e3c6363..d6ffe23e81 100644
--- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPEndpoint.java
+++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPEndpoint.java
@@ -110,7 +110,7 @@ public class TCPEndpoint {
 
     @Override
     public String toString() {
-        return "TCPEndpoint [Local Address: " + localAddress + "]";
+        return "TCPEndpoint [" + (localAddress == null ? "<outgoing>" : "Local Address: " + localAddress) + "]";
     }
 
     private class IOThread extends Thread {
@@ -127,7 +127,7 @@ public class TCPEndpoint {
         private final Selector selector;
 
         public IOThread() throws IOException {
-            super("TCPEndpoint IO Thread [" + localAddress + "]");
+            super("TCPEndpoint IO Thread [" + (localAddress == null ? "<outgoing>" : localAddress) + "]");
             setDaemon(true);
             setPriority(Thread.NORM_PRIORITY);
             this.pendingConnections = new ArrayList<>();
@@ -144,44 +144,44 @@ public class TCPEndpoint {
                 try {
                     int n = selector.select();
                     collectOutstandingWork();
-                    if (!workingPendingConnections.isEmpty()) {
-                        for (InetSocketAddress address : workingPendingConnections) {
-                            SocketChannel channel = SocketChannel.open();
-                            register(channel);
-                            boolean connect = false;
-                            boolean failure = false;
-                            try {
-                                connect = channel.connect(address);
-                            } catch (IOException e) {
-                                failure = true;
-                                synchronized (connectionListener) {
-                                    connectionListener.connectionFailure(address, e);
-                                }
+                    for (Iterator<InetSocketAddress> iterator = workingPendingConnections.iterator(); iterator
+                            .hasNext();) {
+                        InetSocketAddress address = iterator.next();
+                        iterator.remove();
+                        SocketChannel channel = SocketChannel.open();
+                        register(channel);
+                        boolean connect = false;
+                        boolean failure = false;
+                        try {
+                            connect = channel.connect(address);
+                        } catch (IOException e) {
+                            failure = true;
+                            synchronized (connectionListener) {
+                                connectionListener.connectionFailure(address, e);
                             }
-                            if (!failure) {
-                                if (!connect) {
-                                    SelectionKey key = channel.register(selector, SelectionKey.OP_CONNECT);
-                                    key.attach(address);
-                                } else {
-                                    socketConnected(address, channel);
-                                }
+                        }
+                        if (!failure) {
+                            if (!connect) {
+                                SelectionKey key = channel.register(selector, SelectionKey.OP_CONNECT);
+                                key.attach(address);
+                            } else {
+                                socketConnected(address, channel);
                             }
                         }
-                        workingPendingConnections.clear();
                     }
-                    if (!workingIncomingConnections.isEmpty()) {
-                        for (SocketChannel channel : workingIncomingConnections) {
-                            register(channel);
-                            connectionReceived(channel);
-                        }
-                        workingIncomingConnections.clear();
+                    for (Iterator<SocketChannel> iterator = workingIncomingConnections.iterator(); iterator
+                            .hasNext();) {
+                        SocketChannel channel = iterator.next();
+                        iterator.remove();
+                        register(channel);
+                        connectionReceived(channel);
                     }
                     synchronized (handshakeCompletedConnections) {
-                        if (!handshakeCompletedConnections.isEmpty()) {
-                            for (final PendingHandshakeConnection conn : handshakeCompletedConnections) {
-                                handshakeCompleted(conn);
-                            }
-                            handshakeCompletedConnections.clear();
+                        for (Iterator<PendingHandshakeConnection> iterator =
+                                handshakeCompletedConnections.iterator(); iterator.hasNext();) {
+                            PendingHandshakeConnection conn = iterator.next();
+                            iterator.remove();
+                            handshakeCompleted(conn);
                         }
                     }
                     if (n > 0) {
@@ -257,7 +257,11 @@ public class TCPEndpoint {
                 }
             } catch (Exception e) {
                 LOGGER.error("failed to establish connection after handshake", e);
-                handleHandshakeFailure(conn);
+                try {
+                    handleHandshakeFailure(conn);
+                } catch (Exception ex) {
+                    e.addSuppressed(ex);
+                }
             }
         }
 


(asterixdb) 04/22: [ASTERIXDB-3451][STO] Avoid unlocking twice when pin fails

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 933d132e6df5c1f250920088fdb16a0a949718a1
Author: Peeyush Gupta <pe...@couchbase.com>
AuthorDate: Mon Jul 15 11:43:02 2024 -0700

    [ASTERIXDB-3451][STO] Avoid unlocking twice when pin fails
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Ext-ref: MB-69637
    Change-Id: I1abe2a7cfd24d19319c6606c76d479291e6638b4
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18487
    Reviewed-by: Murtadha Hubail <mh...@apache.org>
    Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Tested-by: Murtadha Hubail <mh...@apache.org>
    (cherry picked from commit 2b0ebf5835983340b8c80160b00166186784a245)
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20624
    Reviewed-by: Ali Alsuliman <al...@gmail.com>
    Tested-by: Ian Maxon <im...@apache.org>
    Reviewed-by: Ian Maxon <im...@apache.org>
---
 .../java/org/apache/hyracks/storage/am/btree/impls/DiskBTree.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/DiskBTree.java b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/DiskBTree.java
index 1cbe31dde1..27b29be3dc 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/DiskBTree.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/DiskBTree.java
@@ -130,10 +130,10 @@ public class DiskBTree extends BTree {
             while (!ctx.getInteriorFrame().isLeaf()) {
                 // walk down the tree until we find the leaf
                 childPageId = ctx.getInteriorFrame().getChildPageId(ctx.getPred());
+                ICachedPage nextPage =
+                        bufferCache.pin(BufferedFileHandle.getDiskPageId(getFileId(), childPageId), false);
                 bufferCache.unpin(currentPage);
-                pageId = childPageId;
-
-                currentPage = bufferCache.pin(BufferedFileHandle.getDiskPageId(getFileId(), childPageId), false);
+                currentPage = nextPage;
                 ctx.getInteriorFrame().setPage(currentPage);
             }
 


(asterixdb) 09/22: [NO ISSUE][*DB][NET] Upgrade Netty to 4.1.128.Final

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 5d620afacaf26d415f7677e4d08084790e6e537e
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sat Dec 20 06:14:14 2025 -0500

    [NO ISSUE][*DB][NET] Upgrade Netty to 4.1.128.Final
    
    Ext-ref: MB-69749
    Change-Id: I39b9ebde8f1e837a82c61d76dd4fe785502172c0
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20704
    Tested-by: Michael Blow <mb...@apache.org>
    Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Michael Blow <mb...@apache.org>
---
 hyracks-fullstack/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 5a664c37b3..7b70ea45a5 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -75,7 +75,7 @@
     <snappy.version>1.1.10.5</snappy.version>
     <jackson.version>2.19.2</jackson.version>
     <jackson-databind.version>${jackson.version}</jackson-databind.version>
-    <netty.version>4.1.125.Final</netty.version>
+    <netty.version>4.1.128.Final</netty.version>
 
     <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
     <implementation.url>https://asterixdb.apache.org/</implementation.url>


(asterixdb) 02/22: Merge branch 'neo' into 'trinity'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit bd0e9b44a2dfe1c8d453f81a373e92a4b997fd87
Merge: 6f4186cc5f 629fac4a68
Author: Murtadha Hubail <mu...@couchbase.com>
AuthorDate: Mon Nov 24 20:58:54 2025 +0300

    Merge branch 'neo' into 'trinity'
    
    Ext-ref: MB-69372
    Change-Id: I46bb1b54dd20c9a4b9d69c5388db6149098caf45

 .../rules/am/IntroduceJoinAccessMethodRule.java    | 15 +++-
 .../use-case-5/query1.sqlpp                        | 42 ++++++++++
 .../use-case-5/query2.sqlpp                        | 42 ++++++++++
 .../atomic-and-array-queries/query8.plan           | 80 +++++++++---------
 .../atomic-and-array-queries/query9.plan           | 94 +++++++++++-----------
 .../join-quantified-queries/use-case-5/query1.plan | 81 +++++++++++++++++++
 .../join-quantified-queries/use-case-5/query2.plan | 83 +++++++++++++++++++
 .../use-case-5/use-case-5.1.ddl.sqlpp              | 31 +++++++
 .../use-case-5/use-case-5.2.update.sqlpp           | 46 +++++++++++
 .../use-case-5/use-case-5.3.query.sqlpp            | 30 +++++++
 .../use-case-5/use-case-5.4.query.sqlpp            | 30 +++++++
 .../use-case-5/use-case-5.3.adm                    |  0
 .../use-case-5/use-case-5.4.adm                    |  2 +
 13 files changed, 492 insertions(+), 84 deletions(-)


(asterixdb) 22/22: Merge branch 'gerrit/morpheus' into 'master'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit ef1dac546ad667d84fbbcb84a9af1a3784183bec
Merge: 76badfbf42 3578f0a554
Author: Ali Alsuliman <al...@gmail.com>
AuthorDate: Wed Jan 14 20:44:14 2026 -0800

    Merge branch 'gerrit/morpheus' into 'master'
    
    Change-Id: I13faf19294cdb63da4c3c56cd0f6d8d915409cd9

 .../rules/ByNameToByIndexFieldAccessRule.java      |  65 ++++-
 .../optimizer/rules/LoadRecordFieldsRule.java      |  54 ++--
 .../rules/PushLimitIntoPrimarySearchRule.java      |  12 +-
 .../asterix/app/function/QueryIndexDatasource.java |  32 ++-
 .../asterix/app/function/QueryIndexRewriter.java   |  23 +-
 .../ASTERIXDB-3682-field-access-in-join.sqlpp      | 107 +++++++
 .../queries/limit/pushdown_to_index_search.sqlpp}  |  28 +-
 .../ASTERIXDB-3682-field-access-in-join.plan       | 312 +++++++++++++++++++++
 .../results/limit/pushdown_to_index_search.plan    |  38 +++
 ...push-limit-to-join-primary-lookup.01.ddl.sqlpp} |  15 +-
 ...h-limit-to-join-primary-lookup.02.update.sqlpp} |  19 +-
 ...sh-limit-to-join-primary-lookup.03.query.sqlpp} |  16 +-
 ...push-limit-to-join-primary-lookup.99.ddl.sqlpp} |   4 +-
 .../query_index/q01/q01.001.ddl.sqlpp              |   7 +-
 .../query_index/q01/q01.002.update.sqlpp           |   7 +
 .../q01.032.query.sqlpp}                           |   5 +-
 .../q01.033.query.sqlpp}                           |   5 +-
 .../q01.034.query.sqlpp}                           |   5 +-
 .../q01.035.query.sqlpp}                           |   5 +-
 .../queries_sqlpp/tpcds/q90/q90.4.query.sqlpp      |  43 +++
 .../isomorphic/isomorphic.1.ddl.sqlpp}             |  20 +-
 .../isomorphic/isomorphic.2.update.sqlpp}          |  14 +-
 .../isomorphic/isomorphic.3.query.sqlpp}           |  17 +-
 .../isomorphic/isomorphic.4.query.sqlpp}           |  17 +-
 .../isomorphic/isomorphic.5.query.sqlpp}           |  17 +-
 .../push-limit-to-join-primary-lookup.03.adm       |   1 +
 .../runtimets/results/query_index/q01/q01.028.plan |  22 +-
 .../runtimets/results/query_index/q01/q01.029.plan |  22 +-
 .../runtimets/results/query_index/q01/q01.031.plan |  22 +-
 .../runtimets/results/query_index/q01/q01.032.adm  |  16 ++
 .../runtimets/results/query_index/q01/q01.033.adm  |   7 +
 .../runtimets/results/query_index/q01/q01.034.plan |  18 ++
 .../runtimets/results/query_index/q01/q01.035.plan |  18 ++
 .../runtimets/results/tpcds/q90/q90.2.plan         | 250 +++++++++++++++++
 .../results/window/isomorphic/isomorphic.3.adm     | 100 +++++++
 .../results/window/isomorphic/isomorphic.4.adm     | 100 +++++++
 .../results/window/isomorphic/isomorphic.5.adm     |  50 ++++
 .../runtimets/results_cbo/tpcds/q90/q90.2.plan     | 250 +++++++++++++++++
 .../runtimets/results_column/tpcds/q90/q90.2.plan  | 250 +++++++++++++++++
 .../src/test/resources/runtimets/sqlpp_queries.xml |  11 +-
 .../asterix/metadata/utils/KeyFieldTypeUtil.java   |  19 ++
 .../visitors/IsomorphismOperatorVisitor.java       |  40 +--
 .../org/apache/hyracks/api/exceptions/Warning.java |   3 +-
 .../hyracks/api/util/JavaSerializationUtils.java   |  37 +++
 .../hyracks/net/protocols/muxdemux/MuxDemux.java   |  42 ++-
 .../hyracks/net/protocols/tcp/TCPEndpoint.java     |  74 ++---
 hyracks-fullstack/pom.xml                          |   2 +-
 47 files changed, 2033 insertions(+), 208 deletions(-)

diff --cc asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByIndexFieldAccessRule.java
index a4bc50bf87,e4bcbd8937..28e56e472d
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByIndexFieldAccessRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByIndexFieldAccessRule.java
@@@ -91,12 -88,17 +94,19 @@@ public class ByNameToByIndexFieldAccess
          if (fce.getFunctionIdentifier() != BuiltinFunctions.FIELD_ACCESS_BY_NAME) {
              return changed;
          }
-         changed |= extractFirstArg(fce, op, context);
+         int k = extractFirstArg(fce, op, context);
+         changed |= k >= 0;
 -        if (k < 0) {
 -            if (op.getInputs().size() > 1) {
 -                context.computeAndSetTypeEnvironmentForOperator(op);
 -                changed |= rewriteFieldAccessUsing(op, exprRef, context, fce);
 -                return changed;
 +        if (includeNameToIndexRewrite) {
-             IVariableTypeEnvironment env = context.getOutputTypeEnvironment(op.getInputs().get(0).getValue());
-             IAType t = (IAType) env.getType(fce.getArguments().get(0).getValue());
-             changed |= rewriteFieldAccess(exprRef, fce, TypeComputeUtils.getActualType(t));
++            if (k < 0) {
++                if (op.getInputs().size() > 1) {
++                    context.computeAndSetTypeEnvironmentForOperator(op);
++                    changed |= rewriteFieldAccessUsing(op, exprRef, context, fce);
++                    return changed;
++                }
++                k = 0;
+             }
 -            k = 0;
++            changed |= rewriteFieldAccessUsing(op.getInputs().get(k).getValue(), exprRef, context, fce);
          }
 -        changed |= rewriteFieldAccessUsing(op.getInputs().get(k).getValue(), exprRef, context, fce);
          return changed;
      }
  
diff --cc asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexDatasource.java
index d6a45af34e,1c6d2cc964..1e6d2dd99a
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexDatasource.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexDatasource.java
@@@ -33,22 -34,23 +34,22 @@@ import org.apache.asterix.om.types.IATy
  import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
  import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
  import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+ import org.apache.hyracks.algebricks.common.utils.ListSet;
  import org.apache.hyracks.algebricks.common.utils.Pair;
 +import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
  import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
  import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
  import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSource;
  import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSourcePropertiesProvider;
 -import org.apache.hyracks.algebricks.core.algebra.metadata.IProjectionInfo;
 +import org.apache.hyracks.algebricks.core.algebra.metadata.IProjectionFiltrationInfo;
  import org.apache.hyracks.algebricks.core.algebra.operators.logical.IOperatorSchema;
--import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator;
+ import org.apache.hyracks.algebricks.core.algebra.properties.FunctionalDependency;
  import org.apache.hyracks.algebricks.core.algebra.properties.ILocalStructuralProperty;
  import org.apache.hyracks.algebricks.core.algebra.properties.INodeDomain;
+ import org.apache.hyracks.algebricks.core.algebra.properties.IPartitioningProperty;
 -import org.apache.hyracks.algebricks.core.algebra.properties.LocalOrderProperty;
 -import org.apache.hyracks.algebricks.core.algebra.properties.OrderColumn;
 +import org.apache.hyracks.algebricks.core.algebra.properties.IPhysicalPropertiesVector;
- import org.apache.hyracks.algebricks.core.algebra.properties.LocalOrderProperty;
- import org.apache.hyracks.algebricks.core.algebra.properties.OrderColumn;
- import org.apache.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty;
  import org.apache.hyracks.algebricks.core.algebra.properties.StructuralPropertiesVector;
+ import org.apache.hyracks.algebricks.core.algebra.properties.UnorderedPartitionedProperty;
  import org.apache.hyracks.algebricks.core.jobgen.impl.JobGenContext;
  import org.apache.hyracks.api.dataflow.IOperatorDescriptor;
  import org.apache.hyracks.api.job.JobSpecification;
@@@ -121,25 -130,22 +127,29 @@@ public class QueryIndexDatasource exten
  
      @Override
      public IDataSourcePropertiesProvider getPropertiesProvider() {
 -        return scanVariables -> {
 -            // scanVariables should be SKs + PKs
 -            List<ILocalStructuralProperty> propsLocal = new ArrayList<>(1);
 -            //TODO(ali): local ordering should be gone in compute-storage separation setup similar to data-scan
 -            List<OrderColumn> secKeys = new ArrayList<>(numSecKeys);
 -            for (int i = 0; i < numSecKeys; i++) {
 -                secKeys.add(new OrderColumn(scanVariables.get(i), OrderOperator.IOrder.OrderKind.ASC));
 +        return new IDataSourcePropertiesProvider() {
 +            @Override
 +            public IPhysicalPropertiesVector computeRequiredProperties(List<LogicalVariable> scanVariables,
 +                    IOptimizationContext ctx) {
 +                return StructuralPropertiesVector.EMPTY_PROPERTIES_VECTOR;
              }
 -            propsLocal.add(new LocalOrderProperty(secKeys));
 -            int numPKs = ds.getPrimaryKeys().size();
 -            Set<LogicalVariable> pVars = new ListSet<>();
 -            for (int i = 0, j = numSecKeys; i < numPKs; i++, j++) {
 -                pVars.add(scanVariables.get(j));
 +
 +            @Override
 +            public IPhysicalPropertiesVector computeDeliveredProperties(List<LogicalVariable> scanVariables,
-                     IOptimizationContext ctx) {
++                    IOptimizationContext ctx) throws AlgebricksException {
++                // scanVariables should be SKs + PKs
 +                List<ILocalStructuralProperty> propsLocal = new ArrayList<>(1);
-                 //TODO(ali): consider primary keys?
-                 List<OrderColumn> secKeys = new ArrayList<>(numSecKeys);
-                 for (int i = 0; i < numSecKeys; i++) {
-                     secKeys.add(new OrderColumn(scanVariables.get(i), OrderOperator.IOrder.OrderKind.ASC));
++                int numPKs = ds.getPrimaryKeys().size();
++                Set<LogicalVariable> pVars = new ListSet<>();
++                for (int i = 0, j = numSecKeys; i < numPKs; i++, j++) {
++                    pVars.add(scanVariables.get(j));
 +                }
-                 propsLocal.add(new LocalOrderProperty(secKeys));
-                 return new StructuralPropertiesVector(new RandomPartitioningProperty(domain), propsLocal);
++                int[][] computeStorageMap = ((MetadataProvider) ctx.getMetadataProvider()).getPartitioningProperties(ds)
++                        .getComputeStorageMap();
++                IPartitioningProperty pp =
++                        UnorderedPartitionedProperty.ofPartitionsMap(pVars, domain, computeStorageMap);
++                return new StructuralPropertiesVector(pp, propsLocal);
              }
 -            IPartitioningProperty pp = new UnorderedPartitionedProperty(pVars, domain);
 -            return new StructuralPropertiesVector(pp, propsLocal);
          };
      }
  
diff --cc asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexRewriter.java
index ae5a77aed6,d4789239a7..74a049bdcf
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexRewriter.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryIndexRewriter.java
@@@ -149,20 -141,14 +151,22 @@@ public class QueryIndexRewriter extend
          DataverseName dataverseName = getDataverseName(loc, f.getArguments(), 0);
          String datasetName = getString(loc, f.getArguments(), 1);
          String indexName = getString(loc, f.getArguments(), 2);
 -        Dataset dataset = validateDataset(metadataProvider, dataverseName, datasetName, loc);
 -        Index index = validateIndex(f, metadataProvider, loc, dataverseName, datasetName, indexName);
 +        String databaseName;
 +        if (f.getArguments().size() > 3) {
 +            databaseName = getString(loc, f.getArguments(), 3);
 +        } else {
 +            databaseName = MetadataUtil.databaseFor(dataverseName);
 +        }
 +        Dataset dataset = validateDataset(metadataProvider, databaseName, dataverseName, datasetName, loc);
 +        Index index = validateIndex(f, metadataProvider, loc, databaseName, dataverseName, datasetName, indexName);
          ARecordType dsType = (ARecordType) metadataProvider.findType(dataset);
          ARecordType metaType = DatasetUtil.getMetaType(metadataProvider, dataset);
 +        dsType = (ARecordType) metadataProvider.findTypeForDatasetWithoutType(dsType, dataset);
 +
          List<IAType> dsKeyTypes = KeyFieldTypeUtil.getPartitoningKeyTypes(dataset, dsType, metaType);
-         List<Pair<IAType, Boolean>> secKeyTypes = KeyFieldTypeUtil.getBTreeIndexKeyTypes(index, dsType, metaType);
+         List<Pair<IAType, Boolean>> secKeyTypes = index.getIndexType() == DatasetConfig.IndexType.BTREE
+                 ? KeyFieldTypeUtil.getBTreeIndexKeyTypes(index, dsType, metaType)
+                 : KeyFieldTypeUtil.getArrayIndexKeyTypes(index, dsType, metaType);
          int numPrimaryKeys = dsKeyTypes.size();
          int numSecKeys = secKeyTypes.size();
          String[] fieldNames = new String[numSecKeys + numPrimaryKeys];
@@@ -199,13 -185,15 +203,16 @@@
          }
      }
  
 -    private static Dataset validateDataset(MetadataProvider mp, DataverseName dvName, String dsName, SourceLocation loc)
 -            throws AlgebricksException {
 -        Dataset dataset = mp.findDataset(dvName, dsName);
 +    private static Dataset validateDataset(MetadataProvider mp, String dbName, DataverseName dvName, String dsName,
 +            SourceLocation loc) throws AlgebricksException {
 +        Dataset dataset = mp.findDataset(dbName, dvName, dsName);
          if (dataset == null) {
 -            throw new CompilationException(ErrorCode.UNKNOWN_DATASET_IN_DATAVERSE, loc, dsName, dvName);
 +            throw new CompilationException(ErrorCode.UNKNOWN_DATASET_IN_DATAVERSE, loc, dsName,
 +                    MetadataUtil.dataverseName(dbName, dvName, mp.isUsingDatabase()));
          }
+         if (dataset.isCorrelated()) {
+             throw new CompilationException(ErrorCode.OPERATION_NOT_SUPPORTED_ON_PRIMARY_INDEX, loc, dsName);
+         }
          return dataset;
      }
  
diff --cc asterixdb/asterix-app/src/test/resources/optimizerts/results/ASTERIXDB-3682-field-access-in-join.plan
index 0000000000,a44e1cb635..d1a7b0e8d9
mode 000000,100644..100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/ASTERIXDB-3682-field-access-in-join.plan
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/ASTERIXDB-3682-field-access-in-join.plan
@@@ -1,0 -1,348 +1,312 @@@
 -distribute result [$$446]
++distribute result [$$462]
+ -- DISTRIBUTE_RESULT  |PARTITIONED|
+   exchange
+   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -    project ([$$446])
 -    -- STREAM_PROJECT  |PARTITIONED|
 -      assign [$$446] <- [if-missing-or-null(to-object($$593), cast($$456))]
 -      -- ASSIGN  |PARTITIONED|
 -        project ([$$456, $$593])
 -        -- STREAM_PROJECT  |PARTITIONED|
 -          exchange
 -          -- SORT_MERGE_EXCHANGE [$$529(ASC), $$530(ASC), $$531(ASC), $$532(ASC) ]  |PARTITIONED|
 -            order (ASC, $$529) (ASC, $$530) (ASC, $$531) (ASC, $$532)
 -            -- STABLE_SORT [$$529(ASC), $$530(ASC), $$531(ASC), $$532(ASC)]  |PARTITIONED|
 -              exchange
 -              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                assign [$$529, $$530, $$531, $$532] <- [$$593.getField("join_key2"), $$593.getField("wsc"), $$593.getField("lcd"), $$593.getField("wsd")]
 -                -- ASSIGN  |PARTITIONED|
 -                  project ([$$456, $$593])
 -                  -- STREAM_PROJECT  |PARTITIONED|
 -                    select (and(like($$455, "%"), not(is-missing($$455))))
 -                    -- STREAM_SELECT  |PARTITIONED|
 -                      project ([$$456, $$593, $$455])
 -                      -- STREAM_PROJECT  |PARTITIONED|
 -                        assign [$$593, $$455] <- [object-concat-strict(if-missing-or-null(to-object($$323), cast($$456)), {"lov_cKey": $$466, "wsd": $$603, "wsm": $$604, "wsc": $$513, "scKey": $$602, "wpdi": $$509, "bch": $$525, "omaa": $$526, "bco": uppercase(substring($$525, 0, position($$525, "_")))}), object-concat-strict(if-missing-or-null(to-object($$323), cast($$456)), {"lov_cKey": $$466, "wsd": $$388.getField(3), "wsm": $$388.getField(4), "wsc": $$513, "scKey": $$602, "wpdi": $$ [...]
 -                        -- ASSIGN  |PARTITIONED|
 -                          select (and(like(object-concat-strict(if-missing-or-null(to-object($$323), cast($$456)), {"lov_cKey": $$466, "wsd": $$388.getField(3), "wsm": $$388.getField(4), "wsc": $$388.getField("wsc"), "scKey": $$602, "wpdi": $$509, "bch": $$525, "omaa": $$526, "bco": uppercase(substring($$525, 0, position($$525, "_")))}).getField("bch"), "%"), like(object-concat-strict(if-missing-or-null(to-object($$323), cast($$456)), {"lov_cKey": $$466, "wsd": $$388.getField(3), "wsm": [...]
 -                          -- STREAM_SELECT  |PARTITIONED|
 -                            project ([$$323, $$466, $$603, $$604, $$513, $$602, $$509, $$388, $$456, $$525, $$526])
 -                            -- STREAM_PROJECT  |PARTITIONED|
++    assign [$$462] <- [to-object-var-str($$609)] project: [$$462]
++    -- ASSIGN  |PARTITIONED|
++      project ([$$609])
++      -- STREAM_PROJECT  |PARTITIONED|
++        exchange
++        -- SORT_MERGE_EXCHANGE [$$544(ASC), $$545(ASC), $$546(ASC), $$547(ASC) ]  |PARTITIONED|
++          order (ASC, $$544) (ASC, $$545) (ASC, $$546) (ASC, $$547)
++          -- STABLE_SORT [$$544(ASC), $$545(ASC), $$546(ASC), $$547(ASC)]  |PARTITIONED|
++            exchange
++            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++              assign [$$544, $$545, $$546, $$547] <- [$$609.getField("join_key2"), $$609.getField("wsc"), $$609.getField("lcd"), $$609.getField("wsd")]
++              -- ASSIGN  |PARTITIONED|
++                select (and(like($$471, "%"), not(is-missing($$471)))) project: [$$609]
++                -- STREAM_SELECT  |PARTITIONED|
++                  assign [$$471] <- [$$609.getField("bco")]
++                  -- ASSIGN  |PARTITIONED|
++                    assign [$$609] <- [object-concat-strict(to-object-var-str($$343), {"lov_cKey": $$481, "wsd": $$620, "wsm": $$621, "wsc": $$528, "scKey": $$619, "wpdi": $$524, "bch": $$540, "omaa": $$541, "bco": uppercase(substring($$540, 0, position($$540, "_")))})] project: [$$609]
++                    -- ASSIGN  |PARTITIONED|
++                      select (and(like(object-concat-strict(to-object-var-str($$343), {"lov_cKey": $$481, "wsd": $$408.getField(3), "wsm": $$408.getField(4), "wsc": $$408.getField("wsc"), "scKey": $$619, "wpdi": $$524, "bch": $$540, "omaa": $$541, "bco": uppercase(substring($$540, 0, position($$540, "_")))}).getField("bch"), "%"), like(object-concat-strict(to-object-var-str($$343), {"lov_cKey": $$481, "wsd": $$408.getField(3), "wsm": $$408.getField(4), "wsc": $$408.getField("wsc"), "scK [...]
++                      -- STREAM_SELECT  |PARTITIONED|
++                        project ([$$343, $$481, $$620, $$621, $$528, $$619, $$524, $$408, $$540, $$541])
++                        -- STREAM_PROJECT  |PARTITIONED|
++                          exchange
++                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                            join (eq($$491, $$524))
++                            -- HYBRID_HASH_JOIN [$$524][$$491]  |PARTITIONED|
+                               exchange
 -                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                join (eq($$476, $$509))
 -                                -- HYBRID_HASH_JOIN [$$509][$$476]  |PARTITIONED|
++                              -- HASH_PARTITION_EXCHANGE [$$524]  |PARTITIONED|
++                                project ([$$343, $$481, $$620, $$621, $$528, $$619, $$524, $$408])
++                                -- STREAM_PROJECT  |PARTITIONED|
+                                   exchange
 -                                  -- HASH_PARTITION_EXCHANGE [$$509]  |PARTITIONED|
 -                                    assign [$$456] <- [{  }]
 -                                    -- ASSIGN  |PARTITIONED|
 -                                      project ([$$323, $$466, $$603, $$604, $$513, $$602, $$509, $$388])
 -                                      -- STREAM_PROJECT  |PARTITIONED|
 -                                        exchange
 -                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                          join (and(eq($$599, $$601), eq($$466, $$602)))
 -                                          -- HYBRID_HASH_JOIN [$$599, $$466][$$601, $$602]  |PARTITIONED|
 -                                            exchange
 -                                            -- HASH_PARTITION_EXCHANGE [$$599, $$466]  |PARTITIONED|
 -                                              project ([$$323, $$466, $$599])
 -                                              -- STREAM_PROJECT  |PARTITIONED|
 -                                                exchange
 -                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                  join (eq($$uniqueID, $$489))
 -                                                  -- HYBRID_HASH_JOIN [$$489][$$uniqueID]  |PARTITIONED|
 -                                                    exchange
 -                                                    -- HASH_PARTITION_EXCHANGE [$$489]  |PARTITIONED|
 -                                                      project ([$$323, $$599, $$489])
 -                                                      -- STREAM_PROJECT  |PARTITIONED|
 -                                                        assign [$$323] <- [{"join_key2": $$599, "lov13_wsx1": substring($$465, 0, 7), "lcd": substring($$465, 0, 10), "lov13_name": $$467, "lov13_uunn": $$489, "lov13_t0_dd": $$600, "lov13_t0_ff": substring($$600, 0, 19)}]
++                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                    join (and(eq($$616, $$618), eq($$481, $$619)))
++                                    -- HYBRID_HASH_JOIN [$$616, $$481][$$618, $$619]  |PARTITIONED|
++                                      exchange
++                                      -- HASH_PARTITION_EXCHANGE [$$616, $$481]  |PARTITIONED|
++                                        project ([$$343, $$481, $$616])
++                                        -- STREAM_PROJECT  |PARTITIONED|
++                                          exchange
++                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                            join (eq($$uniqueID, $$504))
++                                            -- HYBRID_HASH_JOIN [$$504][$$uniqueID]  |PARTITIONED|
++                                              exchange
++                                              -- HASH_PARTITION_EXCHANGE [$$504]  |PARTITIONED|
++                                                assign [$$343] <- [{"join_key2": $$616, "lov13_wsx1": substring($$480, 0, 7), "lcd": substring($$480, 0, 10), "lov13_name": $$482, "lov13_uunn": $$504, "lov13_t0_dd": $$617, "lov13_t0_ff": substring($$617, 0, 19)}] project: [$$343, $$616, $$504]
++                                                -- ASSIGN  |PARTITIONED|
++                                                  assign [$$617] <- [to-string($$u_val.getField("t0"))] project: [$$480, $$504, $$482, $$616, $$617]
++                                                  -- ASSIGN  |PARTITIONED|
++                                                    select (not(is-null($$616)))
++                                                    -- STREAM_SELECT  |PARTITIONED|
++                                                      assign [$$616] <- [substring(if-missing-or-null(if-missing-or-null($$476.getField("someId1"), $$476.getField("someId2")), $$476.getField("someId3")), 0, 38)] project: [$$480, $$504, $$482, $$u_val, $$616]
++                                                      -- ASSIGN  |PARTITIONED|
++                                                        assign [$$476] <- [$$u_val.getField("marop")]
+                                                         -- ASSIGN  |PARTITIONED|
 -                                                          project ([$$465, $$489, $$467, $$599, $$600])
 -                                                          -- STREAM_PROJECT  |PARTITIONED|
 -                                                            assign [$$600] <- [to-string($$u_val.getField("t0"))]
 -                                                            -- ASSIGN  |PARTITIONED|
 -                                                              select (not(is-null($$599)))
 -                                                              -- STREAM_SELECT  |PARTITIONED|
 -                                                                project ([$$465, $$489, $$467, $$u_val, $$599])
 -                                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                                  assign [$$599] <- [substring(if-missing-or-null(if-missing-or-null($$461.getField("someId1"), $$461.getField("someId2")), $$461.getField("someId3")), 0, 38)]
 -                                                                  -- ASSIGN  |PARTITIONED|
 -                                                                    assign [$$461] <- [$$u_val.getField("marop")]
 -                                                                    -- ASSIGN  |PARTITIONED|
 -                                                                      project ([$$465, $$489, $$467, $$u_val])
 -                                                                      -- STREAM_PROJECT  |PARTITIONED|
 -                                                                        unnest $$u_val <- scan-collection($$290)
 -                                                                        -- UNNEST  |PARTITIONED|
 -                                                                          project ([$$465, $$489, $$467, $$290])
 -                                                                          -- STREAM_PROJECT  |PARTITIONED|
 -                                                                            subplan {
 -                                                                                      aggregate [$$290] <- [listify($$289)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                      -- AGGREGATE  |LOCAL|
 -                                                                                        assign [$$289] <- [{"marop": $$468, "t0": $$488}] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                        -- ASSIGN  |LOCAL|
 -                                                                                          select (and(eq($$487, "iap"), not(is-unknown($$468)))) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                          -- STREAM_SELECT  |LOCAL|
 -                                                                                            assign [$$488, $$468, $$487] <- [$$item2.getField("t0"), $$item2.getField("marop"), $$item2.getField("ua")] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                            -- ASSIGN  |LOCAL|
 -                                                                                              unnest $$item2 <- scan-collection($$486) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                              -- UNNEST  |LOCAL|
 -                                                                                                nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                -- NESTED_TUPLE_SOURCE  |LOCAL|
 -                                                                                   }
 -                                                                            -- SUBPLAN  |PARTITIONED|
 -                                                                              select (not(or(eq($$467, "p1"), eq($$467, "p2"), eq($$467, "p3"))))
 -                                                                              -- STREAM_SELECT  |PARTITIONED|
 -                                                                                project ([$$465, $$489, $$486, $$467])
 -                                                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                  exchange
 -                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                    join (eq($$470, $$275))
 -                                                                                    -- HYBRID_HASH_JOIN [$$275][$$470]  |PARTITIONED|
 -                                                                                      exchange
 -                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                        assign [$$275] <- [get-item(split($$467, " "), 0)]
 -                                                                                        -- ASSIGN  |PARTITIONED|
 -                                                                                          project ([$$465, $$489, $$486, $$467])
 -                                                                                          -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                            assign [$$486, $$467] <- [$$item.getField("value"), $$item.getField("name")]
 -                                                                                            -- ASSIGN  |PARTITIONED|
 -                                                                                              project ([$$465, $$489, $$item])
++                                                          unnest $$u_val <- scan-collection($$310) project: [$$480, $$504, $$482, $$u_val]
++                                                          -- UNNEST  |PARTITIONED|
++                                                            project ([$$480, $$504, $$482, $$310])
++                                                            -- STREAM_PROJECT  |PARTITIONED|
++                                                              subplan {
++                                                                        aggregate [$$310] <- [listify($$309)]
++                                                                        -- AGGREGATE  |LOCAL|
++                                                                          assign [$$309] <- [{"marop": $$483, "t0": $$503}]
++                                                                          -- ASSIGN  |LOCAL|
++                                                                            select (and(eq($$502, "iap"), not(is-unknown($$483)))) project: [$$503, $$483]
++                                                                            -- STREAM_SELECT  |LOCAL|
++                                                                              assign [$$503, $$483, $$502] <- [$$item2.getField("t0"), $$item2.getField("marop"), $$item2.getField("ua")] project: [$$503, $$483, $$502]
++                                                                              -- ASSIGN  |LOCAL|
++                                                                                unnest $$item2 <- scan-collection($$501) project: [$$item2]
++                                                                                -- UNNEST  |LOCAL|
++                                                                                  project ([$$501])
++                                                                                  -- STREAM_PROJECT  |LOCAL|
++                                                                                    nested tuple source
++                                                                                    -- NESTED_TUPLE_SOURCE  |LOCAL|
++                                                                     }
++                                                              -- SUBPLAN  |PARTITIONED|
++                                                                select (not(or(eq($$482, "p1"), eq($$482, "p2"), eq($$482, "p3"))))
++                                                                -- STREAM_SELECT  |PARTITIONED|
++                                                                  project ([$$480, $$504, $$501, $$482])
++                                                                  -- STREAM_PROJECT  |PARTITIONED|
++                                                                    exchange
++                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                      join (eq($$485, $$295))
++                                                                      -- HYBRID_HASH_JOIN [$$295][$$485]  |PARTITIONED|
++                                                                        exchange
++                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                          assign [$$295] <- [get-item(split($$482, " "), 0)]
++                                                                          -- ASSIGN  |PARTITIONED|
++                                                                            assign [$$501, $$482] <- [$$item.getField("value"), $$item.getField("name")] project: [$$480, $$504, $$501, $$482]
++                                                                            -- ASSIGN  |PARTITIONED|
++                                                                              unnest $$item <- scan-collection(object-pairs($$492)) project: [$$480, $$504, $$item]
++                                                                              -- UNNEST  |PARTITIONED|
++                                                                                select ($$282) project: [$$480, $$504, $$492]
++                                                                                -- STREAM_SELECT  |PARTITIONED|
++                                                                                  project ([$$282, $$480, $$504, $$492])
++                                                                                  -- STREAM_PROJECT  |PARTITIONED|
++                                                                                    exchange
++                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                                      group by ([$$566 := $$472]) decor ([$$480; $$504; $$492]) {
++                                                                                                aggregate [$$282] <- [non-empty-stream()]
++                                                                                                -- AGGREGATE  |LOCAL|
++                                                                                                  select (not(is-missing($$565)))
++                                                                                                  -- STREAM_SELECT  |LOCAL|
++                                                                                                    project ([$$565])
++                                                                                                    -- STREAM_PROJECT  |LOCAL|
++                                                                                                      nested tuple source
++                                                                                                      -- NESTED_TUPLE_SOURCE  |LOCAL|
++                                                                                             }
++                                                                                      -- PRE_CLUSTERED_GROUP_BY[$$472]  |PARTITIONED|
++                                                                                        exchange
++                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                                          order (ASC, $$472)
++                                                                                          -- STABLE_SORT [$$472(ASC)]  |PARTITIONED|
++                                                                                            exchange
++                                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                                              project ([$$504, $$480, $$492, $$565, $$472])
+                                                                                               -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                unnest $$item <- scan-collection(object-pairs($$477))
 -                                                                                                -- UNNEST  |PARTITIONED|
 -                                                                                                  project ([$$465, $$489, $$477])
 -                                                                                                  -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                    select ($$262)
 -                                                                                                    -- STREAM_SELECT  |PARTITIONED|
 -                                                                                                      project ([$$262, $$465, $$489, $$477])
 -                                                                                                      -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                        exchange
 -                                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                          group by ([$$551 := $$457]) decor ([$$465; $$489; $$477]) {
 -                                                                                                                    aggregate [$$262] <- [non-empty-stream()] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                    -- AGGREGATE  |LOCAL|
 -                                                                                                                      select (not(is-missing($$550))) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                      -- STREAM_SELECT  |LOCAL|
 -                                                                                                                        nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                        -- NESTED_TUPLE_SOURCE  |LOCAL|
 -                                                                                                                 }
 -                                                                                                          -- PRE_CLUSTERED_GROUP_BY[$$457]  |PARTITIONED|
++                                                                                                exchange
++                                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                                                  left outer join (eq($$472, $$564))
++                                                                                                  -- HYBRID_HASH_JOIN [$$472][$$564]  |PARTITIONED|
++                                                                                                    exchange
++                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                                                      select (and(eq($$b.getField("t"), "lovStat"), not(and(eq(len($$614), 1), eq(get-item($$614, 0), "some_str"))))) project: [$$504, $$480, $$492, $$472]
++                                                                                                      -- STREAM_SELECT  |PARTITIONED|
++                                                                                                        assign [$$614] <- [object-names($$492)]
++                                                                                                        -- ASSIGN  |PARTITIONED|
++                                                                                                          assign [$$504, $$480, $$492] <- [$$b.getField("uunn"), $$b.getField("qwer"), $$b.getField("ihsaa")]
++                                                                                                          -- ASSIGN  |PARTITIONED|
+                                                                                                             exchange
+                                                                                                             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                              project ([$$489, $$465, $$477, $$550, $$457])
 -                                                                                                              -- STREAM_PROJECT  |PARTITIONED|
++                                                                                                              data-scan []<-[$$472, $$b] <- test.col2
++                                                                                                              -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                                                 exchange
+                                                                                                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                                  left outer join (eq($$457, $$549))
 -                                                                                                                  -- HYBRID_HASH_JOIN [$$457][$$549]  |PARTITIONED|
 -                                                                                                                    exchange
 -                                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                                      project ([$$489, $$465, $$477, $$457])
 -                                                                                                                      -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                                        select (and(eq($$b.getField("t"), "lovStat"), not(and(eq(len($$597), 1), eq(get-item($$597, 0), "some_str")))))
 -                                                                                                                        -- STREAM_SELECT  |PARTITIONED|
 -                                                                                                                          assign [$$597] <- [object-names($$477)]
 -                                                                                                                          -- ASSIGN  |PARTITIONED|
 -                                                                                                                            assign [$$489, $$465, $$477] <- [$$b.getField("uunn"), $$b.getField("qwer"), $$b.getField("ihsaa")]
 -                                                                                                                            -- ASSIGN  |PARTITIONED|
 -                                                                                                                              exchange
 -                                                                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                                                data-scan []<-[$$457, $$b] <- test.col2
 -                                                                                                                                -- DATASOURCE_SCAN  |PARTITIONED|
 -                                                                                                                                  exchange
 -                                                                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                                                    empty-tuple-source
 -                                                                                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
 -                                                                                                                    exchange
 -                                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                                      assign [$$550] <- [true]
++                                                                                                                  empty-tuple-source
++                                                                                                                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                                                                    exchange
++                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                                                      assign [$$565] <- [true]
++                                                                                                      -- ASSIGN  |PARTITIONED|
++                                                                                                        project ([$$564])
++                                                                                                        -- STREAM_PROJECT  |PARTITIONED|
++                                                                                                          exchange
++                                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                                                            join (eq($$484, $$271))
++                                                                                                            -- HYBRID_HASH_JOIN [$$271][$$484]  |PARTITIONED|
++                                                                                                              exchange
++                                                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                                                                select ($$280) project: [$$564, $$271]
++                                                                                                                -- STREAM_SELECT  |PARTITIONED|
++                                                                                                                  project ([$$564, $$271, $$280])
++                                                                                                                  -- STREAM_PROJECT  |PARTITIONED|
++                                                                                                                    subplan {
++                                                                                                                              aggregate [$$280] <- [non-empty-stream()]
++                                                                                                                              -- AGGREGATE  |LOCAL|
++                                                                                                                                select (and(eq($$499, "iap"), not(is-unknown($$498))))
++                                                                                                                                -- STREAM_SELECT  |LOCAL|
++                                                                                                                                  assign [$$499, $$498] <- [$$item2.getField("ua"), $$item2.getField("marop")] project: [$$499, $$498]
++                                                                                                                                  -- ASSIGN  |LOCAL|
++                                                                                                                                    unnest $$item2 <- scan-collection($$497) project: [$$item2]
++                                                                                                                                    -- UNNEST  |LOCAL|
++                                                                                                                                      project ([$$497])
++                                                                                                                                      -- STREAM_PROJECT  |LOCAL|
++                                                                                                                                        nested tuple source
++                                                                                                                                        -- NESTED_TUPLE_SOURCE  |LOCAL|
++                                                                                                                           }
++                                                                                                                    -- SUBPLAN  |PARTITIONED|
++                                                                                                                      assign [$$271, $$497] <- [get-item(split($$item.getField("name"), " "), 0), $$item.getField("value")] project: [$$564, $$271, $$497]
+                                                                                                                       -- ASSIGN  |PARTITIONED|
 -                                                                                                                        project ([$$549])
 -                                                                                                                        -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                                          exchange
 -                                                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                                            join (eq($$469, $$251))
 -                                                                                                                            -- HYBRID_HASH_JOIN [$$251][$$469]  |PARTITIONED|
 -                                                                                                                              exchange
 -                                                                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                                                project ([$$549, $$251])
 -                                                                                                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                                                  select ($$260)
 -                                                                                                                                  -- STREAM_SELECT  |PARTITIONED|
 -                                                                                                                                    project ([$$549, $$251, $$260])
 -                                                                                                                                    -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                                                      subplan {
 -                                                                                                                                                aggregate [$$260] <- [non-empty-stream()] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                                                -- AGGREGATE  |LOCAL|
 -                                                                                                                                                  select (and(eq($$484, "iap"), not(is-unknown($$483)))) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                                                  -- STREAM_SELECT  |LOCAL|
 -                                                                                                                                                    assign [$$484, $$483] <- [$$item2.getField("ua"), $$item2.getField("marop")] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                                                    -- ASSIGN  |LOCAL|
 -                                                                                                                                                      unnest $$item2 <- scan-collection($$482) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                                                      -- UNNEST  |LOCAL|
 -                                                                                                                                                        nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                                                        -- NESTED_TUPLE_SOURCE  |LOCAL|
 -                                                                                                                                             }
 -                                                                                                                                      -- SUBPLAN  |PARTITIONED|
 -                                                                                                                                        project ([$$549, $$251, $$482])
 -                                                                                                                                        -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                                                          assign [$$251, $$482] <- [get-item(split($$item.getField("name"), " "), 0), $$item.getField("value")]
 -                                                                                                                                          -- ASSIGN  |PARTITIONED|
 -                                                                                                                                            project ([$$549, $$item])
 -                                                                                                                                            -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                                                              unnest $$item <- scan-collection(object-pairs($$545))
 -                                                                                                                                              -- UNNEST  |PARTITIONED|
 -                                                                                                                                                project ([$$549, $$545])
 -                                                                                                                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                                                                  select (and(not(and(eq(len($$598), 1), eq(get-item($$598, 0), "some_str"))), eq($$546.getField("t"), "lovStat")))
 -                                                                                                                                                  -- STREAM_SELECT  |PARTITIONED|
 -                                                                                                                                                    assign [$$598] <- [object-names($$545)]
 -                                                                                                                                                    -- ASSIGN  |PARTITIONED|
 -                                                                                                                                                      assign [$$545] <- [$$546.getField("ihsaa")]
 -                                                                                                                                                      -- ASSIGN  |PARTITIONED|
 -                                                                                                                                                        exchange
 -                                                                                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                                                                          data-scan []<-[$$549, $$546] <- test.col2
 -                                                                                                                                                          -- DATASOURCE_SCAN  |PARTITIONED|
 -                                                                                                                                                            exchange
 -                                                                                                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                                                                              empty-tuple-source
 -                                                                                                                                                              -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
 -                                                                                                                              exchange
 -                                                                                                                              -- BROADCAST_EXCHANGE  |PARTITIONED|
 -                                                                                                                                unnest $$469 <- scan-collection(array: [ "X", "Y" ])
 -                                                                                                                                -- UNNEST  |UNPARTITIONED|
 -                                                                                                                                  empty-tuple-source
 -                                                                                                                                  -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
 -                                                                                      exchange
 -                                                                                      -- BROADCAST_EXCHANGE  |PARTITIONED|
 -                                                                                        unnest $$470 <- scan-collection(array: [ "X", "Y" ])
 -                                                                                        -- UNNEST  |UNPARTITIONED|
 -                                                                                          empty-tuple-source
 -                                                                                          -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
 -                                                    exchange
 -                                                    -- HASH_PARTITION_EXCHANGE [$$uniqueID]  |PARTITIONED|
 -                                                      project ([$$466, $$uniqueID])
 -                                                      -- STREAM_PROJECT  |PARTITIONED|
 -                                                        unnest $$uniqueID <- scan-collection($$505)
 -                                                        -- UNNEST  |PARTITIONED|
 -                                                          project ([$$466, $$505])
 -                                                          -- STREAM_PROJECT  |PARTITIONED|
 -                                                            assign [$$505] <- [array-star($$p.getField("members")).getField("uniqueID")]
 -                                                            -- ASSIGN  |PARTITIONED|
 -                                                              select (and(eq($$p.getField("r"), "uuu"), eq($$p.getField("t"), "ccc"), not(is-missing($$466))))
 -                                                              -- STREAM_SELECT  |PARTITIONED|
 -                                                                assign [$$466] <- [$$p.getField("cKey")]
 -                                                                -- ASSIGN  |PARTITIONED|
 -                                                                  project ([$$p])
 -                                                                  -- STREAM_PROJECT  |PARTITIONED|
 -                                                                    assign [$$p] <- [$$p2]
 -                                                                    -- ASSIGN  |PARTITIONED|
++                                                                                                                        unnest $$item <- scan-collection(object-pairs($$560)) project: [$$564, $$item]
++                                                                                                                        -- UNNEST  |PARTITIONED|
++                                                                                                                          select (and(not(and(eq(len($$615), 1), eq(get-item($$615, 0), "some_str"))), eq($$561.getField("t"), "lovStat"))) project: [$$564, $$560]
++                                                                                                                          -- STREAM_SELECT  |PARTITIONED|
++                                                                                                                            assign [$$615] <- [object-names($$560)]
++                                                                                                                            -- ASSIGN  |PARTITIONED|
++                                                                                                                              assign [$$560] <- [$$561.getField("ihsaa")]
++                                                                                                                              -- ASSIGN  |PARTITIONED|
++                                                                                                                                exchange
++                                                                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                                                                                  data-scan []<-[$$564, $$561] <- test.col2
++                                                                                                                                  -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                                                                                    exchange
++                                                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                                                                                      empty-tuple-source
++                                                                                                                                      -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                                                                              exchange
++                                                                                                              -- BROADCAST_EXCHANGE  |PARTITIONED|
++                                                                                                                unnest $$484 <- scan-collection(array: [ "X", "Y" ])
++                                                                                                                -- UNNEST  |UNPARTITIONED|
++                                                                                                                  empty-tuple-source
++                                                                                                                  -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
++                                                                        exchange
++                                                                        -- BROADCAST_EXCHANGE  |PARTITIONED|
++                                                                          unnest $$485 <- scan-collection(array: [ "X", "Y" ])
++                                                                          -- UNNEST  |UNPARTITIONED|
++                                                                            empty-tuple-source
++                                                                            -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
++                                              exchange
++                                              -- HASH_PARTITION_EXCHANGE [$$uniqueID]  |PARTITIONED|
++                                                unnest $$uniqueID <- scan-collection($$520) project: [$$481, $$uniqueID]
++                                                -- UNNEST  |PARTITIONED|
++                                                  assign [$$520] <- [array-star($$p.getField("members")).getField("uniqueID")] project: [$$481, $$520]
++                                                  -- ASSIGN  |PARTITIONED|
++                                                    select (and(eq($$p.getField("r"), "uuu"), eq($$p.getField("t"), "ccc"), not(is-missing($$481))))
++                                                    -- STREAM_SELECT  |PARTITIONED|
++                                                      assign [$$481] <- [$$p.getField("cKey")]
++                                                      -- ASSIGN  |PARTITIONED|
++                                                        assign [$$p] <- [$$p2] project: [$$p]
++                                                        -- ASSIGN  |PARTITIONED|
++                                                          exchange
++                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                            replicate
++                                                            -- REPLICATE  |PARTITIONED|
++                                                              exchange
++                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                project ([$$p2])
++                                                                -- STREAM_PROJECT  |PARTITIONED|
++                                                                  exchange
++                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                    data-scan []<-[$$474, $$p2] <- test.col1
++                                                                    -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                       exchange
+                                                                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                        replicate
 -                                                                        -- REPLICATE  |PARTITIONED|
 -                                                                          exchange
 -                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                            project ([$$p2])
 -                                                                            -- STREAM_PROJECT  |PARTITIONED|
 -                                                                              exchange
 -                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                data-scan []<-[$$459, $$p2] <- test.col1
 -                                                                                -- DATASOURCE_SCAN  |PARTITIONED|
 -                                                                                  exchange
 -                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                    empty-tuple-source
 -                                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
 -                                            exchange
 -                                            -- HASH_PARTITION_EXCHANGE [$$601, $$602]  |PARTITIONED|
 -                                              project ([$$603, $$604, $$513, $$602, $$509, $$388, $$601])
 -                                              -- STREAM_PROJECT  |PARTITIONED|
 -                                                assign [$$388] <- [{"join_key1": $$601, "wpdi": $$509, "wsc": $$513, "scKey": $$602, "wwlps": $$381, "wsd": $$603, "wsm": $$604}]
 -                                                -- ASSIGN  |PARTITIONED|
 -                                                  project ([$$513, $$509, $$381, $$604, $$603, $$602, $$601])
 -                                                  -- STREAM_PROJECT  |PARTITIONED|
 -                                                    assign [$$604, $$603, $$602, $$601] <- [substring($$516, 0, 7), substring($$516, 0, 10), uppercase(substring($$513, 0, position($$513, "_"))), substring($$511, 0, 38)]
 -                                                    -- ASSIGN  |PARTITIONED|
 -                                                      project ([$$513, $$509, $$516, $$511, $$381])
 -                                                      -- STREAM_PROJECT  |PARTITIONED|
 -                                                        subplan {
 -                                                                  aggregate [$$381] <- [listify($$380)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                  -- AGGREGATE  |LOCAL|
 -                                                                    assign [$$380] <- [$$item.getField("wkps")] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                    -- ASSIGN  |LOCAL|
 -                                                                      unnest $$item <- scan-collection($$510) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                      -- UNNEST  |LOCAL|
 -                                                                        nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                        -- NESTED_TUPLE_SOURCE  |LOCAL|
 -                                                               }
 -                                                        -- SUBPLAN  |PARTITIONED|
 -                                                          project ([$$513, $$509, $$516, $$511, $$510])
 -                                                          -- STREAM_PROJECT  |PARTITIONED|
 -                                                            exchange
 -                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                              join (eq($$473, $$353))
 -                                                              -- HYBRID_HASH_JOIN [$$353][$$473]  |PARTITIONED|
 -                                                                exchange
 -                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                  project ([$$513, $$509, $$516, $$511, $$510, $$353])
 -                                                                  -- STREAM_PROJECT  |PARTITIONED|
 -                                                                    select (and(eq($$p2.getField("t"), "ak1"), not(is-missing($$509)), not(is-missing($$541))))
 -                                                                    -- STREAM_SELECT  |PARTITIONED|
 -                                                                      assign [$$516, $$513, $$511, $$510, $$509] <- [$$541.getField("ssatt"), $$541.getField("stchk"), $$p2.getField("ed"), $$541.getField("intib"), $$541.getField("coaed")]
 -                                                                      -- ASSIGN  |PARTITIONED|
 -                                                                        assign [$$353, $$541] <- [$$p2.getField("ha"), $$p2.getField("kat")]
 -                                                                        -- ASSIGN  |PARTITIONED|
 -                                                                          exchange
 -                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                            replicate
 -                                                                            -- REPLICATE  |PARTITIONED|
 -                                                                              exchange
 -                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                project ([$$p2])
 -                                                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                  exchange
 -                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                    data-scan []<-[$$459, $$p2] <- test.col1
 -                                                                                    -- DATASOURCE_SCAN  |PARTITIONED|
 -                                                                                      exchange
 -                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                        empty-tuple-source
 -                                                                                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
 -                                                                exchange
 -                                                                -- BROADCAST_EXCHANGE  |PARTITIONED|
 -                                                                  unnest $$473 <- scan-collection(array: [ "l1", "l2" ])
 -                                                                  -- UNNEST  |UNPARTITIONED|
 -                                                                    empty-tuple-source
 -                                                                    -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
 -                                  exchange
 -                                  -- HASH_PARTITION_EXCHANGE [$$476]  |PARTITIONED|
 -                                    project ([$$525, $$526, $$476])
 -                                    -- STREAM_PROJECT  |PARTITIONED|
 -                                      assign [$$526, $$525] <- [$$454.getField("omaa"), $$454.getField("qaz")]
 -                                      -- ASSIGN  |PARTITIONED|
 -                                        select (not(is-missing($$454)))
 -                                        -- STREAM_SELECT  |PARTITIONED|
 -                                          project ([$$476, $$454])
 -                                          -- STREAM_PROJECT  |PARTITIONED|
 -                                            assign [$$476, $$454] <- [$$sbr.getField("ed"), $$sbr.getField("tohac")]
 -                                            -- ASSIGN  |PARTITIONED|
 -                                              project ([$$sbr])
 -                                              -- STREAM_PROJECT  |PARTITIONED|
 -                                                assign [$$sbr] <- [$$p2]
 -                                                -- ASSIGN  |PARTITIONED|
++                                                                        empty-tuple-source
++                                                                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                      exchange
++                                      -- HASH_PARTITION_EXCHANGE [$$618, $$619]  |PARTITIONED|
++                                        assign [$$408] <- [{"join_key1": $$618, "wpdi": $$524, "wsc": $$528, "scKey": $$619, "wwlps": $$401, "wsd": $$620, "wsm": $$621}] project: [$$620, $$621, $$528, $$619, $$524, $$408, $$618]
++                                        -- ASSIGN  |PARTITIONED|
++                                          assign [$$621, $$620, $$619, $$618] <- [substring($$531, 0, 7), substring($$531, 0, 10), uppercase(substring($$528, 0, position($$528, "_"))), substring($$526, 0, 38)] project: [$$528, $$524, $$401, $$621, $$620, $$619, $$618]
++                                          -- ASSIGN  |PARTITIONED|
++                                            project ([$$528, $$524, $$531, $$526, $$401])
++                                            -- STREAM_PROJECT  |PARTITIONED|
++                                              subplan {
++                                                        aggregate [$$401] <- [listify($$400)]
++                                                        -- AGGREGATE  |LOCAL|
++                                                          assign [$$400] <- [$$item.getField("wkps")]
++                                                          -- ASSIGN  |LOCAL|
++                                                            unnest $$item <- scan-collection($$525) project: [$$item]
++                                                            -- UNNEST  |LOCAL|
++                                                              project ([$$525])
++                                                              -- STREAM_PROJECT  |LOCAL|
++                                                                nested tuple source
++                                                                -- NESTED_TUPLE_SOURCE  |LOCAL|
++                                                     }
++                                              -- SUBPLAN  |PARTITIONED|
++                                                project ([$$528, $$524, $$531, $$526, $$525])
++                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                   exchange
+                                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                    replicate
 -                                                    -- REPLICATE  |PARTITIONED|
++                                                    join (eq($$488, $$373))
++                                                    -- HYBRID_HASH_JOIN [$$373][$$488]  |PARTITIONED|
+                                                       exchange
+                                                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                        project ([$$p2])
 -                                                        -- STREAM_PROJECT  |PARTITIONED|
 -                                                          exchange
 -                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                            data-scan []<-[$$459, $$p2] <- test.col1
 -                                                            -- DATASOURCE_SCAN  |PARTITIONED|
++                                                        select (and(eq($$p2.getField("t"), "ak1"), not(is-missing($$524)), not(is-missing($$556)))) project: [$$528, $$524, $$531, $$526, $$525, $$373]
++                                                        -- STREAM_SELECT  |PARTITIONED|
++                                                          assign [$$531, $$528, $$526, $$525, $$524] <- [$$556.getField("ssatt"), $$556.getField("stchk"), $$p2.getField("ed"), $$556.getField("intib"), $$556.getField("coaed")]
++                                                          -- ASSIGN  |PARTITIONED|
++                                                            assign [$$373, $$556] <- [$$p2.getField("ha"), $$p2.getField("kat")]
++                                                            -- ASSIGN  |PARTITIONED|
+                                                               exchange
+                                                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                empty-tuple-source
 -                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                                replicate
++                                                                -- REPLICATE  |PARTITIONED|
++                                                                  exchange
++                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                    project ([$$p2])
++                                                                    -- STREAM_PROJECT  |PARTITIONED|
++                                                                      exchange
++                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                        data-scan []<-[$$474, $$p2] <- test.col1
++                                                                        -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                          exchange
++                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                            empty-tuple-source
++                                                                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                      exchange
++                                                      -- BROADCAST_EXCHANGE  |PARTITIONED|
++                                                        unnest $$488 <- scan-collection(array: [ "l1", "l2" ])
++                                                        -- UNNEST  |UNPARTITIONED|
++                                                          empty-tuple-source
++                                                          -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
++                              exchange
++                              -- HASH_PARTITION_EXCHANGE [$$491]  |PARTITIONED|
++                                assign [$$541, $$540] <- [$$470.getField("omaa"), $$470.getField("qaz")] project: [$$540, $$541, $$491]
++                                -- ASSIGN  |PARTITIONED|
++                                  select (not(is-missing($$470)))
++                                  -- STREAM_SELECT  |PARTITIONED|
++                                    assign [$$491, $$470] <- [$$sbr.getField("ed"), $$sbr.getField("tohac")] project: [$$491, $$470]
++                                    -- ASSIGN  |PARTITIONED|
++                                      assign [$$sbr] <- [$$p2] project: [$$sbr]
++                                      -- ASSIGN  |PARTITIONED|
++                                        exchange
++                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                          replicate
++                                          -- REPLICATE  |PARTITIONED|
++                                            exchange
++                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                              project ([$$p2])
++                                              -- STREAM_PROJECT  |PARTITIONED|
++                                                exchange
++                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                  data-scan []<-[$$474, $$p2] <- test.col1
++                                                  -- DATASOURCE_SCAN  |PARTITIONED|
++                                                    exchange
++                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                      empty-tuple-source
++                                                      -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --cc asterixdb/asterix-app/src/test/resources/optimizerts/results/limit/pushdown_to_index_search.plan
index 0000000000,172833102e..b7e45565a2
mode 000000,100644..100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/limit/pushdown_to_index_search.plan
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/limit/pushdown_to_index_search.plan
@@@ -1,0 -1,44 +1,38 @@@
 -distribute result [$$54]
++distribute result [$$57]
+ -- DISTRIBUTE_RESULT  |UNPARTITIONED|
+   exchange
+   -- ONE_TO_ONE_EXCHANGE  |UNPARTITIONED|
+     limit 2
+     -- STREAM_LIMIT  |UNPARTITIONED|
 -      project ([$$54])
 -      -- STREAM_PROJECT  |PARTITIONED|
 -        exchange
 -        -- SORT_MERGE_EXCHANGE [$$60(ASC) ]  |PARTITIONED|
 -          project ([$$60, $$54])
 -          -- STREAM_PROJECT  |PARTITIONED|
 -            assign [$$54] <- [{"field1": $$55, "field2": $$56, "field3": $$57, "field4": $$58, "comp_field": string-concat(ordered-list-constructor(replace($$55, "-", ""), "03")), "fieldX": $$ds2.getField("fieldX")}]
 -            -- ASSIGN  |PARTITIONED|
 -              limit 2
 -              -- STREAM_LIMIT  |PARTITIONED|
 -                project ([$$55, $$58, $$57, $$56, $$60, $$ds2])
 -                -- STREAM_PROJECT  |PARTITIONED|
++      exchange
++      -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
++        assign [$$57] <- [{"field1": $$58, "field2": $$59, "field3": $$60, "field4": $$61, "comp_field": string-concat(ordered-list-constructor(replace($$58, "-", ""), "03")), "fieldX": $$ds2.getField("fieldX")}] project: [$$57]
++        -- ASSIGN  |PARTITIONED|
++          limit 2
++          -- STREAM_LIMIT  |PARTITIONED|
++            project ([$$58, $$61, $$60, $$59, $$ds2])
++            -- STREAM_PROJECT  |PARTITIONED|
++              exchange
++              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                unnest-map [$$63, $$ds2] <- index-search("ds2", 0, "Default", "test", "ds2", true, true, 1, $$65, 1, $$65, true, true, true) limit 2
++                -- BTREE_SEARCH  |PARTITIONED|
+                   exchange
+                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                    unnest-map [$$60, $$ds2] <- index-search("ds2", 0, "test", "ds2", true, true, 1, $$62, 1, $$62, true, true, true) limit 2
 -                    -- BTREE_SEARCH  |PARTITIONED|
++                    order (ASC, $$65)
++                    -- STABLE_SORT [$$65(ASC)]  |PARTITIONED|
+                       exchange
 -                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                        order (ASC, $$62)
 -                        -- STABLE_SORT [$$62(ASC)]  |PARTITIONED|
 -                          exchange
 -                          -- HASH_PARTITION_EXCHANGE [$$62]  |PARTITIONED|
 -                            assign [$$62] <- [string-concat(ordered-list-constructor($$56, ":", to-string($$57), ":", $$58))]
 -                            -- ASSIGN  |PARTITIONED|
 -                              project ([$$55, $$58, $$57, $$56])
 -                              -- STREAM_PROJECT  |PARTITIONED|
 -                                assign [$$55, $$58, $$57, $$56] <- [$$ds1.getField("field1"), $$ds1.getField("field4"), $$ds1.getField("field3"), $$ds1.getField("field2")]
 -                                -- ASSIGN  |PARTITIONED|
 -                                  project ([$$ds1])
 -                                  -- STREAM_PROJECT  |PARTITIONED|
 -                                    exchange
 -                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                      data-scan []<-[$$59, $$ds1] <- test.ds1
 -                                      -- DATASOURCE_SCAN  |PARTITIONED|
 -                                        exchange
 -                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                          empty-tuple-source
 -                                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                      -- HASH_PARTITION_EXCHANGE [$$65]  |PARTITIONED|
++                        assign [$$65] <- [string-concat(ordered-list-constructor($$59, ":", to-string($$60), ":", $$61))]
++                        -- ASSIGN  |PARTITIONED|
++                          assign [$$58, $$61, $$60, $$59] <- [$$ds1.getField("field1"), $$ds1.getField("field4"), $$ds1.getField("field3"), $$ds1.getField("field2")] project: [$$58, $$61, $$60, $$59]
++                          -- ASSIGN  |PARTITIONED|
++                            project ([$$ds1])
++                            -- STREAM_PROJECT  |PARTITIONED|
++                              exchange
++                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                data-scan []<-[$$62, $$ds1] <- test.ds1
++                                -- DATASOURCE_SCAN  |PARTITIONED|
++                                  exchange
++                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                    empty-tuple-source
++                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --cc asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.query.sqlpp
index cf3a0e362e,39e4ce97a0..7a5d06e3db
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.query.sqlpp
@@@ -18,5 -18,16 +18,17 @@@
   */
  
  USE test;
- // cannot use array index
- FROM query_index("test", "ds1", "ds1_array_idx") as v SELECT VALUE v;
 -
++SELECT COUNT(*) FROM (
+ SELECT
+     ds1.field1,
+     ds1.field2,
+     ds1.field3,
+     ds1.field4,
+     comp_field,
 -    ds2.fieldX
++    ds2.fieldX AS fieldX
+ FROM ds1 AS ds1
+ JOIN ds2 AS ds2
+     ON ds2.id /*+ indexnl */ = (ds1.field2 || ":" || TO_STRING(ds1.field3) || ":" || ds1.field4)
+     LET comp_field = (REPLACE(ds1.field1, "-", "") || "03")
 -LIMIT 2;
++LIMIT 2) sub
++;
diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.adm
index 0000000000,c61af0f3dc..cd2a127383
mode 000000,100644..100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/limit/push-limit-to-join-primary-lookup/push-limit-to-join-primary-lookup.03.adm
@@@ -1,0 -1,2 +1,1 @@@
 -{ "comp_field": "f103", "field1": "f1", "field2": "1", "field3": "1", "field4": "1", "fieldX": 10 }
 -{ "comp_field": "f203", "field1": "f2", "field2": "1", "field3": "1", "field4": "2", "fieldX": 11 }
++{ "$1": 2 }
diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.028.plan
index 41fc34d81a,f46ad89187..3b5bcf3a5d
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.028.plan
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.028.plan
@@@ -1,36 -1,38 +1,36 @@@
- distribute result [$$45] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 -distribute result [$$42] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
++distribute result [$$48] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
  -- DISTRIBUTE_RESULT  |PARTITIONED|
 -  exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 +  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-     assign [$$45] <- [{"age": $$SK0, "cnt": $$49}] project: [$$45] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 -    project ([$$42]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -    -- STREAM_PROJECT  |PARTITIONED|
 -      assign [$$42] <- [{"age": $$SK0, "cnt": $$46}] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -      -- ASSIGN  |PARTITIONED|
 -        exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -        -- SORT_MERGE_EXCHANGE [$$SK0(ASC) ]  |PARTITIONED|
 -          group by ([$$SK0 := $$48]) decor ([]) {
 -                    aggregate [$$46] <- [agg-sql-sum($$47)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                    -- AGGREGATE  |LOCAL|
 -                      nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                      -- NESTED_TUPLE_SOURCE  |LOCAL|
 -                 } [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -          -- SORT_GROUP_BY[$$48]  |PARTITIONED|
 -            exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -            -- HASH_PARTITION_EXCHANGE [$$48]  |PARTITIONED|
 -              group by ([$$48 := $$44]) decor ([]) {
 -                        aggregate [$$47] <- [agg-sql-count(1)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                        -- AGGREGATE  |LOCAL|
 -                          nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                          -- NESTED_TUPLE_SOURCE  |LOCAL|
 -                     } [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -              -- PRE_CLUSTERED_GROUP_BY[$$44]  |PARTITIONED|
 -                exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                  project ([$$44]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                  -- STREAM_PROJECT  |PARTITIONED|
 -                    exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                      data-scan []<-[$$44, $$45] <- test.ds1.ds1_age.query-index [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -                      -- DATASOURCE_SCAN  |PARTITIONED|
 -                        exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                          empty-tuple-source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++    assign [$$48] <- [{"age": $$SK0, "cnt": $$52}] project: [$$48] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +    -- ASSIGN  |PARTITIONED|
 +      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +      -- SORT_MERGE_EXCHANGE [$$SK0(ASC) ]  |PARTITIONED|
-         group by ([$$SK0 := $$51]) decor ([]) {
-                   aggregate [$$49] <- [agg-sql-sum($$50)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++        group by ([$$SK0 := $$54]) decor ([]) {
++                  aggregate [$$52] <- [agg-sql-sum($$53)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                  -- AGGREGATE  |LOCAL|
 +                    nested tuple source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                    -- NESTED_TUPLE_SOURCE  |LOCAL|
 +               } [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-         -- SORT_GROUP_BY[$$51]  |PARTITIONED|
++        -- SORT_GROUP_BY[$$54]  |PARTITIONED|
 +          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-           -- HASH_PARTITION_EXCHANGE [$$51]  |PARTITIONED|
-             group by ([$$51 := $$47]) decor ([]) {
-                       aggregate [$$50] <- [agg-sql-count(1)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++          -- HASH_PARTITION_EXCHANGE [$$54]  |PARTITIONED|
++            group by ([$$54 := $$50]) decor ([]) {
++                      aggregate [$$53] <- [agg-sql-count(1)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                      -- AGGREGATE  |LOCAL|
 +                        nested tuple source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                        -- NESTED_TUPLE_SOURCE  |LOCAL|
 +                   } [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-             -- PRE_CLUSTERED_GROUP_BY[$$47]  |PARTITIONED|
++            -- SORT_GROUP_BY[$$50]  |PARTITIONED|
 +              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                 project ([$$47]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                project ([$$50]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                -- STREAM_PROJECT  |PARTITIONED|
 +                  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                     data-scan []<-[$$47, $$48] <- test.ds1.ds1_age.query-index [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                    data-scan []<-[$$50, $$51] <- test.ds1.ds1_age.query-index [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                    -- DATASOURCE_SCAN  |PARTITIONED|
 +                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 +                        empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.029.plan
index f560ce88f5,30795375e6..ca1b5d25bc
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.029.plan
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.029.plan
@@@ -1,36 -1,38 +1,36 @@@
- distribute result [$$45] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 -distribute result [$$42] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
++distribute result [$$48] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
  -- DISTRIBUTE_RESULT  |PARTITIONED|
 -  exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 +  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-     assign [$$45] <- [{"age": $$SK0, "cnt": $$50}] project: [$$45] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 -    project ([$$42]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -    -- STREAM_PROJECT  |PARTITIONED|
 -      assign [$$42] <- [{"age": $$SK0, "cnt": $$47}] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -      -- ASSIGN  |PARTITIONED|
 -        exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -        -- SORT_MERGE_EXCHANGE [$$SK0(ASC) ]  |PARTITIONED|
 -          group by ([$$SK0 := $$49]) decor ([]) {
 -                    aggregate [$$47] <- [agg-sql-sum($$48)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                    -- AGGREGATE  |LOCAL|
 -                      nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                      -- NESTED_TUPLE_SOURCE  |LOCAL|
 -                 } [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -          -- SORT_GROUP_BY[$$49]  |PARTITIONED|
 -            exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -            -- HASH_PARTITION_EXCHANGE [$$49]  |PARTITIONED|
 -              group by ([$$49 := $$44]) decor ([]) {
 -                        aggregate [$$48] <- [agg-sql-count(1)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                        -- AGGREGATE  |LOCAL|
 -                          nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                          -- NESTED_TUPLE_SOURCE  |LOCAL|
 -                     } [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -              -- PRE_CLUSTERED_GROUP_BY[$$44]  |PARTITIONED|
 -                exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                  project ([$$44]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                  -- STREAM_PROJECT  |PARTITIONED|
 -                    exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                      data-scan []<-[$$44, $$45, $$46] <- test.ds1.ds1_age_dept.query-index [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -                      -- DATASOURCE_SCAN  |PARTITIONED|
 -                        exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                          empty-tuple-source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++    assign [$$48] <- [{"age": $$SK0, "cnt": $$53}] project: [$$48] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +    -- ASSIGN  |PARTITIONED|
 +      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +      -- SORT_MERGE_EXCHANGE [$$SK0(ASC) ]  |PARTITIONED|
-         group by ([$$SK0 := $$52]) decor ([]) {
-                   aggregate [$$50] <- [agg-sql-sum($$51)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++        group by ([$$SK0 := $$55]) decor ([]) {
++                  aggregate [$$53] <- [agg-sql-sum($$54)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                  -- AGGREGATE  |LOCAL|
 +                    nested tuple source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                    -- NESTED_TUPLE_SOURCE  |LOCAL|
 +               } [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-         -- SORT_GROUP_BY[$$52]  |PARTITIONED|
++        -- SORT_GROUP_BY[$$55]  |PARTITIONED|
 +          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-           -- HASH_PARTITION_EXCHANGE [$$52]  |PARTITIONED|
-             group by ([$$52 := $$47]) decor ([]) {
-                       aggregate [$$51] <- [agg-sql-count(1)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++          -- HASH_PARTITION_EXCHANGE [$$55]  |PARTITIONED|
++            group by ([$$55 := $$50]) decor ([]) {
++                      aggregate [$$54] <- [agg-sql-count(1)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                      -- AGGREGATE  |LOCAL|
 +                        nested tuple source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                        -- NESTED_TUPLE_SOURCE  |LOCAL|
 +                   } [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-             -- PRE_CLUSTERED_GROUP_BY[$$47]  |PARTITIONED|
++            -- SORT_GROUP_BY[$$50]  |PARTITIONED|
 +              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                 project ([$$47]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                project ([$$50]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                -- STREAM_PROJECT  |PARTITIONED|
 +                  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                     data-scan []<-[$$47, $$48, $$49] <- test.ds1.ds1_age_dept.query-index [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                    data-scan []<-[$$50, $$51, $$52] <- test.ds1.ds1_age_dept.query-index [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                    -- DATASOURCE_SCAN  |PARTITIONED|
 +                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 +                        empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.031.plan
index d7e7d70e82,41c7bd4610..e93f15a271
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.031.plan
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.031.plan
@@@ -1,36 -1,38 +1,36 @@@
- distribute result [$$57] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 -distribute result [$$53] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
++distribute result [$$61] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
  -- DISTRIBUTE_RESULT  |PARTITIONED|
 -  exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 +  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-     assign [$$57] <- [{"age": $$SK0, "dept": $$SK1, "cnt": $$63}] project: [$$57] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 -    project ([$$53]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -    -- STREAM_PROJECT  |PARTITIONED|
 -      assign [$$53] <- [{"age": $$SK0, "dept": $$SK1, "cnt": $$59}] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -      -- ASSIGN  |PARTITIONED|
 -        exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -        -- SORT_MERGE_EXCHANGE [$$SK0(ASC), $$SK1(ASC) ]  |PARTITIONED|
 -          group by ([$$SK0 := $$61; $$SK1 := $$62]) decor ([]) {
 -                    aggregate [$$59] <- [agg-sql-sum($$60)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                    -- AGGREGATE  |LOCAL|
 -                      nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                      -- NESTED_TUPLE_SOURCE  |LOCAL|
 -                 } [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -          -- SORT_GROUP_BY[$$61, $$62]  |PARTITIONED|
 -            exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -            -- HASH_PARTITION_EXCHANGE [$$61, $$62]  |PARTITIONED|
 -              group by ([$$61 := $$56; $$62 := $$57]) decor ([]) {
 -                        aggregate [$$60] <- [agg-sql-count(1)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                        -- AGGREGATE  |LOCAL|
 -                          nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                          -- NESTED_TUPLE_SOURCE  |LOCAL|
 -                     } [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -              -- PRE_CLUSTERED_GROUP_BY[$$56, $$57]  |PARTITIONED|
 -                exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                  project ([$$56, $$57]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                  -- STREAM_PROJECT  |PARTITIONED|
 -                    exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                      data-scan []<-[$$56, $$57, $$58] <- test.ds1.ds1_age_dept.query-index [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -                      -- DATASOURCE_SCAN  |PARTITIONED|
 -                        exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                          empty-tuple-source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++    assign [$$61] <- [{"age": $$SK0, "dept": $$SK1, "cnt": $$67}] project: [$$61] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +    -- ASSIGN  |PARTITIONED|
 +      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +      -- SORT_MERGE_EXCHANGE [$$SK0(ASC), $$SK1(ASC) ]  |PARTITIONED|
-         group by ([$$SK0 := $$65; $$SK1 := $$66]) decor ([]) {
-                   aggregate [$$63] <- [agg-sql-sum($$64)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++        group by ([$$SK0 := $$69; $$SK1 := $$70]) decor ([]) {
++                  aggregate [$$67] <- [agg-sql-sum($$68)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                  -- AGGREGATE  |LOCAL|
 +                    nested tuple source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                    -- NESTED_TUPLE_SOURCE  |LOCAL|
 +               } [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-         -- SORT_GROUP_BY[$$65, $$66]  |PARTITIONED|
++        -- SORT_GROUP_BY[$$69, $$70]  |PARTITIONED|
 +          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-           -- HASH_PARTITION_EXCHANGE [$$65, $$66]  |PARTITIONED|
-             group by ([$$65 := $$60; $$66 := $$61]) decor ([]) {
-                       aggregate [$$64] <- [agg-sql-count(1)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++          -- HASH_PARTITION_EXCHANGE [$$69, $$70]  |PARTITIONED|
++            group by ([$$69 := $$64; $$70 := $$65]) decor ([]) {
++                      aggregate [$$68] <- [agg-sql-count(1)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                      -- AGGREGATE  |LOCAL|
 +                        nested tuple source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                        -- NESTED_TUPLE_SOURCE  |LOCAL|
 +                   } [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-             -- PRE_CLUSTERED_GROUP_BY[$$60, $$61]  |PARTITIONED|
++            -- SORT_GROUP_BY[$$64, $$65]  |PARTITIONED|
 +              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                 project ([$$60, $$61]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                project ([$$64, $$65]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                -- STREAM_PROJECT  |PARTITIONED|
 +                  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                     data-scan []<-[$$60, $$61, $$62] <- test.ds1.ds1_age_dept.query-index [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                    data-scan []<-[$$64, $$65, $$66] <- test.ds1.ds1_age_dept.query-index [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                    -- DATASOURCE_SCAN  |PARTITIONED|
 +                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 +                        empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
 +                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.034.plan
index 0000000000,30f0d1e7a1..798e2c973c
mode 000000,100644..100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.034.plan
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.034.plan
@@@ -1,0 -1,20 +1,18 @@@
 -distribute result [$$16] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
++distribute result [$$17] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+ -- DISTRIBUTE_RESULT  |PARTITIONED|
 -  exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
++  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -    project ([$$16]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -    -- STREAM_PROJECT  |PARTITIONED|
 -      assign [$$16] <- [{"age": $$19, "PK0": $$20}] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -      -- ASSIGN  |PARTITIONED|
 -        exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -        -- SORT_MERGE_EXCHANGE [$$19(ASC), $$20(ASC) ]  |PARTITIONED|
 -          order (ASC, $$19) (ASC, $$20) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -          -- STABLE_SORT [$$19(ASC), $$20(ASC)]  |PARTITIONED|
 -            exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -              data-scan []<-[$$19, $$20] <- test.ds4.ds4_array_idx1.query-index [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -              -- DATASOURCE_SCAN  |PARTITIONED|
 -                exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                  empty-tuple-source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++    assign [$$17] <- [{"age": $$20, "PK0": $$21}] project: [$$17] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++    -- ASSIGN  |PARTITIONED|
++      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++      -- SORT_MERGE_EXCHANGE [$$20(ASC), $$21(ASC) ]  |PARTITIONED|
++        order (ASC, $$20) (ASC, $$21) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++        -- STABLE_SORT [$$20(ASC), $$21(ASC)]  |PARTITIONED|
++          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++            data-scan []<-[$$20, $$21] <- test.ds4.ds4_array_idx1.query-index [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++            -- DATASOURCE_SCAN  |PARTITIONED|
++              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.035.plan
index 0000000000,5255c02f54..4aa9d29876
mode 000000,100644..100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.035.plan
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/query_index/q01/q01.035.plan
@@@ -1,0 -1,20 +1,18 @@@
 -distribute result [$$16] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
++distribute result [$$17] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+ -- DISTRIBUTE_RESULT  |PARTITIONED|
 -  exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
++  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -    project ([$$16]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -    -- STREAM_PROJECT  |PARTITIONED|
 -      assign [$$16] <- [{"age": $$19, "PK0": $$20}] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -      -- ASSIGN  |PARTITIONED|
 -        exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -        -- SORT_MERGE_EXCHANGE [$$19(ASC), $$20(ASC) ]  |PARTITIONED|
 -          order (ASC, $$19) (ASC, $$20) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -          -- STABLE_SORT [$$19(ASC), $$20(ASC)]  |PARTITIONED|
 -            exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -              data-scan []<-[$$19, $$20] <- test.ds4.ds4_array_idx2.query-index [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -              -- DATASOURCE_SCAN  |PARTITIONED|
 -                exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                  empty-tuple-source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++    assign [$$17] <- [{"age": $$20, "PK0": $$21}] project: [$$17] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++    -- ASSIGN  |PARTITIONED|
++      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++      -- SORT_MERGE_EXCHANGE [$$20(ASC), $$21(ASC) ]  |PARTITIONED|
++        order (ASC, $$20) (ASC, $$21) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++        -- STABLE_SORT [$$20(ASC), $$21(ASC)]  |PARTITIONED|
++          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++            data-scan []<-[$$20, $$21] <- test.ds4.ds4_array_idx2.query-index [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++            -- DATASOURCE_SCAN  |PARTITIONED|
++              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results/tpcds/q90/q90.2.plan
index 0000000000,9021e07eae..84848aa9b2
mode 000000,100644..100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/tpcds/q90/q90.2.plan
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/tpcds/q90/q90.2.plan
@@@ -1,0 -1,210 +1,250 @@@
 -distribute result [$$166] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
++distribute result [$$175] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+ -- DISTRIBUTE_RESULT  |LOCAL|
 -  exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
++  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+   -- ONE_TO_ONE_EXCHANGE  |LOCAL|
 -    limit 100 [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
++    limit 100 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+     -- STREAM_LIMIT  |LOCAL|
 -      project ([$$166]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -      -- STREAM_PROJECT  |LOCAL|
 -        assign [$$166] <- [{"am_pm_ratio": $#1}] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -        -- ASSIGN  |LOCAL|
 -          limit 100 [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -          -- STREAM_LIMIT  |LOCAL|
 -            exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -            -- ONE_TO_ONE_EXCHANGE  |LOCAL|
 -              order (topK: 100) (ASC, $#1) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -              -- STABLE_SORT [topK: 100] [$#1(ASC)]  |LOCAL|
 -                exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                -- ONE_TO_ONE_EXCHANGE  |LOCAL|
 -                  project ([$#1]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                  -- STREAM_PROJECT  |LOCAL|
 -                    assign [$#1] <- [numeric-divide(numeric-multiply($$196, 1.0), $$183)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                    -- ASSIGN  |LOCAL|
 -                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
++      assign [$$175] <- [{"am_pm_ratio": $#1}] project: [$$175] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++      -- ASSIGN  |LOCAL|
++        limit 100 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++        -- STREAM_LIMIT  |LOCAL|
++          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++          -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++            order (topK: 100) (ASC, $#1) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++            -- STABLE_SORT [topK: 100] [$#1(ASC)]  |LOCAL|
++              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++              -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++                assign [$#1] <- [numeric-divide(numeric-multiply($$205, 1.0), $$192)] project: [$#1] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                -- ASSIGN  |LOCAL|
++                  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                  -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++                    join (true) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                    -- NESTED_LOOP  |LOCAL|
++                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+                       -- ONE_TO_ONE_EXCHANGE  |LOCAL|
 -                        join (true) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                        -- NESTED_LOOP  |LOCAL|
 -                          exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                          -- ONE_TO_ONE_EXCHANGE  |LOCAL|
 -                            aggregate [$$196] <- [agg-sql-sum($$197)] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                            -- AGGREGATE  |LOCAL|
 -                              aggregate [$$197] <- [agg-sql-count(1)] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                              -- AGGREGATE  |LOCAL|
 -                                limit 10 [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                                -- STREAM_LIMIT  |UNPARTITIONED|
 -                                  project ([]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
++                        aggregate [$$205] <- [agg-sql-sum($$206)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                        -- AGGREGATE  |LOCAL|
++                          aggregate [$$206] <- [agg-sql-count(1)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                          -- AGGREGATE  |LOCAL|
++                            limit 10 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                            -- STREAM_LIMIT  |UNPARTITIONED|
++                              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                              -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
++                                limit 10 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                -- STREAM_LIMIT  |PARTITIONED|
++                                  project ([]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                   -- STREAM_PROJECT  |PARTITIONED|
 -                                    exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                                    -- SORT_MERGE_EXCHANGE [$$173(ASC) ]  |PARTITIONED|
 -                                      limit 10 [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                                      -- STREAM_LIMIT  |PARTITIONED|
 -                                        project ([$$173]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                                        -- STREAM_PROJECT  |PARTITIONED|
 -                                          select (and(ge($$167, 5000), le($$167, 5200))) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1.3E7]
 -                                          -- STREAM_SELECT  |PARTITIONED|
 -                                            project ([$$173, $$167]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                                            -- STREAM_PROJECT  |PARTITIONED|
 -                                              assign [$$167] <- [$$web_page.getField(10)] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                                              -- ASSIGN  |PARTITIONED|
 -                                                project ([$$173, $$web_page]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                  exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                    unnest-map [$$173, $$web_page] <- index-search("web_page", 0, "tpcds", "web_page", true, true, 1, $$181, 1, $$181, true, true, true) limit 10 [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -                                                    -- BTREE_SEARCH  |PARTITIONED|
 -                                                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                        order (ASC, $$181) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                        -- STABLE_SORT [$$181(ASC)]  |PARTITIONED|
 -                                                          exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                          -- HASH_PARTITION_EXCHANGE [$$181]  |PARTITIONED|
 -                                                            project ([$$181]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                            -- STREAM_PROJECT  |PARTITIONED|
 -                                                              select (and(ge($$168, 6), le($$168, 7))) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 9000000.0]
 -                                                              -- STREAM_SELECT  |PARTITIONED|
 -                                                                project ([$$181, $$168]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                                  assign [$$168] <- [$$time_dim.getField(3)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                  -- ASSIGN  |PARTITIONED|
 -                                                                    project ([$$181, $$time_dim]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                      join (eq($$190, $$182)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                      -- HYBRID_HASH_JOIN [$$190][$$182]  |PARTITIONED|
++                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                        -- HASH_PARTITION_EXCHANGE [$$190]  |PARTITIONED|
++                                          project ([$$190]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                          -- STREAM_PROJECT  |PARTITIONED|
++                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                              join (eq($$193, $$181)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                              -- HYBRID_HASH_JOIN [$$193][$$181]  |PARTITIONED|
++                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$193]  |PARTITIONED|
++                                                  project ([$$190, $$193]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                  -- STREAM_PROJECT  |PARTITIONED|
++                                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                      join (eq($$195, $$180)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                      -- HYBRID_HASH_JOIN [$$195][$$180]  |PARTITIONED|
++                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- HASH_PARTITION_EXCHANGE [$$195]  |PARTITIONED|
++                                                          assign [$$190, $$193, $$195] <- [$$ws1.getField(12), $$ws1.getField(1), $$ws1.getField(10)] project: [$$190, $$193, $$195] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ASSIGN  |PARTITIONED|
++                                                            assign [$$ws1] <- [$$ws2] project: [$$ws1] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- ASSIGN  |PARTITIONED|
++                                                              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                -- REPLICATE  |PARTITIONED|
++                                                                  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                    project ([$$ws2]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                     -- STREAM_PROJECT  |PARTITIONED|
 -                                                                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                        unnest-map [$$172, $$time_dim] <- index-search("time_dim", 0, "tpcds", "time_dim", true, true, 1, $$184, 1, $$184, true, true, true) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -                                                                        -- BTREE_SEARCH  |PARTITIONED|
 -                                                                          exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                        data-scan []<-[$$183, $$184, $$ws2] <- tpcds.web_sales [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                        -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                            order (ASC, $$184) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                            -- STABLE_SORT [$$184(ASC)]  |PARTITIONED|
 -                                                                              exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                              -- HASH_PARTITION_EXCHANGE [$$184]  |PARTITIONED|
 -                                                                                project ([$$181, $$184]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                  select (eq($$household_demographics.getField(3), 8)) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 5000000.0]
 -                                                                                  -- STREAM_SELECT  |PARTITIONED|
 -                                                                                    project ([$$181, $$184, $$household_demographics]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                    -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                        unnest-map [$$171, $$household_demographics] <- index-search("household_demographics", 0, "tpcds", "household_demographics", true, true, 1, $$186, 1, $$186, true, true, true) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -                                                                                        -- BTREE_SEARCH  |PARTITIONED|
 -                                                                                          exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                            order (ASC, $$186) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                            -- STABLE_SORT [$$186(ASC)]  |PARTITIONED|
 -                                                                                              exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                              -- HASH_PARTITION_EXCHANGE [$$186]  |PARTITIONED|
 -                                                                                                project ([$$181, $$184, $$186]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                  assign [$$181, $$184, $$186] <- [$$ws1.getField(12), $$ws1.getField(1), $$ws1.getField(10)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                  -- ASSIGN  |PARTITIONED|
 -                                                                                                    project ([$$ws1]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                    -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                      assign [$$ws1] <- [$$ws2] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                      -- ASSIGN  |PARTITIONED|
 -                                                                                                        exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                          replicate [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                          -- REPLICATE  |PARTITIONED|
 -                                                                                                            exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                              project ([$$ws2]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                              -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                                exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                                  data-scan []<-[$$174, $$175, $$ws2] <- tpcds.web_sales [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -                                                                                                                  -- DATASOURCE_SCAN  |PARTITIONED|
 -                                                                                                                    exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                                      empty-tuple-source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                      -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
 -                          exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                          -- ONE_TO_ONE_EXCHANGE  |LOCAL|
 -                            aggregate [$$183] <- [agg-sql-sum($$198)] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                            -- AGGREGATE  |LOCAL|
 -                              aggregate [$$198] <- [agg-sql-count(1)] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                              -- AGGREGATE  |LOCAL|
 -                                limit 10 [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                                -- STREAM_LIMIT  |UNPARTITIONED|
 -                                  project ([]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
++                                                                            empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                          assign [$$180] <- [$$185] project: [$$180] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ASSIGN  |PARTITIONED|
++                                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                              replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                              -- REPLICATE  |PARTITIONED|
++                                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                -- HASH_PARTITION_EXCHANGE [$$185]  |PARTITIONED|
++                                                                  select (eq($$household_demographics.getField(3), 8)) project: [$$185] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- STREAM_SELECT  |PARTITIONED|
++                                                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                      data-scan []<-[$$185, $$household_demographics] <- tpcds.household_demographics [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                      -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                          empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$181]  |PARTITIONED|
++                                                  select (and(ge($$177, 6), le($$177, 7))) project: [$$181] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                  -- STREAM_SELECT  |PARTITIONED|
++                                                    assign [$$181, $$177] <- [$$186, $$189] project: [$$181, $$177] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    -- ASSIGN  |PARTITIONED|
++                                                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                        replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- REPLICATE  |PARTITIONED|
++                                                          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                            assign [$$189] <- [$$time_dim.getField(3)] project: [$$186, $$189] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- ASSIGN  |PARTITIONED|
++                                                              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                data-scan []<-[$$186, $$time_dim] <- tpcds.time_dim [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                    empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                          assign [$$182] <- [$$187] project: [$$182] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                          -- ASSIGN  |PARTITIONED|
++                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                              replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                              -- REPLICATE  |PARTITIONED|
++                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$187]  |PARTITIONED|
++                                                  select (and(ge($$188, 5000), le($$188, 5200))) project: [$$187] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                  -- STREAM_SELECT  |PARTITIONED|
++                                                    assign [$$188] <- [$$web_page.getField(10)] project: [$$187, $$188] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    -- ASSIGN  |PARTITIONED|
++                                                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                        data-scan []<-[$$187, $$web_page] <- tpcds.web_page [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- DATASOURCE_SCAN  |PARTITIONED|
++                                                          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                            empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                      -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++                        aggregate [$$192] <- [agg-sql-sum($$207)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                        -- AGGREGATE  |LOCAL|
++                          aggregate [$$207] <- [agg-sql-count(1)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                          -- AGGREGATE  |LOCAL|
++                            limit 10 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                            -- STREAM_LIMIT  |UNPARTITIONED|
++                              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                              -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
++                                limit 10 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                -- STREAM_LIMIT  |PARTITIONED|
++                                  project ([]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                   -- STREAM_PROJECT  |PARTITIONED|
 -                                    exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                                    -- SORT_MERGE_EXCHANGE [$$178(ASC) ]  |PARTITIONED|
 -                                      limit 10 [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                                      -- STREAM_LIMIT  |PARTITIONED|
 -                                        project ([$$178]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1.3E7]
 -                                        -- STREAM_PROJECT  |PARTITIONED|
 -                                          select (and(ge($$179, 5000), le($$179, 5200))) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1.3E7]
 -                                          -- STREAM_SELECT  |PARTITIONED|
 -                                            project ([$$178, $$179]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                                            -- STREAM_PROJECT  |PARTITIONED|
 -                                              assign [$$179] <- [$$web_page.getField(10)] [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                                              -- ASSIGN  |PARTITIONED|
 -                                                project ([$$178, $$web_page]) [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
 -                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                  exchange [cardinality: 1000000.0, op-cost: 0.0, total-cost: 1000000.0]
++                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                      join (eq($$199, $$187)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                      -- HYBRID_HASH_JOIN [$$199][$$187]  |PARTITIONED|
++                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                        -- HASH_PARTITION_EXCHANGE [$$199]  |PARTITIONED|
++                                          project ([$$199]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                          -- STREAM_PROJECT  |PARTITIONED|
++                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                              join (eq($$197, $$186)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                              -- HYBRID_HASH_JOIN [$$197][$$186]  |PARTITIONED|
++                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$197]  |PARTITIONED|
++                                                  project ([$$199, $$197]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                  -- STREAM_PROJECT  |PARTITIONED|
++                                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                      join (eq($$201, $$185)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                      -- HYBRID_HASH_JOIN [$$201][$$185]  |PARTITIONED|
++                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- HASH_PARTITION_EXCHANGE [$$201]  |PARTITIONED|
++                                                          assign [$$199, $$201, $$197] <- [$$ws2.getField(12), $$ws2.getField(10), $$ws2.getField(1)] project: [$$199, $$201, $$197] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ASSIGN  |PARTITIONED|
++                                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                              replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                              -- REPLICATE  |PARTITIONED|
++                                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                  project ([$$ws2]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- STREAM_PROJECT  |PARTITIONED|
++                                                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                      data-scan []<-[$$183, $$184, $$ws2] <- tpcds.web_sales [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                      -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                          empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                          replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- REPLICATE  |PARTITIONED|
++                                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- HASH_PARTITION_EXCHANGE [$$185]  |PARTITIONED|
++                                                              select (eq($$household_demographics.getField(3), 8)) project: [$$185] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                              -- STREAM_SELECT  |PARTITIONED|
++                                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                  data-scan []<-[$$185, $$household_demographics] <- tpcds.household_demographics [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                      empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                      -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$186]  |PARTITIONED|
++                                                  select (and(ge($$189, 14), le($$189, 15))) project: [$$186] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                  -- STREAM_SELECT  |PARTITIONED|
++                                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                      replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                      -- REPLICATE  |PARTITIONED|
++                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                          assign [$$189] <- [$$time_dim.getField(3)] project: [$$186, $$189] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ASSIGN  |PARTITIONED|
++                                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                              data-scan []<-[$$186, $$time_dim] <- tpcds.time_dim [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                              -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                  empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                          replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                          -- REPLICATE  |PARTITIONED|
++                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                            -- HASH_PARTITION_EXCHANGE [$$187]  |PARTITIONED|
++                                              select (and(ge($$188, 5000), le($$188, 5200))) project: [$$187] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                              -- STREAM_SELECT  |PARTITIONED|
++                                                assign [$$188] <- [$$web_page.getField(10)] project: [$$187, $$188] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                -- ASSIGN  |PARTITIONED|
++                                                  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                    unnest-map [$$178, $$web_page] <- index-search("web_page", 0, "tpcds", "web_page", true, true, 1, $$190, 1, $$190, true, true, true) limit 10 [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -                                                    -- BTREE_SEARCH  |PARTITIONED|
 -                                                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    data-scan []<-[$$187, $$web_page] <- tpcds.web_page [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    -- DATASOURCE_SCAN  |PARTITIONED|
++                                                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                        order (ASC, $$190) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                        -- STABLE_SORT [$$190(ASC)]  |PARTITIONED|
 -                                                          exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                          -- HASH_PARTITION_EXCHANGE [$$190]  |PARTITIONED|
 -                                                            project ([$$190]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                            -- STREAM_PROJECT  |PARTITIONED|
 -                                                              select (and(ge($$180, 14), le($$180, 15))) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 9000000.0]
 -                                                              -- STREAM_SELECT  |PARTITIONED|
 -                                                                project ([$$190, $$180]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                                  assign [$$180] <- [$$time_dim.getField(3)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                  -- ASSIGN  |PARTITIONED|
 -                                                                    project ([$$190, $$time_dim]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                    -- STREAM_PROJECT  |PARTITIONED|
 -                                                                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                        unnest-map [$$177, $$time_dim] <- index-search("time_dim", 0, "tpcds", "time_dim", true, true, 1, $$188, 1, $$188, true, true, true) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -                                                                        -- BTREE_SEARCH  |PARTITIONED|
 -                                                                          exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                            order (ASC, $$188) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                            -- STABLE_SORT [$$188(ASC)]  |PARTITIONED|
 -                                                                              exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                              -- HASH_PARTITION_EXCHANGE [$$188]  |PARTITIONED|
 -                                                                                project ([$$190, $$188]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                  select (eq($$household_demographics.getField(3), 8)) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 5000000.0]
 -                                                                                  -- STREAM_SELECT  |PARTITIONED|
 -                                                                                    project ([$$190, $$188, $$household_demographics]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                    -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                      exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                        unnest-map [$$176, $$household_demographics] <- index-search("household_demographics", 0, "tpcds", "household_demographics", true, true, 1, $$192, 1, $$192, true, true, true) [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -                                                                                        -- BTREE_SEARCH  |PARTITIONED|
 -                                                                                          exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                            order (ASC, $$192) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                            -- STABLE_SORT [$$192(ASC)]  |PARTITIONED|
 -                                                                                              exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                              -- HASH_PARTITION_EXCHANGE [$$192]  |PARTITIONED|
 -                                                                                                project ([$$190, $$192, $$188]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                  assign [$$190, $$192, $$188] <- [$$ws2.getField(12), $$ws2.getField(10), $$ws2.getField(1)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                  -- ASSIGN  |PARTITIONED|
 -                                                                                                    exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                      replicate [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                      -- REPLICATE  |PARTITIONED|
 -                                                                                                        exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                          project ([$$ws2]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                          -- STREAM_PROJECT  |PARTITIONED|
 -                                                                                                            exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                              data-scan []<-[$$174, $$175, $$ws2] <- tpcds.web_sales [cardinality: 1000000.0, op-cost: 1000000.0, total-cost: 1000000.0]
 -                                                                                                              -- DATASOURCE_SCAN  |PARTITIONED|
 -                                                                                                                exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
 -                                                                                                                  empty-tuple-source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
 -                                                                                                                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                        empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/tpcds/q90/q90.2.plan
index 0000000000,0000000000..c7ee9557d4
new file mode 100644
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/tpcds/q90/q90.2.plan
@@@ -1,0 -1,0 +1,250 @@@
++distribute result [$$175] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++-- DISTRIBUTE_RESULT  |LOCAL|
++  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++  -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++    limit 100 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++    -- STREAM_LIMIT  |LOCAL|
++      assign [$$175] <- [{"am_pm_ratio": $#1}] project: [$$175] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++      -- ASSIGN  |LOCAL|
++        limit 100 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++        -- STREAM_LIMIT  |LOCAL|
++          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++          -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++            order (topK: 100) (ASC, $#1) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++            -- STABLE_SORT [topK: 100] [$#1(ASC)]  |LOCAL|
++              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++              -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++                assign [$#1] <- [numeric-divide(numeric-multiply($$205, 1.0), $$192)] project: [$#1] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                -- ASSIGN  |LOCAL|
++                  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                  -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++                    join (true) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                    -- NESTED_LOOP  |LOCAL|
++                      exchange [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                      -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++                        aggregate [$$205] <- [agg-sql-sum($$206)] [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                        -- AGGREGATE  |LOCAL|
++                          aggregate [$$206] <- [agg-sql-count(1)] [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                          -- AGGREGATE  |LOCAL|
++                            limit 10 [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                            -- STREAM_LIMIT  |UNPARTITIONED|
++                              exchange [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                              -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
++                                limit 10 [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                                -- STREAM_LIMIT  |PARTITIONED|
++                                  project ([]) [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                                  -- STREAM_PROJECT  |PARTITIONED|
++                                    exchange [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                      join (eq($$190, $$182)) [cardinality: 2.1, doc-size: 54.0, op-cost: 3.1, total-cost: 85.4]
++                                      -- HYBRID_HASH_JOIN [$$190][$$182]  |PARTITIONED|
++                                        exchange [cardinality: 2.1, doc-size: 45.0, op-cost: 0.0, total-cost: 69.2]
++                                        -- HASH_PARTITION_EXCHANGE [$$190]  |PARTITIONED|
++                                          project ([$$190]) [cardinality: 2.1, doc-size: 45.0, op-cost: 0.0, total-cost: 69.2]
++                                          -- STREAM_PROJECT  |PARTITIONED|
++                                            exchange [cardinality: 2.1, doc-size: 45.0, op-cost: 0.0, total-cost: 69.2]
++                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                              join (eq($$195, $$180)) [cardinality: 2.1, doc-size: 45.0, op-cost: 3.1, total-cost: 69.2]
++                                              -- HYBRID_HASH_JOIN [$$195][$$180]  |PARTITIONED|
++                                                exchange [cardinality: 2.1, doc-size: 36.0, op-cost: 0.0, total-cost: 56.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$195]  |PARTITIONED|
++                                                  project ([$$190, $$195]) [cardinality: 2.1, doc-size: 36.0, op-cost: 0.0, total-cost: 56.0]
++                                                  -- STREAM_PROJECT  |PARTITIONED|
++                                                    exchange [cardinality: 2.1, doc-size: 36.0, op-cost: 0.0, total-cost: 56.0]
++                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                      join (eq($$193, $$181)) [cardinality: 2.1, doc-size: 36.0, op-cost: 23.0, total-cost: 56.0]
++                                                      -- HYBRID_HASH_JOIN [$$193][$$181]  |PARTITIONED|
++                                                        exchange [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                        -- RANDOM_PARTITION_EXCHANGE  |PARTITIONED|
++                                                          assign [$$190, $$193, $$195] <- [$$ws1.getField(12), $$ws1.getField(1), $$ws1.getField(10)] project: [$$190, $$193, $$195] [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                          -- ASSIGN  |PARTITIONED|
++                                                            assign [$$ws1] <- [$$ws2] project: [$$ws1] [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                            -- ASSIGN  |PARTITIONED|
++                                                              exchange [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                replicate [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                                -- REPLICATE  |PARTITIONED|
++                                                                  exchange [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                    project ([$$ws2]) [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                                    -- STREAM_PROJECT  |PARTITIONED|
++                                                                      exchange [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                        data-scan []<-[$$183, $$184, $$ws2] <- tpcds.web_sales [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                                        -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                            empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                        exchange [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                        -- BROADCAST_EXCHANGE  |PARTITIONED|
++                                                          select (and(ge($$177, 6), le($$177, 7))) project: [$$181] [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                          -- STREAM_SELECT  |PARTITIONED|
++                                                            assign [$$181, $$177] <- [$$186, $$189] project: [$$181, $$177] [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                            -- ASSIGN  |PARTITIONED|
++                                                              exchange [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                replicate [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                                -- REPLICATE  |PARTITIONED|
++                                                                  exchange [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                    assign [$$189] <- [$$time_dim.getField(3)] project: [$$186, $$189] [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                                    -- ASSIGN  |PARTITIONED|
++                                                                      exchange [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                        data-scan []<-[$$186, $$time_dim] <- tpcds.time_dim [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                                        -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                            empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                exchange [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                  assign [$$180] <- [$$185] project: [$$180] [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                  -- ASSIGN  |PARTITIONED|
++                                                    exchange [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                      replicate [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                      -- REPLICATE  |PARTITIONED|
++                                                        exchange [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                        -- HASH_PARTITION_EXCHANGE [$$185]  |PARTITIONED|
++                                                          select (eq($$household_demographics.getField(3), 8)) project: [$$185] [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                          -- STREAM_SELECT  |PARTITIONED|
++                                                            exchange [cardinality: 7.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                              data-scan []<-[$$185, $$household_demographics] <- tpcds.household_demographics [cardinality: 7.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                              -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                  empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                        exchange [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                          assign [$$182] <- [$$187] project: [$$182] [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                          -- ASSIGN  |PARTITIONED|
++                                            exchange [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                              replicate [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                              -- REPLICATE  |PARTITIONED|
++                                                exchange [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$187]  |PARTITIONED|
++                                                  select (and(ge($$188, 5000), le($$188, 5200))) project: [$$187] [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                  -- STREAM_SELECT  |PARTITIONED|
++                                                    assign [$$188] <- [$$web_page.getField(10)] project: [$$187, $$188] [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                    -- ASSIGN  |PARTITIONED|
++                                                      exchange [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                        data-scan []<-[$$187, $$web_page] <- tpcds.web_page [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                        -- DATASOURCE_SCAN  |PARTITIONED|
++                                                          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                            empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                      exchange [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                      -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++                        aggregate [$$192] <- [agg-sql-sum($$207)] [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                        -- AGGREGATE  |LOCAL|
++                          aggregate [$$207] <- [agg-sql-count(1)] [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                          -- AGGREGATE  |LOCAL|
++                            limit 10 [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                            -- STREAM_LIMIT  |UNPARTITIONED|
++                              exchange [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                              -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
++                                limit 10 [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                                -- STREAM_LIMIT  |PARTITIONED|
++                                  project ([]) [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                                  -- STREAM_PROJECT  |PARTITIONED|
++                                    exchange [cardinality: 2.1, doc-size: 54.0, op-cost: 0.0, total-cost: 85.4]
++                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                      join (eq($$199, $$187)) [cardinality: 2.1, doc-size: 54.0, op-cost: 3.1, total-cost: 85.4]
++                                      -- HYBRID_HASH_JOIN [$$199][$$187]  |PARTITIONED|
++                                        exchange [cardinality: 2.1, doc-size: 45.0, op-cost: 0.0, total-cost: 69.2]
++                                        -- HASH_PARTITION_EXCHANGE [$$199]  |PARTITIONED|
++                                          project ([$$199]) [cardinality: 2.1, doc-size: 45.0, op-cost: 0.0, total-cost: 69.2]
++                                          -- STREAM_PROJECT  |PARTITIONED|
++                                            exchange [cardinality: 2.1, doc-size: 45.0, op-cost: 0.0, total-cost: 69.2]
++                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                              join (eq($$201, $$185)) [cardinality: 2.1, doc-size: 45.0, op-cost: 3.1, total-cost: 69.2]
++                                              -- HYBRID_HASH_JOIN [$$201][$$185]  |PARTITIONED|
++                                                exchange [cardinality: 2.1, doc-size: 36.0, op-cost: 0.0, total-cost: 56.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$201]  |PARTITIONED|
++                                                  project ([$$199, $$201]) [cardinality: 2.1, doc-size: 36.0, op-cost: 0.0, total-cost: 56.0]
++                                                  -- STREAM_PROJECT  |PARTITIONED|
++                                                    exchange [cardinality: 2.1, doc-size: 36.0, op-cost: 0.0, total-cost: 56.0]
++                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                      join (eq($$197, $$186)) [cardinality: 2.1, doc-size: 36.0, op-cost: 23.0, total-cost: 56.0]
++                                                      -- HYBRID_HASH_JOIN [$$197][$$186]  |PARTITIONED|
++                                                        exchange [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                        -- RANDOM_PARTITION_EXCHANGE  |PARTITIONED|
++                                                          assign [$$199, $$201, $$197] <- [$$ws2.getField(12), $$ws2.getField(10), $$ws2.getField(1)] project: [$$199, $$201, $$197] [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                          -- ASSIGN  |PARTITIONED|
++                                                            exchange [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                              replicate [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                              -- REPLICATE  |PARTITIONED|
++                                                                exchange [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                  project ([$$ws2]) [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                                  -- STREAM_PROJECT  |PARTITIONED|
++                                                                    exchange [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                      data-scan []<-[$$183, $$184, $$ws2] <- tpcds.web_sales [cardinality: 20.0, doc-size: 27.0, op-cost: 0.0, total-cost: 20.0]
++                                                                      -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                          empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                        exchange [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                        -- BROADCAST_EXCHANGE  |PARTITIONED|
++                                                          select (and(ge($$189, 14), le($$189, 15))) project: [$$186] [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                          -- STREAM_SELECT  |PARTITIONED|
++                                                            exchange [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                              replicate [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                              -- REPLICATE  |PARTITIONED|
++                                                                exchange [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                  assign [$$189] <- [$$time_dim.getField(3)] project: [$$186, $$189] [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                                  -- ASSIGN  |PARTITIONED|
++                                                                    exchange [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                      data-scan []<-[$$186, $$time_dim] <- tpcds.time_dim [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                                      -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                          empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                exchange [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                  replicate [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                  -- REPLICATE  |PARTITIONED|
++                                                    exchange [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                    -- HASH_PARTITION_EXCHANGE [$$185]  |PARTITIONED|
++                                                      select (eq($$household_demographics.getField(3), 8)) project: [$$185] [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                      -- STREAM_SELECT  |PARTITIONED|
++                                                        exchange [cardinality: 7.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                          data-scan []<-[$$185, $$household_demographics] <- tpcds.household_demographics [cardinality: 7.0, doc-size: 9.0, op-cost: 0.0, total-cost: 7.0]
++                                                          -- DATASOURCE_SCAN  |PARTITIONED|
++                                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                              empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                              -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                        exchange [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                          replicate [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                          -- REPLICATE  |PARTITIONED|
++                                            exchange [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                            -- HASH_PARTITION_EXCHANGE [$$187]  |PARTITIONED|
++                                              select (and(ge($$188, 5000), le($$188, 5200))) project: [$$187] [cardinality: 1.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                              -- STREAM_SELECT  |PARTITIONED|
++                                                assign [$$188] <- [$$web_page.getField(10)] project: [$$187, $$188] [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                -- ASSIGN  |PARTITIONED|
++                                                  exchange [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                    data-scan []<-[$$187, $$web_page] <- tpcds.web_page [cardinality: 10.0, doc-size: 9.0, op-cost: 0.0, total-cost: 10.0]
++                                                    -- DATASOURCE_SCAN  |PARTITIONED|
++                                                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                        empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results_column/tpcds/q90/q90.2.plan
index 0000000000,0000000000..e251094b6f
new file mode 100644
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_column/tpcds/q90/q90.2.plan
@@@ -1,0 -1,0 +1,250 @@@
++distribute result [$$175] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++-- DISTRIBUTE_RESULT  |LOCAL|
++  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++  -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++    limit 100 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++    -- STREAM_LIMIT  |LOCAL|
++      assign [$$175] <- [{"am_pm_ratio": $#1}] project: [$$175] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++      -- ASSIGN  |LOCAL|
++        limit 100 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++        -- STREAM_LIMIT  |LOCAL|
++          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++          -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++            order (topK: 100) (ASC, $#1) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++            -- STABLE_SORT [topK: 100] [$#1(ASC)]  |LOCAL|
++              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++              -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++                assign [$#1] <- [numeric-divide(numeric-multiply($$205, 1.0), $$192)] project: [$#1] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                -- ASSIGN  |LOCAL|
++                  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                  -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++                    join (true) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                    -- NESTED_LOOP  |LOCAL|
++                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                      -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++                        aggregate [$$205] <- [agg-sql-sum($$206)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                        -- AGGREGATE  |LOCAL|
++                          aggregate [$$206] <- [agg-sql-count(1)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                          -- AGGREGATE  |LOCAL|
++                            limit 10 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                            -- STREAM_LIMIT  |UNPARTITIONED|
++                              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                              -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
++                                limit 10 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                -- STREAM_LIMIT  |PARTITIONED|
++                                  project ([]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                  -- STREAM_PROJECT  |PARTITIONED|
++                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                      join (eq($$190, $$182)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                      -- HYBRID_HASH_JOIN [$$190][$$182]  |PARTITIONED|
++                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                        -- HASH_PARTITION_EXCHANGE [$$190]  |PARTITIONED|
++                                          project ([$$190]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                          -- STREAM_PROJECT  |PARTITIONED|
++                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                              join (eq($$193, $$181)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                              -- HYBRID_HASH_JOIN [$$193][$$181]  |PARTITIONED|
++                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$193]  |PARTITIONED|
++                                                  project ([$$190, $$193]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                  -- STREAM_PROJECT  |PARTITIONED|
++                                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                      join (eq($$195, $$180)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                      -- HYBRID_HASH_JOIN [$$195][$$180]  |PARTITIONED|
++                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- HASH_PARTITION_EXCHANGE [$$195]  |PARTITIONED|
++                                                          assign [$$190, $$193, $$195] <- [$$ws1.getField(12), $$ws1.getField(1), $$ws1.getField(10)] project: [$$190, $$193, $$195] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ASSIGN  |PARTITIONED|
++                                                            assign [$$ws1] <- [$$ws2] project: [$$ws1] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- ASSIGN  |PARTITIONED|
++                                                              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                -- REPLICATE  |PARTITIONED|
++                                                                  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                    project ([$$ws2]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                    -- STREAM_PROJECT  |PARTITIONED|
++                                                                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                        data-scan []<-[$$183, $$184, $$ws2] <- tpcds.web_sales project ({ws_ship_hdemo_sk:any,ws_sold_time_sk:any,ws_web_page_sk:any}) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                        -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                            empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                          assign [$$180] <- [$$185] project: [$$180] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ASSIGN  |PARTITIONED|
++                                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                              replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                              -- REPLICATE  |PARTITIONED|
++                                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                -- HASH_PARTITION_EXCHANGE [$$185]  |PARTITIONED|
++                                                                  select (eq($$household_demographics.getField(3), 8)) project: [$$185] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- STREAM_SELECT  |PARTITIONED|
++                                                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                      data-scan []<-[$$185, $$household_demographics] <- tpcds.household_demographics project ({hd_dep_count:any}) filter on: eq($$household_demographics.getField(3), 8) range-filter on: eq($$household_demographics.getField(3), 8) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                      -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                          empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$181]  |PARTITIONED|
++                                                  select (and(ge($$177, 6), le($$177, 7))) project: [$$181] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                  -- STREAM_SELECT  |PARTITIONED|
++                                                    assign [$$181, $$177] <- [$$186, $$189] project: [$$181, $$177] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    -- ASSIGN  |PARTITIONED|
++                                                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                        replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- REPLICATE  |PARTITIONED|
++                                                          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                            assign [$$189] <- [$$time_dim.getField(3)] project: [$$186, $$189] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- ASSIGN  |PARTITIONED|
++                                                              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                data-scan []<-[$$186, $$time_dim] <- tpcds.time_dim project ({t_hour:any}) filter on: or(and(ge($$time_dim.getField(3), 6), le($$time_dim.getField(3), 7)), and(ge($$time_dim.getField(3), 14), le($$time_dim.getField(3), 15))) range-filter on: or(and(ge($$time_dim.getField(3), 6), le($$time_dim.getField(3), 7)), and(ge($$time_dim.getField(3), 14), le($$time_dim.getField(3), 15))) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0 [...]
++                                                                -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                    empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                          assign [$$182] <- [$$187] project: [$$182] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                          -- ASSIGN  |PARTITIONED|
++                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                              replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                              -- REPLICATE  |PARTITIONED|
++                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$187]  |PARTITIONED|
++                                                  select (and(ge($$188, 5000), le($$188, 5200))) project: [$$187] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                  -- STREAM_SELECT  |PARTITIONED|
++                                                    assign [$$188] <- [$$web_page.getField(10)] project: [$$187, $$188] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    -- ASSIGN  |PARTITIONED|
++                                                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                        data-scan []<-[$$187, $$web_page] <- tpcds.web_page project ({wp_char_count:any}) filter on: and(ge($$web_page.getField(10), 5000), le($$web_page.getField(10), 5200)) range-filter on: and(ge($$web_page.getField(10), 5000), le($$web_page.getField(10), 5200)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- DATASOURCE_SCAN  |PARTITIONED|
++                                                          exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                            empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                      -- ONE_TO_ONE_EXCHANGE  |LOCAL|
++                        aggregate [$$192] <- [agg-sql-sum($$207)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                        -- AGGREGATE  |LOCAL|
++                          aggregate [$$207] <- [agg-sql-count(1)] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                          -- AGGREGATE  |LOCAL|
++                            limit 10 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                            -- STREAM_LIMIT  |UNPARTITIONED|
++                              exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                              -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
++                                limit 10 [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                -- STREAM_LIMIT  |PARTITIONED|
++                                  project ([]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                  -- STREAM_PROJECT  |PARTITIONED|
++                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                      join (eq($$199, $$187)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                      -- HYBRID_HASH_JOIN [$$199][$$187]  |PARTITIONED|
++                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                        -- HASH_PARTITION_EXCHANGE [$$199]  |PARTITIONED|
++                                          project ([$$199]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                          -- STREAM_PROJECT  |PARTITIONED|
++                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                              join (eq($$197, $$186)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                              -- HYBRID_HASH_JOIN [$$197][$$186]  |PARTITIONED|
++                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$197]  |PARTITIONED|
++                                                  project ([$$199, $$197]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                  -- STREAM_PROJECT  |PARTITIONED|
++                                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                      join (eq($$201, $$185)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                      -- HYBRID_HASH_JOIN [$$201][$$185]  |PARTITIONED|
++                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- HASH_PARTITION_EXCHANGE [$$201]  |PARTITIONED|
++                                                          assign [$$199, $$201, $$197] <- [$$ws2.getField(12), $$ws2.getField(10), $$ws2.getField(1)] project: [$$199, $$201, $$197] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ASSIGN  |PARTITIONED|
++                                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                              replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                              -- REPLICATE  |PARTITIONED|
++                                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                  project ([$$ws2]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- STREAM_PROJECT  |PARTITIONED|
++                                                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                      data-scan []<-[$$183, $$184, $$ws2] <- tpcds.web_sales project ({ws_ship_hdemo_sk:any,ws_sold_time_sk:any,ws_web_page_sk:any}) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                      -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                          empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                          -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                          replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- REPLICATE  |PARTITIONED|
++                                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- HASH_PARTITION_EXCHANGE [$$185]  |PARTITIONED|
++                                                              select (eq($$household_demographics.getField(3), 8)) project: [$$185] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                              -- STREAM_SELECT  |PARTITIONED|
++                                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                  data-scan []<-[$$185, $$household_demographics] <- tpcds.household_demographics project ({hd_dep_count:any}) filter on: eq($$household_demographics.getField(3), 8) range-filter on: eq($$household_demographics.getField(3), 8) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                      empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                      -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                -- HASH_PARTITION_EXCHANGE [$$186]  |PARTITIONED|
++                                                  select (and(ge($$189, 14), le($$189, 15))) project: [$$186] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                  -- STREAM_SELECT  |PARTITIONED|
++                                                    exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                      replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                      -- REPLICATE  |PARTITIONED|
++                                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                          assign [$$189] <- [$$time_dim.getField(3)] project: [$$186, $$189] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                          -- ASSIGN  |PARTITIONED|
++                                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                              data-scan []<-[$$186, $$time_dim] <- tpcds.time_dim project ({t_hour:any}) filter on: or(and(ge($$time_dim.getField(3), 6), le($$time_dim.getField(3), 7)), and(ge($$time_dim.getField(3), 14), le($$time_dim.getField(3), 15))) range-filter on: or(and(ge($$time_dim.getField(3), 6), le($$time_dim.getField(3), 7)), and(ge($$time_dim.getField(3), 14), le($$time_dim.getField(3), 15))) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,  [...]
++                                                              -- DATASOURCE_SCAN  |PARTITIONED|
++                                                                exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                                  empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
++                                        exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                          replicate [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                          -- REPLICATE  |PARTITIONED|
++                                            exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                            -- HASH_PARTITION_EXCHANGE [$$187]  |PARTITIONED|
++                                              select (and(ge($$188, 5000), le($$188, 5200))) project: [$$187] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                              -- STREAM_SELECT  |PARTITIONED|
++                                                assign [$$188] <- [$$web_page.getField(10)] project: [$$187, $$188] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                -- ASSIGN  |PARTITIONED|
++                                                  exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                    data-scan []<-[$$187, $$web_page] <- tpcds.web_page project ({wp_char_count:any}) filter on: and(ge($$web_page.getField(10), 5000), le($$web_page.getField(10), 5200)) range-filter on: and(ge($$web_page.getField(10), 5000), le($$web_page.getField(10), 5200)) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                    -- DATASOURCE_SCAN  |PARTITIONED|
++                                                      exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
++                                                        empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
++                                                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --cc hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java
index 70f82b0a86,90a82dbd6f..10ed752150
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java
@@@ -28,15 -29,14 +29,17 @@@ import java.io.ObjectStreamClass
  import java.io.Serializable;
  import java.lang.reflect.Modifier;
  import java.lang.reflect.Proxy;
 +import java.util.Map;
  
 -import org.apache.hyracks.api.comm.DefaultJavaSerializationProvider;
  import org.apache.hyracks.api.comm.IJavaSerializationProvider;
 +import org.apache.hyracks.api.comm.ReplacementsAwareJavaSerializationProvider;
 +import org.apache.hyracks.util.ThrowingIOFunction;
  
  public class JavaSerializationUtils {
 -    private static IJavaSerializationProvider serProvider = DefaultJavaSerializationProvider.INSTANCE;
 +    private static final ReplacementsAwareJavaSerializationProvider serProvider =
 +            ReplacementsAwareJavaSerializationProvider.INSTANCE;
+     private static final int MAX_UTF_BYTES = 65535;
+     private static final int SAFE_CHAR_LIMIT = MAX_UTF_BYTES / 3;
  
      private JavaSerializationUtils() {
      }
diff --cc hyracks-fullstack/pom.xml
index 2d871ba9ea,3f8371d18f..57fb5b3393
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -75,10 -75,7 +75,10 @@@
      <snappy.version>1.1.10.5</snappy.version>
      <jackson.version>2.19.2</jackson.version>
      <jackson-databind.version>${jackson.version}</jackson-databind.version>
-     <netty.version>4.1.125.Final</netty.version>
+     <netty.version>4.1.130.Final</netty.version>
 +    <asm.version>9.3</asm.version>
 +    <awsjavasdk.version>2.29.27</awsjavasdk.version>
 +    <gcsjavasdk.version>2.45.0</gcsjavasdk.version>
  
      <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
      <implementation.url>https://asterixdb.apache.org/</implementation.url>


(asterixdb) 20/22: Merge branch 'gerrit/neo' into 'gerrit/trinity'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit c219e3d13a1317d4ccff8925191ab241025d979d
Merge: 27932b29d1 0646f96bf6
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Jan 14 16:10:40 2026 -0500

    Merge branch 'gerrit/neo' into 'gerrit/trinity'
    
     * [ASTERIXDB-3689][HYR][NET] MuxDemux negotiation hardening
    
    Ext-ref: MB-70113,MB-70114
    Change-Id: I55da93ec7b2341c62edf712040519ba9ecd5705a

 .../hyracks/net/protocols/muxdemux/MuxDemux.java   | 42 +++++++++---
 .../hyracks/net/protocols/tcp/TCPEndpoint.java     | 74 ++++++++++++----------
 2 files changed, 73 insertions(+), 43 deletions(-)


(asterixdb) 21/22: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 3578f0a554c6eec0e612e7e72664c8b983675db2
Merge: ab29f7603d c219e3d13a
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Jan 14 18:28:58 2026 -0500

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [ASTERIXDB-3689][HYR][NET] MuxDemux negotiation hardening (MB-70113,MB-70114)
    
    Ext-ref: MB-70113,MB-70114
    Change-Id: I5b6e93a6fe7609e2bfe28b036e8c0859ccf64961

 .../hyracks/net/protocols/muxdemux/MuxDemux.java   | 42 +++++++++---
 .../hyracks/net/protocols/tcp/TCPEndpoint.java     | 74 ++++++++++++----------
 2 files changed, 73 insertions(+), 43 deletions(-)


(asterixdb) 01/22: [ASTERIXDB-3671][IDX] Incorrect result with array index and index nested loop join

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 629fac4a689fcb797370e2db18d7639205a3e26a
Author: Peeyush Gupta <pe...@couchbase.com>
AuthorDate: Wed Nov 12 15:11:11 2025 -0800

    [ASTERIXDB-3671][IDX] Incorrect result with array index and index nested loop join
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Ext-ref: MB-69372
    Change-Id: I36be4676b6ae887eb730dcb0e76ece60bc1f3bcd
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20569
    Tested-by: Peeyush Gupta <pe...@couchbase.com>
    Reviewed-by: Ali Alsuliman <al...@gmail.com>
---
 .../rules/am/IntroduceJoinAccessMethodRule.java    | 15 +++-
 .../use-case-5/query1.sqlpp                        | 42 ++++++++++
 .../use-case-5/query2.sqlpp                        | 42 ++++++++++
 .../atomic-and-array-queries/query8.plan           | 80 +++++++++---------
 .../atomic-and-array-queries/query9.plan           | 94 +++++++++++-----------
 .../join-quantified-queries/use-case-5/query1.plan | 81 +++++++++++++++++++
 .../join-quantified-queries/use-case-5/query2.plan | 83 +++++++++++++++++++
 .../use-case-5/use-case-5.1.ddl.sqlpp              | 31 +++++++
 .../use-case-5/use-case-5.2.update.sqlpp           | 46 +++++++++++
 .../use-case-5/use-case-5.3.query.sqlpp            | 30 +++++++
 .../use-case-5/use-case-5.4.query.sqlpp            | 30 +++++++
 .../use-case-5/use-case-5.3.adm                    |  0
 .../use-case-5/use-case-5.4.adm                    |  2 +
 13 files changed, 492 insertions(+), 84 deletions(-)

diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceJoinAccessMethodRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceJoinAccessMethodRule.java
index b2b5e7c10a..3d80ce2321 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceJoinAccessMethodRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceJoinAccessMethodRule.java
@@ -38,6 +38,7 @@ import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
 import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
 import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
 import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
 import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
 import org.apache.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue;
 import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
@@ -48,6 +49,7 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogi
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.GroupByOperator;
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.InnerJoinOperator;
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.LeftOuterJoinOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.SelectOperator;
 import org.apache.hyracks.algebricks.core.algebra.util.OperatorManipulationUtil;
 import org.apache.hyracks.algebricks.core.algebra.util.OperatorPropertiesUtil;
 
@@ -338,7 +340,18 @@ public class IntroduceJoinAccessMethodRule extends AbstractIntroduceAccessMethod
                     // Connect the after-join operators to the index subtree root before this rewrite. This also avoids
                     // performing the secondary index validation step twice.
                     ILogicalOperator lastAfterJoinOp = afterJoinRefs.get(afterJoinRefs.size() - 1).getValue();
-                    OperatorManipulationUtil.substituteOpInInput(lastAfterJoinOp, joinOp, joinOp.getInputs().get(1));
+                    IAlgebricksConstantValue leftOuterMissingValue =
+                            isLeftOuterJoin ? ((LeftOuterJoinOperator) joinOp).getMissingValue() : null;
+                    LogicalVariable newMissingNullPlaceHolderVar = null;
+                    SelectOperator topSelectOp =
+                            isLeftOuterJoin ? new SelectOperator(joinOp.getCondition(), leftOuterMissingValue,
+                                    newMissingNullPlaceHolderVar) : new SelectOperator(joinOp.getCondition());
+                    topSelectOp.setSourceLocation(joinOp.getSourceLocation());
+                    topSelectOp.getInputs().add(joinOp.getInputs().get(1));
+                    topSelectOp.setExecutionMode(AbstractLogicalOperator.ExecutionMode.LOCAL);
+                    context.computeAndSetTypeEnvironmentForOperator(topSelectOp);
+                    OperatorManipulationUtil.substituteOpInInput(lastAfterJoinOp, joinOp,
+                            new MutableObject<>(topSelectOp));
                     context.computeAndSetTypeEnvironmentForOperator(lastAfterJoinOp);
                     return true;
                 }
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/array-index/join-quantified-queries/use-case-5/query1.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/array-index/join-quantified-queries/use-case-5/query1.sqlpp
new file mode 100644
index 0000000000..80b49782e7
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/array-index/join-quantified-queries/use-case-5/query1.sqlpp
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+SET `compiler.arrayindex` "true";
+
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
+
+CREATE TYPE testType AS {
+    id: int
+};
+
+CREATE DATASET D1(testType) PRIMARY KEY id;
+CREATE DATASET D2(testType) PRIMARY KEY id;
+
+CREATE INDEX idx_fv ON D1(UNNEST forecast SELECT fv : string) EXCLUDE UNKNOWN KEY;
+
+SELECT
+    D2.date,
+    D2.id,
+    D1.forecast
+FROM D2
+JOIN D1
+    ON D1.x = D2.id
+    WHERE (ANY ff IN D1.forecast SATISFIES ff.fv /*+ indexnl */ = (D2.date || "03") END )
+LIMIT 10;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/array-index/join-quantified-queries/use-case-5/query2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/array-index/join-quantified-queries/use-case-5/query2.sqlpp
new file mode 100644
index 0000000000..31f8b1d78a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/array-index/join-quantified-queries/use-case-5/query2.sqlpp
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+SET `compiler.arrayindex` "true";
+
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
+
+CREATE TYPE testType AS {
+    id: int
+};
+
+CREATE DATASET D1(testType) PRIMARY KEY id;
+CREATE DATASET D2(testType) PRIMARY KEY id;
+
+CREATE INDEX idx_fv ON D1(UNNEST forecast SELECT fv : string) EXCLUDE UNKNOWN KEY;
+
+SELECT
+    D2.date,
+    D2.id,
+    D1.forecast
+FROM D2
+JOIN D1
+    ON D1.id = D2.id
+    WHERE (ANY ff IN D1.forecast SATISFIES ff.fv /*+ indexnl */ = (D2.date || "03") END )
+LIMIT 10;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/atomic-and-array-queries/query8.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/atomic-and-array-queries/query8.plan
index 9cb42fc30a..f92f23bec3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/atomic-and-array-queries/query8.plan
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/atomic-and-array-queries/query8.plan
@@ -13,61 +13,65 @@ distribute result [$$54]
             project ([$$D2, $$D1, $$47])
             -- STREAM_PROJECT  |PARTITIONED|
               subplan {
-                        aggregate [$$47] <- [non-empty-stream()]
+                        aggregate [$$47] <- [non-empty-stream()] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                         -- AGGREGATE  |LOCAL|
-                          select (and(eq($$66, to-bigint($$67)), eq($$64, to-bigint($$65))))
+                          select (and(eq($$66, to-bigint($$67)), eq($$64, to-bigint($$65)))) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                           -- STREAM_SELECT  |LOCAL|
-                            assign [$$66, $$64] <- [$$D1I.getField("field2"), $$D1I.getField("field3")]
+                            assign [$$66, $$64] <- [$$D1I.getField("field2"), $$D1I.getField("field3")] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                             -- ASSIGN  |LOCAL|
-                              unnest $$D1I <- scan-collection($$63)
+                              unnest $$D1I <- scan-collection($$63) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                               -- UNNEST  |LOCAL|
-                                nested tuple source
+                                nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                      }
               -- SUBPLAN  |PARTITIONED|
-                assign [$$63] <- [$$D1.getField("items")]
-                -- ASSIGN  |PARTITIONED|
-                  project ([$$D2, $$67, $$65, $$D1])
-                  -- STREAM_PROJECT  |PARTITIONED|
-                    exchange
-                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      unnest-map [$$56, $$D1] <- index-search("Dataset1", 0, "TestDataverse", "Dataset1", true, false, 1, $$74, 1, $$74, true, true, true)
-                      -- BTREE_SEARCH  |PARTITIONED|
+                project ([$$D2, $$D1, $$67, $$65, $$63])
+                -- STREAM_PROJECT  |PARTITIONED|
+                  select (and(eq($$D1.getField("field4"), $$60), eq($$D1.getField("field1"), $$58)))
+                  -- STREAM_SELECT  |PARTITIONED|
+                    assign [$$63] <- [$$D1.getField("items")]
+                    -- ASSIGN  |PARTITIONED|
+                      project ([$$D2, $$67, $$65, $$60, $$58, $$D1])
+                      -- STREAM_PROJECT  |PARTITIONED|
                         exchange
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                          project ([$$74, $$D2, $$67, $$65])
-                          -- STREAM_PROJECT  |PARTITIONED|
+                          unnest-map [$$56, $$D1] <- index-search("Dataset1", 0, "TestDataverse", "Dataset1", true, false, 1, $$74, 1, $$74, true, true, true)
+                          -- BTREE_SEARCH  |PARTITIONED|
                             exchange
                             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                              distinct ([$$74, $$75])
-                              -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
+                              project ([$$74, $$D2, $$67, $$65, $$60, $$58])
+                              -- STREAM_PROJECT  |PARTITIONED|
                                 exchange
                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                  order (ASC, $$74) (ASC, $$75)
-                                  -- STABLE_SORT [$$74(ASC), $$75(ASC)]  |PARTITIONED|
+                                  distinct ([$$74, $$75])
+                                  -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
                                     exchange
                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                      project ([$$D2, $$67, $$65, $$74, $$75])
-                                      -- STREAM_PROJECT  |PARTITIONED|
+                                      order (ASC, $$74) (ASC, $$75)
+                                      -- STABLE_SORT [$$74(ASC), $$75(ASC)]  |PARTITIONED|
                                         exchange
                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                          unnest-map [$$70, $$71, $$72, $$73, $$74] <- index-search("d1Idx", 0, "TestDataverse", "Dataset1", true, true, 4, $$58, $$68, $$69, $$60, 4, $$58, $$68, $$69, $$60, true, true, true)
-                                          -- BTREE_SEARCH  |PARTITIONED|
+                                          project ([$$D2, $$67, $$65, $$60, $$58, $$74, $$75])
+                                          -- STREAM_PROJECT  |PARTITIONED|
                                             exchange
-                                            -- BROADCAST_EXCHANGE  |PARTITIONED|
-                                              running-aggregate [$$75] <- [create-query-uid()]
-                                              -- RUNNING_AGGREGATE  |PARTITIONED|
-                                                assign [$$69, $$68] <- [to-bigint($$65), to-bigint($$67)]
-                                                -- ASSIGN  |PARTITIONED|
-                                                  assign [$$60, $$58, $$67, $$65] <- [to-bigint($$D2.getField("field4")), to-bigint($$D2.getField("field1")), $$D2.getField("field2"), $$D2.getField("field3")]
-                                                  -- ASSIGN  |PARTITIONED|
-                                                    project ([$$D2])
-                                                    -- STREAM_PROJECT  |PARTITIONED|
-                                                      exchange
-                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                        data-scan []<-[$$55, $$D2] <- TestDataverse.Dataset2
-                                                        -- DATASOURCE_SCAN  |PARTITIONED|
+                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                              unnest-map [$$70, $$71, $$72, $$73, $$74] <- index-search("d1Idx", 0, "TestDataverse", "Dataset1", true, true, 4, $$58, $$68, $$69, $$60, 4, $$58, $$68, $$69, $$60, true, true, true)
+                                              -- BTREE_SEARCH  |PARTITIONED|
+                                                exchange
+                                                -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                  running-aggregate [$$75] <- [create-query-uid()]
+                                                  -- RUNNING_AGGREGATE  |PARTITIONED|
+                                                    assign [$$69, $$68] <- [to-bigint($$65), to-bigint($$67)]
+                                                    -- ASSIGN  |PARTITIONED|
+                                                      assign [$$60, $$58, $$67, $$65] <- [to-bigint($$D2.getField("field4")), to-bigint($$D2.getField("field1")), $$D2.getField("field2"), $$D2.getField("field3")]
+                                                      -- ASSIGN  |PARTITIONED|
+                                                        project ([$$D2])
+                                                        -- STREAM_PROJECT  |PARTITIONED|
                                                           exchange
                                                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            empty-tuple-source
-                                                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                            data-scan []<-[$$55, $$D2] <- TestDataverse.Dataset2
+                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                              exchange
+                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                empty-tuple-source
+                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/atomic-and-array-queries/query9.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/atomic-and-array-queries/query9.plan
index e39301760c..33b94dffc7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/atomic-and-array-queries/query9.plan
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/atomic-and-array-queries/query9.plan
@@ -13,76 +13,80 @@ distribute result [$$75]
             project ([$$D2, $$D1, $$68])
             -- STREAM_PROJECT  |PARTITIONED|
               subplan {
-                        aggregate [$$68] <- [non-empty-stream()]
+                        aggregate [$$68] <- [non-empty-stream()] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                         -- AGGREGATE  |LOCAL|
-                          select ($$66)
+                          select ($$66) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                           -- STREAM_SELECT  |LOCAL|
                             subplan {
-                                      aggregate [$$66] <- [non-empty-stream()]
+                                      aggregate [$$66] <- [non-empty-stream()] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                                       -- AGGREGATE  |LOCAL|
-                                        select (and(eq($$92, to-bigint($$93)), eq($$90, to-bigint($$91)), eq($$88, to-bigint($$89))))
+                                        select (and(eq($$92, to-bigint($$93)), eq($$90, to-bigint($$91)), eq($$88, to-bigint($$89)))) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                                         -- STREAM_SELECT  |LOCAL|
-                                          assign [$$92, $$90, $$88] <- [$$DII.getField("field2"), $$DII.getField("field3"), $$DII.getField("field3_notindexed")]
+                                          assign [$$92, $$90, $$88] <- [$$DII.getField("field2"), $$DII.getField("field3"), $$DII.getField("field3_notindexed")] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                                           -- ASSIGN  |LOCAL|
-                                            unnest $$DII <- scan-collection($$87)
+                                            unnest $$DII <- scan-collection($$87) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                                             -- UNNEST  |LOCAL|
-                                              nested tuple source
+                                              nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                                               -- NESTED_TUPLE_SOURCE  |LOCAL|
-                                   }
+                                   } [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                             -- SUBPLAN  |LOCAL|
-                              select (eq($$85, to-bigint($$86)))
+                              select (eq($$85, to-bigint($$86))) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                               -- STREAM_SELECT  |LOCAL|
-                                assign [$$87, $$85] <- [$$DOI.getField("inner_items"), $$DOI.getField("field2_notindexed")]
+                                assign [$$87, $$85] <- [$$DOI.getField("inner_items"), $$DOI.getField("field2_notindexed")] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                                 -- ASSIGN  |LOCAL|
-                                  unnest $$DOI <- scan-collection($$84)
+                                  unnest $$DOI <- scan-collection($$84) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                                   -- UNNEST  |LOCAL|
-                                    nested tuple source
+                                    nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
                                     -- NESTED_TUPLE_SOURCE  |LOCAL|
                      }
               -- SUBPLAN  |PARTITIONED|
-                assign [$$84] <- [$$D1.getField("outer_items")]
-                -- ASSIGN  |PARTITIONED|
-                  project ([$$D2, $$93, $$91, $$89, $$86, $$D1])
-                  -- STREAM_PROJECT  |PARTITIONED|
-                    exchange
-                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      unnest-map [$$77, $$D1] <- index-search("Dataset1", 0, "TestDataverse", "Dataset1", true, false, 1, $$104, 1, $$104, true, true, true)
-                      -- BTREE_SEARCH  |PARTITIONED|
+                project ([$$D2, $$D1, $$93, $$91, $$89, $$86, $$84])
+                -- STREAM_PROJECT  |PARTITIONED|
+                  select (and(eq($$D1.getField("field4"), $$81), eq($$D1.getField("field1"), $$79)))
+                  -- STREAM_SELECT  |PARTITIONED|
+                    assign [$$84] <- [$$D1.getField("outer_items")]
+                    -- ASSIGN  |PARTITIONED|
+                      project ([$$D2, $$93, $$91, $$89, $$86, $$81, $$79, $$D1])
+                      -- STREAM_PROJECT  |PARTITIONED|
                         exchange
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                          project ([$$104, $$D2, $$93, $$91, $$89, $$86])
-                          -- STREAM_PROJECT  |PARTITIONED|
+                          unnest-map [$$77, $$D1] <- index-search("Dataset1", 0, "TestDataverse", "Dataset1", true, false, 1, $$104, 1, $$104, true, true, true)
+                          -- BTREE_SEARCH  |PARTITIONED|
                             exchange
                             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                              distinct ([$$104, $$105])
-                              -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
+                              project ([$$104, $$D2, $$93, $$91, $$89, $$86, $$81, $$79])
+                              -- STREAM_PROJECT  |PARTITIONED|
                                 exchange
                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                  order (ASC, $$104) (ASC, $$105)
-                                  -- STABLE_SORT [$$104(ASC), $$105(ASC)]  |PARTITIONED|
+                                  distinct ([$$104, $$105])
+                                  -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
                                     exchange
                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                      project ([$$D2, $$93, $$91, $$89, $$86, $$104, $$105])
-                                      -- STREAM_PROJECT  |PARTITIONED|
+                                      order (ASC, $$104) (ASC, $$105)
+                                      -- STABLE_SORT [$$104(ASC), $$105(ASC)]  |PARTITIONED|
                                         exchange
                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                          unnest-map [$$100, $$101, $$102, $$103, $$104] <- index-search("d1Idx", 0, "TestDataverse", "Dataset1", true, true, 4, $$79, $$96, $$97, $$81, 4, $$79, $$96, $$97, $$81, true, true, true)
-                                          -- BTREE_SEARCH  |PARTITIONED|
+                                          project ([$$D2, $$93, $$91, $$89, $$86, $$81, $$79, $$104, $$105])
+                                          -- STREAM_PROJECT  |PARTITIONED|
                                             exchange
-                                            -- BROADCAST_EXCHANGE  |PARTITIONED|
-                                              running-aggregate [$$105] <- [create-query-uid()]
-                                              -- RUNNING_AGGREGATE  |PARTITIONED|
-                                                assign [$$97, $$96] <- [to-bigint($$91), to-bigint($$93)]
-                                                -- ASSIGN  |PARTITIONED|
-                                                  assign [$$81, $$79, $$93, $$91, $$89, $$86] <- [to-bigint($$D2.getField("field4")), to-bigint($$D2.getField("field1")), $$D2.getField("field2"), $$D2.getField("field3"), $$D2.getField("field3_notindexed"), $$D2.getField("field2_notindexed")]
-                                                  -- ASSIGN  |PARTITIONED|
-                                                    project ([$$D2])
-                                                    -- STREAM_PROJECT  |PARTITIONED|
-                                                      exchange
-                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                        data-scan []<-[$$76, $$D2] <- TestDataverse.Dataset2
-                                                        -- DATASOURCE_SCAN  |PARTITIONED|
+                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                              unnest-map [$$100, $$101, $$102, $$103, $$104] <- index-search("d1Idx", 0, "TestDataverse", "Dataset1", true, true, 4, $$79, $$96, $$97, $$81, 4, $$79, $$96, $$97, $$81, true, true, true)
+                                              -- BTREE_SEARCH  |PARTITIONED|
+                                                exchange
+                                                -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                  running-aggregate [$$105] <- [create-query-uid()]
+                                                  -- RUNNING_AGGREGATE  |PARTITIONED|
+                                                    assign [$$97, $$96] <- [to-bigint($$91), to-bigint($$93)]
+                                                    -- ASSIGN  |PARTITIONED|
+                                                      assign [$$81, $$79, $$93, $$91, $$89, $$86] <- [to-bigint($$D2.getField("field4")), to-bigint($$D2.getField("field1")), $$D2.getField("field2"), $$D2.getField("field3"), $$D2.getField("field3_notindexed"), $$D2.getField("field2_notindexed")]
+                                                      -- ASSIGN  |PARTITIONED|
+                                                        project ([$$D2])
+                                                        -- STREAM_PROJECT  |PARTITIONED|
                                                           exchange
                                                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            empty-tuple-source
-                                                            -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                            data-scan []<-[$$76, $$D2] <- TestDataverse.Dataset2
+                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                              exchange
+                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                empty-tuple-source
+                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/join-quantified-queries/use-case-5/query1.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/join-quantified-queries/use-case-5/query1.plan
new file mode 100644
index 0000000000..15418ae8a8
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/join-quantified-queries/use-case-5/query1.plan
@@ -0,0 +1,81 @@
+distribute result [$$47]
+-- DISTRIBUTE_RESULT  |UNPARTITIONED|
+  exchange
+  -- ONE_TO_ONE_EXCHANGE  |UNPARTITIONED|
+    limit 10
+    -- STREAM_LIMIT  |UNPARTITIONED|
+      exchange
+      -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
+        project ([$$47])
+        -- STREAM_PROJECT  |PARTITIONED|
+          assign [$$47] <- [{"date": $$54, "id": $$49, "forecast": $$52}]
+          -- ASSIGN  |PARTITIONED|
+            limit 10
+            -- STREAM_LIMIT  |PARTITIONED|
+              project ([$$54, $$49, $$52])
+              -- STREAM_PROJECT  |PARTITIONED|
+                select ($$42)
+                -- STREAM_SELECT  |PARTITIONED|
+                  subplan {
+                            aggregate [$$42] <- [non-empty-stream()] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                            -- AGGREGATE  |LOCAL|
+                              select (eq($$53, string-concat(ordered-list-constructor($$54, "03")))) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                              -- STREAM_SELECT  |LOCAL|
+                                assign [$$53] <- [$$ff.getField("fv")] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                -- ASSIGN  |LOCAL|
+                                  unnest $$ff <- scan-collection($$52) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                  -- UNNEST  |LOCAL|
+                                    nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                    -- NESTED_TUPLE_SOURCE  |LOCAL|
+                         }
+                  -- SUBPLAN  |PARTITIONED|
+                    project ([$$54, $$49, $$52])
+                    -- STREAM_PROJECT  |PARTITIONED|
+                      select (eq($$D1.getField("x"), $$49))
+                      -- STREAM_SELECT  |PARTITIONED|
+                        assign [$$52] <- [$$D1.getField("forecast")]
+                        -- ASSIGN  |PARTITIONED|
+                          project ([$$54, $$49, $$D1])
+                          -- STREAM_PROJECT  |PARTITIONED|
+                            exchange
+                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                              unnest-map [$$50, $$D1] <- index-search("D1", 0, "test", "D1", true, false, 1, $$59, 1, $$59, true, true, true)
+                              -- BTREE_SEARCH  |PARTITIONED|
+                                exchange
+                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                  project ([$$59, $$54, $$49])
+                                  -- STREAM_PROJECT  |PARTITIONED|
+                                    exchange
+                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                      distinct ([$$59, $$60])
+                                      -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
+                                        exchange
+                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                          order (ASC, $$59) (ASC, $$60)
+                                          -- STABLE_SORT [$$59(ASC), $$60(ASC)]  |PARTITIONED|
+                                            exchange
+                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                              project ([$$54, $$49, $$59, $$60])
+                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                exchange
+                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                  unnest-map [$$58, $$59] <- index-search("idx_fv", 0, "test", "D1", true, true, 1, $$57, 1, $$57, true, true, true)
+                                                  -- BTREE_SEARCH  |PARTITIONED|
+                                                    exchange
+                                                    -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                      running-aggregate [$$60] <- [create-query-uid()]
+                                                      -- RUNNING_AGGREGATE  |PARTITIONED|
+                                                        assign [$$57] <- [string-concat(ordered-list-constructor($$54, "03"))]
+                                                        -- ASSIGN  |PARTITIONED|
+                                                          project ([$$49, $$54])
+                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                            assign [$$54] <- [$$D2.getField("date")]
+                                                            -- ASSIGN  |PARTITIONED|
+                                                              exchange
+                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                data-scan []<-[$$49, $$D2] <- test.D2
+                                                                -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                  exchange
+                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                    empty-tuple-source
+                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/join-quantified-queries/use-case-5/query2.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/join-quantified-queries/use-case-5/query2.plan
new file mode 100644
index 0000000000..74d4398c69
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/array-index/join-quantified-queries/use-case-5/query2.plan
@@ -0,0 +1,83 @@
+distribute result [$$47]
+-- DISTRIBUTE_RESULT  |UNPARTITIONED|
+  exchange
+  -- ONE_TO_ONE_EXCHANGE  |UNPARTITIONED|
+    limit 10
+    -- STREAM_LIMIT  |UNPARTITIONED|
+      exchange
+      -- RANDOM_MERGE_EXCHANGE  |PARTITIONED|
+        project ([$$47])
+        -- STREAM_PROJECT  |PARTITIONED|
+          assign [$$47] <- [{"date": $$54, "id": $$49, "forecast": $$52}]
+          -- ASSIGN  |PARTITIONED|
+            limit 10
+            -- STREAM_LIMIT  |PARTITIONED|
+              project ([$$54, $$49, $$52])
+              -- STREAM_PROJECT  |PARTITIONED|
+                select ($$42)
+                -- STREAM_SELECT  |PARTITIONED|
+                  subplan {
+                            aggregate [$$42] <- [non-empty-stream()] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                            -- AGGREGATE  |LOCAL|
+                              select (eq($$53, string-concat(ordered-list-constructor($$54, "03")))) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                              -- STREAM_SELECT  |LOCAL|
+                                assign [$$53] <- [$$ff.getField("fv")] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                -- ASSIGN  |LOCAL|
+                                  unnest $$ff <- scan-collection($$52) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                  -- UNNEST  |LOCAL|
+                                    nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                    -- NESTED_TUPLE_SOURCE  |LOCAL|
+                         }
+                  -- SUBPLAN  |PARTITIONED|
+                    project ([$$54, $$49, $$52])
+                    -- STREAM_PROJECT  |PARTITIONED|
+                      assign [$$52] <- [$$D1.getField("forecast")]
+                      -- ASSIGN  |PARTITIONED|
+                        project ([$$54, $$49, $$D1])
+                        -- STREAM_PROJECT  |PARTITIONED|
+                          select (eq($$50, $$49))
+                          -- STREAM_SELECT  |PARTITIONED|
+                            project ([$$54, $$49, $$50, $$D1])
+                            -- STREAM_PROJECT  |PARTITIONED|
+                              exchange
+                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                unnest-map [$$50, $$D1] <- index-search("D1", 0, "test", "D1", true, false, 1, $$59, 1, $$59, true, true, true)
+                                -- BTREE_SEARCH  |PARTITIONED|
+                                  exchange
+                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                    project ([$$59, $$54, $$49])
+                                    -- STREAM_PROJECT  |PARTITIONED|
+                                      exchange
+                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                        distinct ([$$59, $$60])
+                                        -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
+                                          exchange
+                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                            order (ASC, $$59) (ASC, $$60)
+                                            -- STABLE_SORT [$$59(ASC), $$60(ASC)]  |PARTITIONED|
+                                              exchange
+                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                project ([$$54, $$49, $$59, $$60])
+                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                  exchange
+                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                    unnest-map [$$58, $$59] <- index-search("idx_fv", 0, "test", "D1", true, true, 1, $$57, 1, $$57, true, true, true)
+                                                    -- BTREE_SEARCH  |PARTITIONED|
+                                                      exchange
+                                                      -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                        running-aggregate [$$60] <- [create-query-uid()]
+                                                        -- RUNNING_AGGREGATE  |PARTITIONED|
+                                                          assign [$$57] <- [string-concat(ordered-list-constructor($$54, "03"))]
+                                                          -- ASSIGN  |PARTITIONED|
+                                                            project ([$$49, $$54])
+                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                              assign [$$54] <- [$$D2.getField("date")]
+                                                              -- ASSIGN  |PARTITIONED|
+                                                                exchange
+                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                  data-scan []<-[$$49, $$D2] <- test.D2
+                                                                  -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                    exchange
+                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                      empty-tuple-source
+                                                                      -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/array-index/join-quantified-queries/use-case-5/use-case-5.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/array-index/join-quantified-queries/use-case-5/use-case-5.1.ddl.sqlpp
new file mode 100644
index 0000000000..6dfa7a9f1c
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/array-index/join-quantified-queries/use-case-5/use-case-5.1.ddl.sqlpp
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
+
+CREATE TYPE testType AS {
+    id: int
+};
+
+CREATE DATASET D1(testType) PRIMARY KEY id;
+CREATE DATASET D2(testType) PRIMARY KEY id;
+
+CREATE INDEX idx_fv ON D1(UNNEST forecast SELECT fv : string) EXCLUDE UNKNOWN KEY;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/array-index/join-quantified-queries/use-case-5/use-case-5.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/array-index/join-quantified-queries/use-case-5/use-case-5.2.update.sqlpp
new file mode 100644
index 0000000000..3440b2f7a2
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/array-index/join-quantified-queries/use-case-5/use-case-5.2.update.sqlpp
@@ -0,0 +1,46 @@
+/*
+ * 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;
+
+insert into D1 [
+      {
+      "id":1,
+      "forecast": [{
+        "fv":"1003"
+      }]
+    },
+    {
+      "id":2,
+      "forecast": [{
+        "fv":"2003"
+      }]
+    }
+];
+
+insert into D2 [
+    {
+      "id":1,
+      "date":"10"
+    },
+    {
+      "id":2,
+      "date":"20"
+    }
+];
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/array-index/join-quantified-queries/use-case-5/use-case-5.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/array-index/join-quantified-queries/use-case-5/use-case-5.3.query.sqlpp
new file mode 100644
index 0000000000..8af320f0d1
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/array-index/join-quantified-queries/use-case-5/use-case-5.3.query.sqlpp
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+SET `compiler.arrayindex` "true";
+USE test;
+
+SELECT
+    D2.date,
+    D2.id,
+    D1.forecast
+FROM D2
+JOIN D1
+    ON D1.x = D2.id
+    WHERE (ANY ff IN D1.forecast SATISFIES ff.fv /*+ indexnl */ = (D2.date || "03") END )
+LIMIT 10;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/array-index/join-quantified-queries/use-case-5/use-case-5.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/array-index/join-quantified-queries/use-case-5/use-case-5.4.query.sqlpp
new file mode 100644
index 0000000000..2e74ab0e0a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/array-index/join-quantified-queries/use-case-5/use-case-5.4.query.sqlpp
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+SET `compiler.arrayindex` "true";
+USE test;
+
+SELECT
+    D2.date,
+    D2.id,
+    D1.forecast
+FROM D2
+JOIN D1
+    ON D1.id = D2.id
+    WHERE (ANY ff IN D1.forecast SATISFIES ff.fv /*+ indexnl */ = (D2.date || "03") END )
+LIMIT 10;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/array-index/join-quantified-queries/use-case-5/use-case-5.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/array-index/join-quantified-queries/use-case-5/use-case-5.3.adm
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/array-index/join-quantified-queries/use-case-5/use-case-5.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/array-index/join-quantified-queries/use-case-5/use-case-5.4.adm
new file mode 100644
index 0000000000..05d1e05f35
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/array-index/join-quantified-queries/use-case-5/use-case-5.4.adm
@@ -0,0 +1,2 @@
+{ "id": 1, "date": "10", "forecast": [ { "fv": "1003" } ] }
+{ "id": 2, "date": "20", "forecast": [ { "fv": "2003" } ] }
\ No newline at end of file


(asterixdb) 03/22: Merge branch 'trinity' into 'morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 426ad651c671ff051d683f81e9df1010115420fd
Merge: 1c13adc42c bd0e9b44a2
Author: Peeyush Gupta <pe...@couchbase.com>
AuthorDate: Mon Nov 24 11:38:31 2025 -0800

    Merge branch 'trinity' into 'morpheus'
    
    Ext-ref: MB-69372
    Change-Id: I4c8b1e786e6037770b44938db8087ee42f531d02

 .../rules/am/IntroduceJoinAccessMethodRule.java    | 15 +++-
 .../use-case-5/query1.sqlpp                        | 42 ++++++++++
 .../use-case-5/query2.sqlpp                        | 42 ++++++++++
 .../atomic-and-array-queries/query8.plan           | 80 +++++++++---------
 .../atomic-and-array-queries/query9.plan           | 94 +++++++++++-----------
 .../join-quantified-queries/use-case-5/query1.plan | 81 +++++++++++++++++++
 .../join-quantified-queries/use-case-5/query2.plan | 83 +++++++++++++++++++
 .../use-case-5/use-case-5.1.ddl.sqlpp              | 31 +++++++
 .../use-case-5/use-case-5.2.update.sqlpp           | 46 +++++++++++
 .../use-case-5/use-case-5.3.query.sqlpp            | 30 +++++++
 .../use-case-5/use-case-5.4.query.sqlpp            | 30 +++++++
 .../use-case-5/use-case-5.3.adm                    |  0
 .../use-case-5/use-case-5.4.adm                    |  2 +
 13 files changed, 492 insertions(+), 84 deletions(-)


(asterixdb) 06/22: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 785239ab6a07206674ed8e9561adafa1df68af3f
Merge: 426ad651c6 d66c907a92
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Tue Dec 9 09:33:48 2025 -0500

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [ASTERIXDB-3451][STO] Avoid unlocking twice when pin fails (MB-69637)
    
    Ext-ref: MB-69637
    Change-Id: If51c983d73ce1875580cc4ad8f0abc491b776b6a

 .../java/org/apache/hyracks/storage/am/btree/impls/DiskBTree.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


(asterixdb) 16/22: [NO ISSUE][*DB][EXT] Advance msgpack-core to 0.9.11

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit fce80c4500f01d0e92df2e083e883d216ed94468
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Jan 9 20:27:28 2026 -0500

    [NO ISSUE][*DB][EXT] Advance msgpack-core to 0.9.11
    
    Ext-ref: MB-70074
    Change-Id: I339c2345e5a30c47b981f4942676b76cb7644afc
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20784
    Reviewed-by: Michael Blow <mb...@apache.org>
    Tested-by: Michael Blow <mb...@apache.org>
---
 asterixdb/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 38dc089989..76b0b3275a 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -1696,7 +1696,7 @@
       <dependency>
         <groupId>org.msgpack</groupId>
         <artifactId>msgpack-core</artifactId>
-        <version>0.8.20</version>
+        <version>0.9.11</version>
       </dependency>
       <dependency>
         <groupId>org.apache.parquet</groupId>


(asterixdb) 11/22: [ASTERIXDB-3682][COMP] Push extracted assign to join branch

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit e19235751d9d21288d385b2a3b52f22f6239239e
Author: Ali Alsuliman <al...@gmail.com>
AuthorDate: Tue Jan 6 18:48:44 2026 -0800

    [ASTERIXDB-3682][COMP] Push extracted assign to join branch
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Details:
    When extracting a field access from an operator into
    an assign operator, ensure the assign operator is placed
    into the right branch in case of a join operator.
    
    Ext-ref: MB-69958
    
    Change-Id: I74452d71423610ca2a34631235f5da8325e3b625
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20767
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Preetham Poluparthi <pr...@apache.org>
---
 .../rules/ByNameToByIndexFieldAccessRule.java      |  65 +++-
 .../optimizer/rules/LoadRecordFieldsRule.java      |  54 ++--
 .../ASTERIXDB-3682-field-access-in-join.sqlpp      | 107 +++++++
 .../ASTERIXDB-3682-field-access-in-join.plan       | 348 +++++++++++++++++++++
 4 files changed, 535 insertions(+), 39 deletions(-)

diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByIndexFieldAccessRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByIndexFieldAccessRule.java
index abc434f3f1..e4bcbd8937 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByIndexFieldAccessRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByIndexFieldAccessRule.java
@@ -21,6 +21,8 @@ package org.apache.asterix.optimizer.rules;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.asterix.algebra.base.OperatorAnnotation;
 import org.apache.asterix.om.base.AInt32;
@@ -45,6 +47,7 @@ import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvir
 import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression;
 import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
 import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
 import org.apache.hyracks.api.exceptions.SourceLocation;
 
@@ -85,20 +88,54 @@ public class ByNameToByIndexFieldAccessRule implements IAlgebraicRewriteRule {
         if (fce.getFunctionIdentifier() != BuiltinFunctions.FIELD_ACCESS_BY_NAME) {
             return changed;
         }
-        changed |= extractFirstArg(fce, op, context);
-        IVariableTypeEnvironment env = context.getOutputTypeEnvironment(op.getInputs().get(0).getValue());
-        IAType t = (IAType) env.getType(fce.getArguments().get(0).getValue());
-        changed |= rewriteFieldAccess(exprRef, fce, TypeComputeUtils.getActualType(t));
+        int k = extractFirstArg(fce, op, context);
+        changed |= k >= 0;
+        if (k < 0) {
+            if (op.getInputs().size() > 1) {
+                context.computeAndSetTypeEnvironmentForOperator(op);
+                changed |= rewriteFieldAccessUsing(op, exprRef, context, fce);
+                return changed;
+            }
+            k = 0;
+        }
+        changed |= rewriteFieldAccessUsing(op.getInputs().get(k).getValue(), exprRef, context, fce);
         return changed;
     }
 
-    // Extracts the first argument of a field-access expression into an separate assign operator.
-    private boolean extractFirstArg(AbstractFunctionCallExpression fce, ILogicalOperator op,
+    // Extracts the first argument of a field-access expression into a separate assign operator.
+    private static int extractFirstArg(AbstractFunctionCallExpression fce, ILogicalOperator op,
             IOptimizationContext context) throws AlgebricksException {
         ILogicalExpression firstArg = fce.getArguments().get(0).getValue();
         if (firstArg.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
-            return false;
+            return -1;
+        }
+        if (op.getInputs().size() > 1) {
+            return extractToBranch(fce, op, context, firstArg);
         }
+        extractToAssignOp(fce, op.getInputs().get(0), context, firstArg);
+        return 0;
+    }
+
+    private static int extractToBranch(AbstractFunctionCallExpression fce, ILogicalOperator op,
+            IOptimizationContext ctx, ILogicalExpression firstArg) throws AlgebricksException {
+        Set<LogicalVariable> usedByExpr = new HashSet<>();
+        Set<LogicalVariable> inputLiveVars = new HashSet<>();
+        fce.getUsedVariables(usedByExpr);
+        int i = 0;
+        for (Mutable<ILogicalOperator> input : op.getInputs()) {
+            inputLiveVars.clear();
+            VariableUtilities.getLiveVariables(input.getValue(), inputLiveVars);
+            if (inputLiveVars.containsAll(usedByExpr)) {
+                extractToAssignOp(fce, input, ctx, firstArg);
+                return i;
+            }
+            i++;
+        }
+        return -1;
+    }
+
+    private static void extractToAssignOp(AbstractFunctionCallExpression fce, Mutable<ILogicalOperator> op,
+            IOptimizationContext context, ILogicalExpression firstArg) throws AlgebricksException {
         SourceLocation sourceLoc = firstArg.getSourceLocation();
         LogicalVariable var1 = context.newVar();
         AssignOperator assignOp = new AssignOperator(new ArrayList<>(Collections.singletonList(var1)),
@@ -107,14 +144,20 @@ public class ByNameToByIndexFieldAccessRule implements IAlgebraicRewriteRule {
         VariableReferenceExpression var1Ref = new VariableReferenceExpression(var1);
         var1Ref.setSourceLocation(sourceLoc);
         fce.getArguments().get(0).setValue(var1Ref);
-        assignOp.getInputs().add(new MutableObject<>(op.getInputs().get(0).getValue()));
-        op.getInputs().get(0).setValue(assignOp);
+        assignOp.getInputs().add(new MutableObject<>(op.getValue()));
+        op.setValue(assignOp);
         context.computeAndSetTypeEnvironmentForOperator(assignOp);
-        return true;
+    }
+
+    private static boolean rewriteFieldAccessUsing(ILogicalOperator op, Mutable<ILogicalExpression> exprRef,
+            IOptimizationContext ctx, AbstractFunctionCallExpression fce) throws AlgebricksException {
+        IVariableTypeEnvironment env = ctx.getOutputTypeEnvironment(op);
+        IAType t = (IAType) env.getType(fce.getArguments().get(0).getValue());
+        return rewriteFieldAccess(exprRef, fce, TypeComputeUtils.getActualType(t));
     }
 
     // Rewrites field-access-by-name into field-access-by-index if possible.
-    private boolean rewriteFieldAccess(Mutable<ILogicalExpression> exprRef, AbstractFunctionCallExpression fce,
+    private static boolean rewriteFieldAccess(Mutable<ILogicalExpression> exprRef, AbstractFunctionCallExpression fce,
             IAType t) {
         if (t.getTypeTag() != ATypeTag.OBJECT) {
             return false;
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/LoadRecordFieldsRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/LoadRecordFieldsRule.java
index 42cce5233e..b361ee140c 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/LoadRecordFieldsRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/LoadRecordFieldsRule.java
@@ -21,12 +21,10 @@ package org.apache.asterix.optimizer.rules;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.asterix.algebra.base.OperatorAnnotation;
-import org.apache.asterix.common.exceptions.CompilationException;
-import org.apache.asterix.common.exceptions.ErrorCode;
 import org.apache.asterix.lang.common.util.FunctionUtil;
 import org.apache.asterix.om.base.AInt32;
 import org.apache.asterix.om.base.AString;
@@ -96,8 +94,7 @@ public class LoadRecordFieldsRule implements IAlgebraicRewriteRule {
             context.addToDontApplySet(this, op1);
         }
         if (res && op1.getOperatorTag() == LogicalOperatorTag.SELECT) {
-            // checking if we can annotate a Selection as using just one field
-            // access
+            // checking if we can annotate a Selection as using just one field access
             SelectOperator sigma = (SelectOperator) op1;
             List<LogicalVariable> vars = new ArrayList<>();
             VariableUtilities.getUsedVariables(sigma, vars);
@@ -107,8 +104,7 @@ public class LoadRecordFieldsRule implements IAlgebraicRewriteRule {
                 ILogicalExpression expr1 = getFirstExpr(assign1);
                 if (FunctionUtil.isFieldAccessFunction(expr1)) {
                     AbstractFunctionCallExpression f = (AbstractFunctionCallExpression) expr1;
-                    // f should be a call to a field/data access kind of
-                    // function
+                    // f should be a call to a field/data access kind of function
                     sigma.getAnnotations().put(OperatorAnnotation.FIELD_ACCESS, f.getArguments().get(0));
                 }
             }
@@ -144,7 +140,9 @@ public class LoadRecordFieldsRule implements IAlgebraicRewriteRule {
                     LogicalVariable v = context.newVar();
                     AssignOperator a2 = new AssignOperator(v, new MutableObject<>(f));
                     a2.setSourceLocation(expr.getSourceLocation());
-                    pushFieldAssign(a2, topOp, context);
+                    if (!pushFieldAssign(a2, topOp, context)) {
+                        return false;
+                    }
                     context.computeAndSetTypeEnvironmentForOperator(a2);
                     ILogicalExpression arg = f.getArguments().get(0).getValue();
                     if (arg.getExpressionTag() == LogicalExpressionTag.VARIABLE) {
@@ -183,59 +181,59 @@ public class LoadRecordFieldsRule implements IAlgebraicRewriteRule {
         }
     }
 
-    private static void pushFieldAssign(AssignOperator a2, AbstractLogicalOperator topOp, IOptimizationContext context)
-            throws AlgebricksException {
+    private static boolean pushFieldAssign(AssignOperator a2, AbstractLogicalOperator topOp,
+            IOptimizationContext context) throws AlgebricksException {
         if (topOp.getInputs().size() == 1 && !topOp.hasNestedPlans()) {
             Mutable<ILogicalOperator> topChild = topOp.getInputs().get(0);
-            // plugAccessAboveOp(a2, topChild, context);
             List<Mutable<ILogicalOperator>> a2InptList = a2.getInputs();
-            a2InptList.clear();
             a2InptList.add(topChild);
             // and link it as child in the op. tree
             topOp.getInputs().set(0, new MutableObject<>(a2));
             findAndEliminateRedundantFieldAccess(a2, context);
+            return true;
         } else { // e.g., a join
-            LinkedList<LogicalVariable> usedInAccess = new LinkedList<LogicalVariable>();
+            Set<LogicalVariable> usedInAccess = new HashSet<>();
             VariableUtilities.getUsedVariables(a2, usedInAccess);
 
-            LinkedList<LogicalVariable> produced2 = new LinkedList<LogicalVariable>();
+            Set<LogicalVariable> produced2 = new HashSet<>();
             VariableUtilities.getProducedVariables(topOp, produced2);
 
             if (OperatorPropertiesUtil.disjoint(produced2, usedInAccess)) {
+                Set<LogicalVariable> inputLiveVars = new HashSet<>();
                 for (Mutable<ILogicalOperator> inp : topOp.getInputs()) {
-                    HashSet<LogicalVariable> v2 = new HashSet<LogicalVariable>();
-                    VariableUtilities.getLiveVariables(inp.getValue(), v2);
-                    if (!OperatorPropertiesUtil.disjoint(usedInAccess, v2)) {
-                        pushAccessAboveOpRef(a2, inp, context);
-                        return;
+                    inputLiveVars.clear();
+                    VariableUtilities.getLiveVariables(inp.getValue(), inputLiveVars);
+                    // push the assign to the correct branch that contains all the used vars
+                    if (inputLiveVars.containsAll(usedInAccess)) {
+                        pushAccessThroughOp(a2, inp, context);
+                        return true;
                     }
                 }
                 if (topOp.hasNestedPlans()) {
                     AbstractOperatorWithNestedPlans nestedOp = (AbstractOperatorWithNestedPlans) topOp;
                     for (ILogicalPlan plan : nestedOp.getNestedPlans()) {
                         for (Mutable<ILogicalOperator> root : plan.getRoots()) {
-                            HashSet<LogicalVariable> v2 = new HashSet<LogicalVariable>();
-                            VariableUtilities.getLiveVariables(root.getValue(), v2);
-                            if (!OperatorPropertiesUtil.disjoint(usedInAccess, v2)) {
-                                pushAccessAboveOpRef(a2, root, context);
-                                return;
+                            inputLiveVars.clear();
+                            VariableUtilities.getLiveVariables(root.getValue(), inputLiveVars);
+                            if (inputLiveVars.containsAll(usedInAccess)) {
+                                pushAccessThroughOp(a2, root, context);
+                                return true;
                             }
                         }
                     }
                 }
-                throw new CompilationException(ErrorCode.COMPILATION_ERROR, a2.getSourceLocation(),
-                        "Field access " + getFirstExpr(a2) + " does not correspond to any input");
             }
         }
+        return false;
     }
 
     /**
-     * Pushes one field-access assignment above toPushThroughChildRef
+     * Pushes one field-access assignment through toPushThroughChildRef
      *
      * @param toPush
      * @param toPushThroughChildRef
      */
-    private static void pushAccessAboveOpRef(AssignOperator toPush, Mutable<ILogicalOperator> toPushThroughChildRef,
+    private static void pushAccessThroughOp(AssignOperator toPush, Mutable<ILogicalOperator> toPushThroughChildRef,
             IOptimizationContext context) throws AlgebricksException {
         List<Mutable<ILogicalOperator>> tpInpList = toPush.getInputs();
         tpInpList.clear();
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/ASTERIXDB-3682-field-access-in-join.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/ASTERIXDB-3682-field-access-in-join.sqlpp
new file mode 100644
index 0000000000..221d35e3e0
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/ASTERIXDB-3682-field-access-in-join.sqlpp
@@ -0,0 +1,107 @@
+/*
+ * 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.
+ */
+
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
+
+CREATE TYPE OpenType AS {id: int};
+CREATE DATASET col1(OpenType) PRIMARY KEY id;
+CREATE DATASET col2(OpenType) PRIMARY KEY id;
+
+SELECT final_q.*
+FROM (
+SELECT subquery1.*,
+           subquery3.cKey AS lov_cKey,
+           subquery2.wsd,
+           subquery2.wsm,
+           subquery2.wsc,
+           subquery2.scKey,
+           subquery2.wpdi,
+           sbr.tohac.qaz AS bch,
+           sbr.tohac.omaa AS omaa,
+           UPPER(SUBSTR(sbr.tohac.qaz, 0, POS(sbr.tohac.qaz, '_'))) AS bco
+    FROM (SELECT join_key2,
+       s1.wsx1 AS lov13_wsx1,
+       s1.ikjhu AS lcd,
+       sataqw.name AS lov13_name,
+       s1.uunn AS lov13_uunn,
+       TO_STR(u_val.t0) AS lov13_t0_dd,
+       SUBSTR(TO_STR(u_val.t0),0,19) AS lov13_t0_ff
+FROM (
+  SELECT SUBSTR(b.qwer,0,7) AS wsx1,
+         SUBSTR(b.qwer,0,10) AS ikjhu,
+         b.uunn,
+         (
+           SELECT VALUE { "name": item.name, "val": (
+             SELECT VALUE { "marop": item2.marop, "t0": item2.t0 }
+             FROM item.`value` AS item2
+             WHERE item2.ua = 'iap'
+               AND item2.marop IS VALUED) }
+           FROM OBJECT_PAIRS(b.ihsaa) AS item
+           WHERE ANY v IN ["X", "Y" ] SATISFIES v = SPLIT(item.name," ")[0] END) AS ihsaa
+  FROM `col2` b
+  WHERE (b.`t` = "lovStat")
+    AND NOT (ARRAY_LENGTH(OBJECT_NAMES(b.ihsaa)) = 1
+      AND OBJECT_NAMES(b.ihsaa)[0] = "some_str")
+    AND (ANY item IN OBJECT_PAIRS(b.ihsaa) SATISFIES (SPLIT(item.name, " ")[0] IN [ "X", "Y" ])
+      AND (ANY item2 IN item.`value` SATISFIES (item2.ua = "iap"
+          AND item2.marop IS VALUED) END) END)) s1
+UNNEST s1.ihsaa sataqw
+UNNEST sataqw.val u_val
+LET join_key2 = SUBSTR(IFMISSINGORNULL(IFMISSINGORNULL(u_val.marop.someId1, u_val.marop.someId2), u_val.marop.someId3),0,38 )
+WHERE join_key2 IS NOT NULL
+  AND NOT sataqw.name IN [ 'p1', 'p2', 'p3']) subquery1
+        JOIN (
+        SELECT p1.cKey,
+               uniqueID
+        FROM (
+            SELECT p.cKey,
+       p.members[*].uniqueID
+FROM col1 p
+WHERE p.`t` = 'ccc'
+  AND p.`r` = 'uuu'
+  AND cKey IS NOT MISSING) p1
+        UNNEST p1.uniqueID uniqueID) subquery3 ON subquery3.uniqueID = subquery1.lov13_uunn
+        JOIN (
+        SELECT SUBSTR(p2.ed,0,38) AS join_key1,
+               p2.kat.coaed AS wpdi,
+               p2.kat.stchk AS wsc,
+               UPPER(SUBSTR(p2.kat.stchk, 0, POS(p2.kat.stchk, '_'))) AS scKey,
+               (SELECT VALUE item.wkps FROM p2.kat.intib AS item) AS wwlps,
+               SUBSTR(p2.kat.ssatt,0,10) AS wsd,
+               SUBSTR(p2.kat.ssatt,0,7) AS wsm
+        FROM col1 p2
+        WHERE p2.`t` = 'ak1'
+            AND p2.ha IN ['l1', 'l2']
+            AND p2.kat IS NOT MISSING
+            AND p2.kat.coaed IS NOT MISSING ) subquery2 ON subquery1.join_key2 = subquery2.join_key1
+        AND subquery3.cKey = subquery2.scKey
+        JOIN col1 sbr ON sbr.ed = subquery2.wpdi
+        AND sbr.tohac IS NOT MISSING ) final_q
+WHERE final_q.bco IS NOT MISSING
+    AND final_q.join_key2 LIKE '%'
+    AND final_q.wsc LIKE '%'
+    AND final_q.scKey LIKE '%'
+    AND final_q.bch LIKE '%'
+    AND final_q.bco LIKE '%'
+ORDER BY final_q.join_key2,
+         final_q.wsc,
+         final_q.lcd,
+         final_q.wsd;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/ASTERIXDB-3682-field-access-in-join.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/ASTERIXDB-3682-field-access-in-join.plan
new file mode 100644
index 0000000000..a44e1cb635
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/ASTERIXDB-3682-field-access-in-join.plan
@@ -0,0 +1,348 @@
+distribute result [$$446]
+-- DISTRIBUTE_RESULT  |PARTITIONED|
+  exchange
+  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+    project ([$$446])
+    -- STREAM_PROJECT  |PARTITIONED|
+      assign [$$446] <- [if-missing-or-null(to-object($$593), cast($$456))]
+      -- ASSIGN  |PARTITIONED|
+        project ([$$456, $$593])
+        -- STREAM_PROJECT  |PARTITIONED|
+          exchange
+          -- SORT_MERGE_EXCHANGE [$$529(ASC), $$530(ASC), $$531(ASC), $$532(ASC) ]  |PARTITIONED|
+            order (ASC, $$529) (ASC, $$530) (ASC, $$531) (ASC, $$532)
+            -- STABLE_SORT [$$529(ASC), $$530(ASC), $$531(ASC), $$532(ASC)]  |PARTITIONED|
+              exchange
+              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                assign [$$529, $$530, $$531, $$532] <- [$$593.getField("join_key2"), $$593.getField("wsc"), $$593.getField("lcd"), $$593.getField("wsd")]
+                -- ASSIGN  |PARTITIONED|
+                  project ([$$456, $$593])
+                  -- STREAM_PROJECT  |PARTITIONED|
+                    select (and(like($$455, "%"), not(is-missing($$455))))
+                    -- STREAM_SELECT  |PARTITIONED|
+                      project ([$$456, $$593, $$455])
+                      -- STREAM_PROJECT  |PARTITIONED|
+                        assign [$$593, $$455] <- [object-concat-strict(if-missing-or-null(to-object($$323), cast($$456)), {"lov_cKey": $$466, "wsd": $$603, "wsm": $$604, "wsc": $$513, "scKey": $$602, "wpdi": $$509, "bch": $$525, "omaa": $$526, "bco": uppercase(substring($$525, 0, position($$525, "_")))}), object-concat-strict(if-missing-or-null(to-object($$323), cast($$456)), {"lov_cKey": $$466, "wsd": $$388.getField(3), "wsm": $$388.getField(4), "wsc": $$513, "scKey": $$602, "wpdi": $$5 [...]
+                        -- ASSIGN  |PARTITIONED|
+                          select (and(like(object-concat-strict(if-missing-or-null(to-object($$323), cast($$456)), {"lov_cKey": $$466, "wsd": $$388.getField(3), "wsm": $$388.getField(4), "wsc": $$388.getField("wsc"), "scKey": $$602, "wpdi": $$509, "bch": $$525, "omaa": $$526, "bco": uppercase(substring($$525, 0, position($$525, "_")))}).getField("bch"), "%"), like(object-concat-strict(if-missing-or-null(to-object($$323), cast($$456)), {"lov_cKey": $$466, "wsd": $$388.getField(3), "wsm":  [...]
+                          -- STREAM_SELECT  |PARTITIONED|
+                            project ([$$323, $$466, $$603, $$604, $$513, $$602, $$509, $$388, $$456, $$525, $$526])
+                            -- STREAM_PROJECT  |PARTITIONED|
+                              exchange
+                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                join (eq($$476, $$509))
+                                -- HYBRID_HASH_JOIN [$$509][$$476]  |PARTITIONED|
+                                  exchange
+                                  -- HASH_PARTITION_EXCHANGE [$$509]  |PARTITIONED|
+                                    assign [$$456] <- [{  }]
+                                    -- ASSIGN  |PARTITIONED|
+                                      project ([$$323, $$466, $$603, $$604, $$513, $$602, $$509, $$388])
+                                      -- STREAM_PROJECT  |PARTITIONED|
+                                        exchange
+                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                          join (and(eq($$599, $$601), eq($$466, $$602)))
+                                          -- HYBRID_HASH_JOIN [$$599, $$466][$$601, $$602]  |PARTITIONED|
+                                            exchange
+                                            -- HASH_PARTITION_EXCHANGE [$$599, $$466]  |PARTITIONED|
+                                              project ([$$323, $$466, $$599])
+                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                exchange
+                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                  join (eq($$uniqueID, $$489))
+                                                  -- HYBRID_HASH_JOIN [$$489][$$uniqueID]  |PARTITIONED|
+                                                    exchange
+                                                    -- HASH_PARTITION_EXCHANGE [$$489]  |PARTITIONED|
+                                                      project ([$$323, $$599, $$489])
+                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                        assign [$$323] <- [{"join_key2": $$599, "lov13_wsx1": substring($$465, 0, 7), "lcd": substring($$465, 0, 10), "lov13_name": $$467, "lov13_uunn": $$489, "lov13_t0_dd": $$600, "lov13_t0_ff": substring($$600, 0, 19)}]
+                                                        -- ASSIGN  |PARTITIONED|
+                                                          project ([$$465, $$489, $$467, $$599, $$600])
+                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                            assign [$$600] <- [to-string($$u_val.getField("t0"))]
+                                                            -- ASSIGN  |PARTITIONED|
+                                                              select (not(is-null($$599)))
+                                                              -- STREAM_SELECT  |PARTITIONED|
+                                                                project ([$$465, $$489, $$467, $$u_val, $$599])
+                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                  assign [$$599] <- [substring(if-missing-or-null(if-missing-or-null($$461.getField("someId1"), $$461.getField("someId2")), $$461.getField("someId3")), 0, 38)]
+                                                                  -- ASSIGN  |PARTITIONED|
+                                                                    assign [$$461] <- [$$u_val.getField("marop")]
+                                                                    -- ASSIGN  |PARTITIONED|
+                                                                      project ([$$465, $$489, $$467, $$u_val])
+                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                        unnest $$u_val <- scan-collection($$290)
+                                                                        -- UNNEST  |PARTITIONED|
+                                                                          project ([$$465, $$489, $$467, $$290])
+                                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                                            subplan {
+                                                                                      aggregate [$$290] <- [listify($$289)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                      -- AGGREGATE  |LOCAL|
+                                                                                        assign [$$289] <- [{"marop": $$468, "t0": $$488}] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                        -- ASSIGN  |LOCAL|
+                                                                                          select (and(eq($$487, "iap"), not(is-unknown($$468)))) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                          -- STREAM_SELECT  |LOCAL|
+                                                                                            assign [$$488, $$468, $$487] <- [$$item2.getField("t0"), $$item2.getField("marop"), $$item2.getField("ua")] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                            -- ASSIGN  |LOCAL|
+                                                                                              unnest $$item2 <- scan-collection($$486) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                              -- UNNEST  |LOCAL|
+                                                                                                nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                -- NESTED_TUPLE_SOURCE  |LOCAL|
+                                                                                   }
+                                                                            -- SUBPLAN  |PARTITIONED|
+                                                                              select (not(or(eq($$467, "p1"), eq($$467, "p2"), eq($$467, "p3"))))
+                                                                              -- STREAM_SELECT  |PARTITIONED|
+                                                                                project ([$$465, $$489, $$486, $$467])
+                                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                                  exchange
+                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                    join (eq($$470, $$275))
+                                                                                    -- HYBRID_HASH_JOIN [$$275][$$470]  |PARTITIONED|
+                                                                                      exchange
+                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                        assign [$$275] <- [get-item(split($$467, " "), 0)]
+                                                                                        -- ASSIGN  |PARTITIONED|
+                                                                                          project ([$$465, $$489, $$486, $$467])
+                                                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                                                            assign [$$486, $$467] <- [$$item.getField("value"), $$item.getField("name")]
+                                                                                            -- ASSIGN  |PARTITIONED|
+                                                                                              project ([$$465, $$489, $$item])
+                                                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                unnest $$item <- scan-collection(object-pairs($$477))
+                                                                                                -- UNNEST  |PARTITIONED|
+                                                                                                  project ([$$465, $$489, $$477])
+                                                                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                    select ($$262)
+                                                                                                    -- STREAM_SELECT  |PARTITIONED|
+                                                                                                      project ([$$262, $$465, $$489, $$477])
+                                                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                        exchange
+                                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                          group by ([$$551 := $$457]) decor ([$$465; $$489; $$477]) {
+                                                                                                                    aggregate [$$262] <- [non-empty-stream()] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                    -- AGGREGATE  |LOCAL|
+                                                                                                                      select (not(is-missing($$550))) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                      -- STREAM_SELECT  |LOCAL|
+                                                                                                                        nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                        -- NESTED_TUPLE_SOURCE  |LOCAL|
+                                                                                                                 }
+                                                                                                          -- PRE_CLUSTERED_GROUP_BY[$$457]  |PARTITIONED|
+                                                                                                            exchange
+                                                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                              project ([$$489, $$465, $$477, $$550, $$457])
+                                                                                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                                exchange
+                                                                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                                  left outer join (eq($$457, $$549))
+                                                                                                                  -- HYBRID_HASH_JOIN [$$457][$$549]  |PARTITIONED|
+                                                                                                                    exchange
+                                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                                      project ([$$489, $$465, $$477, $$457])
+                                                                                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                                        select (and(eq($$b.getField("t"), "lovStat"), not(and(eq(len($$597), 1), eq(get-item($$597, 0), "some_str")))))
+                                                                                                                        -- STREAM_SELECT  |PARTITIONED|
+                                                                                                                          assign [$$597] <- [object-names($$477)]
+                                                                                                                          -- ASSIGN  |PARTITIONED|
+                                                                                                                            assign [$$489, $$465, $$477] <- [$$b.getField("uunn"), $$b.getField("qwer"), $$b.getField("ihsaa")]
+                                                                                                                            -- ASSIGN  |PARTITIONED|
+                                                                                                                              exchange
+                                                                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                                                data-scan []<-[$$457, $$b] <- test.col2
+                                                                                                                                -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                                                                  exchange
+                                                                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                                                    empty-tuple-source
+                                                                                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                                                                    exchange
+                                                                                                                    -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                                      assign [$$550] <- [true]
+                                                                                                                      -- ASSIGN  |PARTITIONED|
+                                                                                                                        project ([$$549])
+                                                                                                                        -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                                          exchange
+                                                                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                                            join (eq($$469, $$251))
+                                                                                                                            -- HYBRID_HASH_JOIN [$$251][$$469]  |PARTITIONED|
+                                                                                                                              exchange
+                                                                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                                                project ([$$549, $$251])
+                                                                                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                                                  select ($$260)
+                                                                                                                                  -- STREAM_SELECT  |PARTITIONED|
+                                                                                                                                    project ([$$549, $$251, $$260])
+                                                                                                                                    -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                                                      subplan {
+                                                                                                                                                aggregate [$$260] <- [non-empty-stream()] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                                                -- AGGREGATE  |LOCAL|
+                                                                                                                                                  select (and(eq($$484, "iap"), not(is-unknown($$483)))) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                                                  -- STREAM_SELECT  |LOCAL|
+                                                                                                                                                    assign [$$484, $$483] <- [$$item2.getField("ua"), $$item2.getField("marop")] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                                                    -- ASSIGN  |LOCAL|
+                                                                                                                                                      unnest $$item2 <- scan-collection($$482) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                                                      -- UNNEST  |LOCAL|
+                                                                                                                                                        nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                                                                                                        -- NESTED_TUPLE_SOURCE  |LOCAL|
+                                                                                                                                             }
+                                                                                                                                      -- SUBPLAN  |PARTITIONED|
+                                                                                                                                        project ([$$549, $$251, $$482])
+                                                                                                                                        -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                                                          assign [$$251, $$482] <- [get-item(split($$item.getField("name"), " "), 0), $$item.getField("value")]
+                                                                                                                                          -- ASSIGN  |PARTITIONED|
+                                                                                                                                            project ([$$549, $$item])
+                                                                                                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                                                              unnest $$item <- scan-collection(object-pairs($$545))
+                                                                                                                                              -- UNNEST  |PARTITIONED|
+                                                                                                                                                project ([$$549, $$545])
+                                                                                                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                                                                                                  select (and(not(and(eq(len($$598), 1), eq(get-item($$598, 0), "some_str"))), eq($$546.getField("t"), "lovStat")))
+                                                                                                                                                  -- STREAM_SELECT  |PARTITIONED|
+                                                                                                                                                    assign [$$598] <- [object-names($$545)]
+                                                                                                                                                    -- ASSIGN  |PARTITIONED|
+                                                                                                                                                      assign [$$545] <- [$$546.getField("ihsaa")]
+                                                                                                                                                      -- ASSIGN  |PARTITIONED|
+                                                                                                                                                        exchange
+                                                                                                                                                        -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                                                                          data-scan []<-[$$549, $$546] <- test.col2
+                                                                                                                                                          -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                                                                                            exchange
+                                                                                                                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                                                                                              empty-tuple-source
+                                                                                                                                                              -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                                                                              exchange
+                                                                                                                              -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                                                                                unnest $$469 <- scan-collection(array: [ "X", "Y" ])
+                                                                                                                                -- UNNEST  |UNPARTITIONED|
+                                                                                                                                  empty-tuple-source
+                                                                                                                                  -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
+                                                                                      exchange
+                                                                                      -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                                        unnest $$470 <- scan-collection(array: [ "X", "Y" ])
+                                                                                        -- UNNEST  |UNPARTITIONED|
+                                                                                          empty-tuple-source
+                                                                                          -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
+                                                    exchange
+                                                    -- HASH_PARTITION_EXCHANGE [$$uniqueID]  |PARTITIONED|
+                                                      project ([$$466, $$uniqueID])
+                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                        unnest $$uniqueID <- scan-collection($$505)
+                                                        -- UNNEST  |PARTITIONED|
+                                                          project ([$$466, $$505])
+                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                            assign [$$505] <- [array-star($$p.getField("members")).getField("uniqueID")]
+                                                            -- ASSIGN  |PARTITIONED|
+                                                              select (and(eq($$p.getField("r"), "uuu"), eq($$p.getField("t"), "ccc"), not(is-missing($$466))))
+                                                              -- STREAM_SELECT  |PARTITIONED|
+                                                                assign [$$466] <- [$$p.getField("cKey")]
+                                                                -- ASSIGN  |PARTITIONED|
+                                                                  project ([$$p])
+                                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                                    assign [$$p] <- [$$p2]
+                                                                    -- ASSIGN  |PARTITIONED|
+                                                                      exchange
+                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                        replicate
+                                                                        -- REPLICATE  |PARTITIONED|
+                                                                          exchange
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            project ([$$p2])
+                                                                            -- STREAM_PROJECT  |PARTITIONED|
+                                                                              exchange
+                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                data-scan []<-[$$459, $$p2] <- test.col1
+                                                                                -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                  exchange
+                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                    empty-tuple-source
+                                                                                    -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                            exchange
+                                            -- HASH_PARTITION_EXCHANGE [$$601, $$602]  |PARTITIONED|
+                                              project ([$$603, $$604, $$513, $$602, $$509, $$388, $$601])
+                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                assign [$$388] <- [{"join_key1": $$601, "wpdi": $$509, "wsc": $$513, "scKey": $$602, "wwlps": $$381, "wsd": $$603, "wsm": $$604}]
+                                                -- ASSIGN  |PARTITIONED|
+                                                  project ([$$513, $$509, $$381, $$604, $$603, $$602, $$601])
+                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                    assign [$$604, $$603, $$602, $$601] <- [substring($$516, 0, 7), substring($$516, 0, 10), uppercase(substring($$513, 0, position($$513, "_"))), substring($$511, 0, 38)]
+                                                    -- ASSIGN  |PARTITIONED|
+                                                      project ([$$513, $$509, $$516, $$511, $$381])
+                                                      -- STREAM_PROJECT  |PARTITIONED|
+                                                        subplan {
+                                                                  aggregate [$$381] <- [listify($$380)] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                  -- AGGREGATE  |LOCAL|
+                                                                    assign [$$380] <- [$$item.getField("wkps")] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                    -- ASSIGN  |LOCAL|
+                                                                      unnest $$item <- scan-collection($$510) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                      -- UNNEST  |LOCAL|
+                                                                        nested tuple source [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+                                                                        -- NESTED_TUPLE_SOURCE  |LOCAL|
+                                                               }
+                                                        -- SUBPLAN  |PARTITIONED|
+                                                          project ([$$513, $$509, $$516, $$511, $$510])
+                                                          -- STREAM_PROJECT  |PARTITIONED|
+                                                            exchange
+                                                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                              join (eq($$473, $$353))
+                                                              -- HYBRID_HASH_JOIN [$$353][$$473]  |PARTITIONED|
+                                                                exchange
+                                                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                  project ([$$513, $$509, $$516, $$511, $$510, $$353])
+                                                                  -- STREAM_PROJECT  |PARTITIONED|
+                                                                    select (and(eq($$p2.getField("t"), "ak1"), not(is-missing($$509)), not(is-missing($$541))))
+                                                                    -- STREAM_SELECT  |PARTITIONED|
+                                                                      assign [$$516, $$513, $$511, $$510, $$509] <- [$$541.getField("ssatt"), $$541.getField("stchk"), $$p2.getField("ed"), $$541.getField("intib"), $$541.getField("coaed")]
+                                                                      -- ASSIGN  |PARTITIONED|
+                                                                        assign [$$353, $$541] <- [$$p2.getField("ha"), $$p2.getField("kat")]
+                                                                        -- ASSIGN  |PARTITIONED|
+                                                                          exchange
+                                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                            replicate
+                                                                            -- REPLICATE  |PARTITIONED|
+                                                                              exchange
+                                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                project ([$$p2])
+                                                                                -- STREAM_PROJECT  |PARTITIONED|
+                                                                                  exchange
+                                                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                    data-scan []<-[$$459, $$p2] <- test.col1
+                                                                                    -- DATASOURCE_SCAN  |PARTITIONED|
+                                                                                      exchange
+                                                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                                        empty-tuple-source
+                                                                                        -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
+                                                                exchange
+                                                                -- BROADCAST_EXCHANGE  |PARTITIONED|
+                                                                  unnest $$473 <- scan-collection(array: [ "l1", "l2" ])
+                                                                  -- UNNEST  |UNPARTITIONED|
+                                                                    empty-tuple-source
+                                                                    -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
+                                  exchange
+                                  -- HASH_PARTITION_EXCHANGE [$$476]  |PARTITIONED|
+                                    project ([$$525, $$526, $$476])
+                                    -- STREAM_PROJECT  |PARTITIONED|
+                                      assign [$$526, $$525] <- [$$454.getField("omaa"), $$454.getField("qaz")]
+                                      -- ASSIGN  |PARTITIONED|
+                                        select (not(is-missing($$454)))
+                                        -- STREAM_SELECT  |PARTITIONED|
+                                          project ([$$476, $$454])
+                                          -- STREAM_PROJECT  |PARTITIONED|
+                                            assign [$$476, $$454] <- [$$sbr.getField("ed"), $$sbr.getField("tohac")]
+                                            -- ASSIGN  |PARTITIONED|
+                                              project ([$$sbr])
+                                              -- STREAM_PROJECT  |PARTITIONED|
+                                                assign [$$sbr] <- [$$p2]
+                                                -- ASSIGN  |PARTITIONED|
+                                                  exchange
+                                                  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                    replicate
+                                                    -- REPLICATE  |PARTITIONED|
+                                                      exchange
+                                                      -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                        project ([$$p2])
+                                                        -- STREAM_PROJECT  |PARTITIONED|
+                                                          exchange
+                                                          -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                            data-scan []<-[$$459, $$p2] <- test.col1
+                                                            -- DATASOURCE_SCAN  |PARTITIONED|
+                                                              exchange
+                                                              -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                                                empty-tuple-source
+                                                                -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
\ No newline at end of file


(asterixdb) 13/22: [ASTERIXDB-3683][COMP] Fix isomorphic window joins

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit b9488a5e3dc7a3c9458904d39334be1165a11aa8
Author: preetham0202 <pr...@couchbase.com>
AuthorDate: Tue Dec 16 18:05:33 2025 +0530

    [ASTERIXDB-3683][COMP] Fix isomorphic window joins
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Details:
    When comparing subplans, use the original operator instead of the copy.
    The copy is shallow and does not contain the source operator feeding the subplan.
    
    Ext-ref: MB-69788
    
    Change-Id: I69f56d136621591de915628cd1e308e8743f946a
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20772
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Preetham Poluparthi <pr...@apache.org>
    Reviewed-by: Ali Alsuliman <al...@gmail.com>
---
 asterixdb/NOTICE                                   |   2 +-
 .../window/isomorphic/isomorphic.1.ddl.sqlpp       |  36 ++++++++
 .../window/isomorphic/isomorphic.2.update.sqlpp    |  30 +++++++
 .../window/isomorphic/isomorphic.3.query.sqlpp     |  33 +++++++
 .../window/isomorphic/isomorphic.4.query.sqlpp     |  33 +++++++
 .../window/isomorphic/isomorphic.5.query.sqlpp     |  33 +++++++
 .../results/window/isomorphic/isomorphic.3.adm     | 100 +++++++++++++++++++++
 .../results/window/isomorphic/isomorphic.4.adm     | 100 +++++++++++++++++++++
 .../results/window/isomorphic/isomorphic.5.adm     |  50 +++++++++++
 .../src/test/resources/runtimets/sqlpp_queries.xml |   5 ++
 hyracks-fullstack/NOTICE                           |   2 +-
 .../visitors/IsomorphismOperatorVisitor.java       |  40 ++-------
 12 files changed, 427 insertions(+), 37 deletions(-)

diff --git a/asterixdb/NOTICE b/asterixdb/NOTICE
index 5118782978..a44569bc27 100644
--- a/asterixdb/NOTICE
+++ b/asterixdb/NOTICE
@@ -1,5 +1,5 @@
 Apache AsterixDB
-Copyright 2015-2025 The Apache Software Foundation
+Copyright 2015-2026 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.1.ddl.sqlpp
new file mode 100644
index 0000000000..47a6a97926
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.1.ddl.sqlpp
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+/*
+ * Description  : Isomorphic Window functions Test
+ * Expected Res : SUCCESS
+ */
+
+drop  dataverse test if exists;
+create  dataverse test;
+
+use test;
+
+create type prim as open {
+    `timestamp` : bigint
+    };
+
+create dataset stock_market_price_usd(prim)
+primary key `timestamp`;
+
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.2.update.sqlpp
new file mode 100644
index 0000000000..749d69be28
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.2.update.sqlpp
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+/*
+ * Description  : Isomorphic Window functions Test
+ * Expected Res : SUCCESS
+ */
+
+use test;
+
+INSERT INTO stock_market_price_usd(
+    SELECT VALUE {"timestamp": intVal + 1764530820000, "value" : 100 + intVal * 0.05 , "arr" : [ intVal%2 ] }
+    FROM range(1, 100) intVal
+);
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.3.query.sqlpp
new file mode 100644
index 0000000000..f9b48b7967
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.3.query.sqlpp
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+/*
+ * Description  : Isomorphic Window functions Test
+ * Expected Res : SUCCESS
+ */
+use test;
+
+SELECT l.timestamp, (l.`value` + r.`value`) as `value`
+FROM
+    ( SELECT timestamp, avg(`value`) OVER (ORDER BY timestamp RANGE BETWEEN 30 PRECEDING AND CURRENT ROW) AS `value` FROM stock_market_price_usd sub ) l
+        JOIN
+    ( SELECT timestamp, sum(`value`) OVER (ORDER BY timestamp RANGE BETWEEN 30 PRECEDING AND CURRENT ROW) AS `value` FROM stock_market_price_usd sub ) r
+    ON l.timestamp = r.timestamp
+order by timestamp;
+
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.4.query.sqlpp
new file mode 100644
index 0000000000..a23aed6076
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.4.query.sqlpp
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+/*
+ * Description  : Isomorphic Group-By functions Test
+ * Expected Res : SUCCESS
+ */
+use test;
+
+SELECT l.timestamp, (l.`value` + r.`value`) as `value`
+FROM
+    ( SELECT timestamp, sum(`value`) AS `value` FROM stock_market_price_usd sub  GROUP BY timestamp ) l
+        JOIN
+    ( SELECT timestamp, sum(`value`) AS `value` FROM stock_market_price_usd sub  GROUP BY timestamp ) r
+    ON l.timestamp = r.timestamp
+order by timestamp;
+
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.5.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.5.query.sqlpp
new file mode 100644
index 0000000000..085b21d31f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/isomorphic/isomorphic.5.query.sqlpp
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+/*
+ * Description  : Isomorphic Subplan functions Test
+ * Expected Res : SUCCESS
+ */
+use test;
+
+
+SELECT l.timestamp, (l.`value` + r.`value`) as `value`
+FROM
+    ( SELECT timestamp, `value` FROM stock_market_price_usd sub  WHERE ANY x in sub.arr satisfies x = 0 ) l
+        JOIN
+    ( SELECT timestamp, `value` FROM stock_market_price_usd sub  WHERE ANY x in sub.arr satisfies x = 0 ) r
+    ON l.timestamp = r.timestamp
+order by timestamp;
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/window/isomorphic/isomorphic.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/window/isomorphic/isomorphic.3.adm
new file mode 100644
index 0000000000..9fda828c06
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/window/isomorphic/isomorphic.3.adm
@@ -0,0 +1,100 @@
+{ "timestamp": 1764530820001, "value": 200.1 }
+{ "timestamp": 1764530820002, "value": 300.22499999999997 }
+{ "timestamp": 1764530820003, "value": 400.3999999999999 }
+{ "timestamp": 1764530820004, "value": 500.62499999999994 }
+{ "timestamp": 1764530820005, "value": 600.9 }
+{ "timestamp": 1764530820006, "value": 701.2249999999999 }
+{ "timestamp": 1764530820007, "value": 801.6 }
+{ "timestamp": 1764530820008, "value": 902.025 }
+{ "timestamp": 1764530820009, "value": 1002.5 }
+{ "timestamp": 1764530820010, "value": 1103.025 }
+{ "timestamp": 1764530820011, "value": 1203.6 }
+{ "timestamp": 1764530820012, "value": 1304.225 }
+{ "timestamp": 1764530820013, "value": 1404.8999999999999 }
+{ "timestamp": 1764530820014, "value": 1505.625 }
+{ "timestamp": 1764530820015, "value": 1606.4 }
+{ "timestamp": 1764530820016, "value": 1707.225 }
+{ "timestamp": 1764530820017, "value": 1808.1 }
+{ "timestamp": 1764530820018, "value": 1909.0249999999999 }
+{ "timestamp": 1764530820019, "value": 2010.0 }
+{ "timestamp": 1764530820020, "value": 2111.025 }
+{ "timestamp": 1764530820021, "value": 2212.1000000000004 }
+{ "timestamp": 1764530820022, "value": 2313.225 }
+{ "timestamp": 1764530820023, "value": 2414.4 }
+{ "timestamp": 1764530820024, "value": 2515.625 }
+{ "timestamp": 1764530820025, "value": 2616.9 }
+{ "timestamp": 1764530820026, "value": 2718.2250000000004 }
+{ "timestamp": 1764530820027, "value": 2819.6 }
+{ "timestamp": 1764530820028, "value": 2921.025 }
+{ "timestamp": 1764530820029, "value": 3022.5 }
+{ "timestamp": 1764530820030, "value": 3124.025 }
+{ "timestamp": 1764530820031, "value": 3225.6000000000004 }
+{ "timestamp": 1764530820032, "value": 3227.2 }
+{ "timestamp": 1764530820033, "value": 3228.8 }
+{ "timestamp": 1764530820034, "value": 3230.3999999999996 }
+{ "timestamp": 1764530820035, "value": 3232.0 }
+{ "timestamp": 1764530820036, "value": 3233.6000000000004 }
+{ "timestamp": 1764530820037, "value": 3235.2 }
+{ "timestamp": 1764530820038, "value": 3236.8 }
+{ "timestamp": 1764530820039, "value": 3238.3999999999996 }
+{ "timestamp": 1764530820040, "value": 3240.0 }
+{ "timestamp": 1764530820041, "value": 3241.6000000000004 }
+{ "timestamp": 1764530820042, "value": 3243.2 }
+{ "timestamp": 1764530820043, "value": 3244.8 }
+{ "timestamp": 1764530820044, "value": 3246.3999999999996 }
+{ "timestamp": 1764530820045, "value": 3248.0 }
+{ "timestamp": 1764530820046, "value": 3249.6000000000004 }
+{ "timestamp": 1764530820047, "value": 3251.2 }
+{ "timestamp": 1764530820048, "value": 3252.8 }
+{ "timestamp": 1764530820049, "value": 3254.3999999999996 }
+{ "timestamp": 1764530820050, "value": 3256.0 }
+{ "timestamp": 1764530820051, "value": 3257.6000000000004 }
+{ "timestamp": 1764530820052, "value": 3259.2 }
+{ "timestamp": 1764530820053, "value": 3260.8 }
+{ "timestamp": 1764530820054, "value": 3262.3999999999996 }
+{ "timestamp": 1764530820055, "value": 3264.0 }
+{ "timestamp": 1764530820056, "value": 3265.6000000000004 }
+{ "timestamp": 1764530820057, "value": 3267.2 }
+{ "timestamp": 1764530820058, "value": 3268.8 }
+{ "timestamp": 1764530820059, "value": 3270.3999999999996 }
+{ "timestamp": 1764530820060, "value": 3272.0 }
+{ "timestamp": 1764530820061, "value": 3273.6000000000004 }
+{ "timestamp": 1764530820062, "value": 3275.2 }
+{ "timestamp": 1764530820063, "value": 3276.8 }
+{ "timestamp": 1764530820064, "value": 3278.3999999999996 }
+{ "timestamp": 1764530820065, "value": 3280.0 }
+{ "timestamp": 1764530820066, "value": 3281.6000000000004 }
+{ "timestamp": 1764530820067, "value": 3283.2 }
+{ "timestamp": 1764530820068, "value": 3284.8 }
+{ "timestamp": 1764530820069, "value": 3286.3999999999996 }
+{ "timestamp": 1764530820070, "value": 3288.0 }
+{ "timestamp": 1764530820071, "value": 3289.6000000000004 }
+{ "timestamp": 1764530820072, "value": 3291.2 }
+{ "timestamp": 1764530820073, "value": 3292.8 }
+{ "timestamp": 1764530820074, "value": 3294.3999999999996 }
+{ "timestamp": 1764530820075, "value": 3296.0 }
+{ "timestamp": 1764530820076, "value": 3297.6000000000004 }
+{ "timestamp": 1764530820077, "value": 3299.2 }
+{ "timestamp": 1764530820078, "value": 3300.8 }
+{ "timestamp": 1764530820079, "value": 3302.3999999999996 }
+{ "timestamp": 1764530820080, "value": 3304.0 }
+{ "timestamp": 1764530820081, "value": 3305.6000000000004 }
+{ "timestamp": 1764530820082, "value": 3307.2 }
+{ "timestamp": 1764530820083, "value": 3308.8 }
+{ "timestamp": 1764530820084, "value": 3310.3999999999996 }
+{ "timestamp": 1764530820085, "value": 3312.0 }
+{ "timestamp": 1764530820086, "value": 3313.6000000000004 }
+{ "timestamp": 1764530820087, "value": 3315.2 }
+{ "timestamp": 1764530820088, "value": 3316.8 }
+{ "timestamp": 1764530820089, "value": 3318.3999999999996 }
+{ "timestamp": 1764530820090, "value": 3320.0 }
+{ "timestamp": 1764530820091, "value": 3321.6000000000004 }
+{ "timestamp": 1764530820092, "value": 3323.2 }
+{ "timestamp": 1764530820093, "value": 3324.8 }
+{ "timestamp": 1764530820094, "value": 3326.3999999999996 }
+{ "timestamp": 1764530820095, "value": 3328.0 }
+{ "timestamp": 1764530820096, "value": 3329.6000000000004 }
+{ "timestamp": 1764530820097, "value": 3331.2 }
+{ "timestamp": 1764530820098, "value": 3332.8 }
+{ "timestamp": 1764530820099, "value": 3334.3999999999996 }
+{ "timestamp": 1764530820100, "value": 3336.0 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/window/isomorphic/isomorphic.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/window/isomorphic/isomorphic.4.adm
new file mode 100644
index 0000000000..c7d4b340b0
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/window/isomorphic/isomorphic.4.adm
@@ -0,0 +1,100 @@
+{ "timestamp": 1764530820001, "value": 200.1 }
+{ "timestamp": 1764530820002, "value": 200.2 }
+{ "timestamp": 1764530820003, "value": 200.3 }
+{ "timestamp": 1764530820004, "value": 200.4 }
+{ "timestamp": 1764530820005, "value": 200.5 }
+{ "timestamp": 1764530820006, "value": 200.6 }
+{ "timestamp": 1764530820007, "value": 200.7 }
+{ "timestamp": 1764530820008, "value": 200.8 }
+{ "timestamp": 1764530820009, "value": 200.9 }
+{ "timestamp": 1764530820010, "value": 201.0 }
+{ "timestamp": 1764530820011, "value": 201.1 }
+{ "timestamp": 1764530820012, "value": 201.2 }
+{ "timestamp": 1764530820013, "value": 201.3 }
+{ "timestamp": 1764530820014, "value": 201.4 }
+{ "timestamp": 1764530820015, "value": 201.5 }
+{ "timestamp": 1764530820016, "value": 201.6 }
+{ "timestamp": 1764530820017, "value": 201.7 }
+{ "timestamp": 1764530820018, "value": 201.8 }
+{ "timestamp": 1764530820019, "value": 201.9 }
+{ "timestamp": 1764530820020, "value": 202.0 }
+{ "timestamp": 1764530820021, "value": 202.1 }
+{ "timestamp": 1764530820022, "value": 202.2 }
+{ "timestamp": 1764530820023, "value": 202.3 }
+{ "timestamp": 1764530820024, "value": 202.4 }
+{ "timestamp": 1764530820025, "value": 202.5 }
+{ "timestamp": 1764530820026, "value": 202.6 }
+{ "timestamp": 1764530820027, "value": 202.7 }
+{ "timestamp": 1764530820028, "value": 202.8 }
+{ "timestamp": 1764530820029, "value": 202.9 }
+{ "timestamp": 1764530820030, "value": 203.0 }
+{ "timestamp": 1764530820031, "value": 203.1 }
+{ "timestamp": 1764530820032, "value": 203.2 }
+{ "timestamp": 1764530820033, "value": 203.3 }
+{ "timestamp": 1764530820034, "value": 203.4 }
+{ "timestamp": 1764530820035, "value": 203.5 }
+{ "timestamp": 1764530820036, "value": 203.6 }
+{ "timestamp": 1764530820037, "value": 203.7 }
+{ "timestamp": 1764530820038, "value": 203.8 }
+{ "timestamp": 1764530820039, "value": 203.9 }
+{ "timestamp": 1764530820040, "value": 204.0 }
+{ "timestamp": 1764530820041, "value": 204.1 }
+{ "timestamp": 1764530820042, "value": 204.2 }
+{ "timestamp": 1764530820043, "value": 204.3 }
+{ "timestamp": 1764530820044, "value": 204.4 }
+{ "timestamp": 1764530820045, "value": 204.5 }
+{ "timestamp": 1764530820046, "value": 204.6 }
+{ "timestamp": 1764530820047, "value": 204.7 }
+{ "timestamp": 1764530820048, "value": 204.8 }
+{ "timestamp": 1764530820049, "value": 204.9 }
+{ "timestamp": 1764530820050, "value": 205.0 }
+{ "timestamp": 1764530820051, "value": 205.1 }
+{ "timestamp": 1764530820052, "value": 205.2 }
+{ "timestamp": 1764530820053, "value": 205.3 }
+{ "timestamp": 1764530820054, "value": 205.4 }
+{ "timestamp": 1764530820055, "value": 205.5 }
+{ "timestamp": 1764530820056, "value": 205.6 }
+{ "timestamp": 1764530820057, "value": 205.7 }
+{ "timestamp": 1764530820058, "value": 205.8 }
+{ "timestamp": 1764530820059, "value": 205.9 }
+{ "timestamp": 1764530820060, "value": 206.0 }
+{ "timestamp": 1764530820061, "value": 206.1 }
+{ "timestamp": 1764530820062, "value": 206.2 }
+{ "timestamp": 1764530820063, "value": 206.3 }
+{ "timestamp": 1764530820064, "value": 206.4 }
+{ "timestamp": 1764530820065, "value": 206.5 }
+{ "timestamp": 1764530820066, "value": 206.6 }
+{ "timestamp": 1764530820067, "value": 206.7 }
+{ "timestamp": 1764530820068, "value": 206.8 }
+{ "timestamp": 1764530820069, "value": 206.9 }
+{ "timestamp": 1764530820070, "value": 207.0 }
+{ "timestamp": 1764530820071, "value": 207.1 }
+{ "timestamp": 1764530820072, "value": 207.2 }
+{ "timestamp": 1764530820073, "value": 207.3 }
+{ "timestamp": 1764530820074, "value": 207.4 }
+{ "timestamp": 1764530820075, "value": 207.5 }
+{ "timestamp": 1764530820076, "value": 207.6 }
+{ "timestamp": 1764530820077, "value": 207.7 }
+{ "timestamp": 1764530820078, "value": 207.8 }
+{ "timestamp": 1764530820079, "value": 207.9 }
+{ "timestamp": 1764530820080, "value": 208.0 }
+{ "timestamp": 1764530820081, "value": 208.1 }
+{ "timestamp": 1764530820082, "value": 208.2 }
+{ "timestamp": 1764530820083, "value": 208.3 }
+{ "timestamp": 1764530820084, "value": 208.4 }
+{ "timestamp": 1764530820085, "value": 208.5 }
+{ "timestamp": 1764530820086, "value": 208.6 }
+{ "timestamp": 1764530820087, "value": 208.7 }
+{ "timestamp": 1764530820088, "value": 208.8 }
+{ "timestamp": 1764530820089, "value": 208.9 }
+{ "timestamp": 1764530820090, "value": 209.0 }
+{ "timestamp": 1764530820091, "value": 209.1 }
+{ "timestamp": 1764530820092, "value": 209.2 }
+{ "timestamp": 1764530820093, "value": 209.3 }
+{ "timestamp": 1764530820094, "value": 209.4 }
+{ "timestamp": 1764530820095, "value": 209.5 }
+{ "timestamp": 1764530820096, "value": 209.6 }
+{ "timestamp": 1764530820097, "value": 209.7 }
+{ "timestamp": 1764530820098, "value": 209.8 }
+{ "timestamp": 1764530820099, "value": 209.9 }
+{ "timestamp": 1764530820100, "value": 210.0 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/window/isomorphic/isomorphic.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/window/isomorphic/isomorphic.5.adm
new file mode 100644
index 0000000000..bbc6466146
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/window/isomorphic/isomorphic.5.adm
@@ -0,0 +1,50 @@
+{ "timestamp": 1764530820002, "value": 200.2 }
+{ "timestamp": 1764530820004, "value": 200.4 }
+{ "timestamp": 1764530820006, "value": 200.6 }
+{ "timestamp": 1764530820008, "value": 200.8 }
+{ "timestamp": 1764530820010, "value": 201.0 }
+{ "timestamp": 1764530820012, "value": 201.2 }
+{ "timestamp": 1764530820014, "value": 201.4 }
+{ "timestamp": 1764530820016, "value": 201.6 }
+{ "timestamp": 1764530820018, "value": 201.8 }
+{ "timestamp": 1764530820020, "value": 202.0 }
+{ "timestamp": 1764530820022, "value": 202.2 }
+{ "timestamp": 1764530820024, "value": 202.4 }
+{ "timestamp": 1764530820026, "value": 202.6 }
+{ "timestamp": 1764530820028, "value": 202.8 }
+{ "timestamp": 1764530820030, "value": 203.0 }
+{ "timestamp": 1764530820032, "value": 203.2 }
+{ "timestamp": 1764530820034, "value": 203.4 }
+{ "timestamp": 1764530820036, "value": 203.6 }
+{ "timestamp": 1764530820038, "value": 203.8 }
+{ "timestamp": 1764530820040, "value": 204.0 }
+{ "timestamp": 1764530820042, "value": 204.2 }
+{ "timestamp": 1764530820044, "value": 204.4 }
+{ "timestamp": 1764530820046, "value": 204.6 }
+{ "timestamp": 1764530820048, "value": 204.8 }
+{ "timestamp": 1764530820050, "value": 205.0 }
+{ "timestamp": 1764530820052, "value": 205.2 }
+{ "timestamp": 1764530820054, "value": 205.4 }
+{ "timestamp": 1764530820056, "value": 205.6 }
+{ "timestamp": 1764530820058, "value": 205.8 }
+{ "timestamp": 1764530820060, "value": 206.0 }
+{ "timestamp": 1764530820062, "value": 206.2 }
+{ "timestamp": 1764530820064, "value": 206.4 }
+{ "timestamp": 1764530820066, "value": 206.6 }
+{ "timestamp": 1764530820068, "value": 206.8 }
+{ "timestamp": 1764530820070, "value": 207.0 }
+{ "timestamp": 1764530820072, "value": 207.2 }
+{ "timestamp": 1764530820074, "value": 207.4 }
+{ "timestamp": 1764530820076, "value": 207.6 }
+{ "timestamp": 1764530820078, "value": 207.8 }
+{ "timestamp": 1764530820080, "value": 208.0 }
+{ "timestamp": 1764530820082, "value": 208.2 }
+{ "timestamp": 1764530820084, "value": 208.4 }
+{ "timestamp": 1764530820086, "value": 208.6 }
+{ "timestamp": 1764530820088, "value": 208.8 }
+{ "timestamp": 1764530820090, "value": 209.0 }
+{ "timestamp": 1764530820092, "value": 209.2 }
+{ "timestamp": 1764530820094, "value": 209.4 }
+{ "timestamp": 1764530820096, "value": 209.6 }
+{ "timestamp": 1764530820098, "value": 209.8 }
+{ "timestamp": 1764530820100, "value": 210.0 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
index edba9c2b4f..af63f0b1e4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
@@ -16095,6 +16095,11 @@
         <output-dir compare="Text">first_value_01</output-dir>
       </compilation-unit>
     </test-case>
+    <test-case FilePath="window">
+      <compilation-unit name="isomorphic">
+        <output-dir compare="Text">isomorphic</output-dir>
+      </compilation-unit>
+    </test-case>
     <test-case FilePath="window">
       <compilation-unit name="lag_01">
         <output-dir compare="Text">lag_01</output-dir>
diff --git a/hyracks-fullstack/NOTICE b/hyracks-fullstack/NOTICE
index 722db88282..9050c829f3 100644
--- a/hyracks-fullstack/NOTICE
+++ b/hyracks-fullstack/NOTICE
@@ -1,5 +1,5 @@
 Apache Hyracks and Algebricks
-Copyright 2015-2025 The Apache Software Foundation
+Copyright 2015-2026 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java
index 7ee3c53e9d..c4264c4727 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java
@@ -175,21 +175,7 @@ public class IsomorphismOperatorVisitor implements ILogicalOperatorVisitor<Boole
         GroupByOperator argOp = (GroupByOperator) arg;
         List<ILogicalPlan> plans = op.getNestedPlans();
         List<ILogicalPlan> plansArg = argOp.getNestedPlans();
-        for (int i = 0; i < plans.size(); i++) {
-            List<Mutable<ILogicalOperator>> roots = plans.get(i).getRoots();
-            List<Mutable<ILogicalOperator>> rootsArg = plansArg.get(i).getRoots();
-            if (roots.size() != rootsArg.size()) {
-                return Boolean.FALSE;
-            }
-            for (int j = 0; j < roots.size(); j++) {
-                ILogicalOperator topOp1 = roots.get(j).getValue();
-                ILogicalOperator topOp2 = rootsArg.get(j).getValue();
-                isomorphic = IsomorphismUtilities.isOperatorIsomorphicPlanSegment(topOp1, topOp2);
-                if (!isomorphic) {
-                    return Boolean.FALSE;
-                }
-            }
-        }
+        isomorphic = compareSubplans(plans, plansArg);
         return isomorphic;
     }
 
@@ -343,25 +329,9 @@ public class IsomorphismOperatorVisitor implements ILogicalOperatorVisitor<Boole
         if (aop.getOperatorTag() != LogicalOperatorTag.SUBPLAN) {
             return Boolean.FALSE;
         }
-        SubplanOperator subplanOpArg = (SubplanOperator) copyAndSubstituteVar(op, arg);
         List<ILogicalPlan> plans = op.getNestedPlans();
-        List<ILogicalPlan> plansArg = subplanOpArg.getNestedPlans();
-        for (int i = 0; i < plans.size(); i++) {
-            List<Mutable<ILogicalOperator>> roots = plans.get(i).getRoots();
-            List<Mutable<ILogicalOperator>> rootsArg = plansArg.get(i).getRoots();
-            if (roots.size() == rootsArg.size()) {
-                return Boolean.FALSE;
-            }
-            for (int j = 0; j < roots.size(); j++) {
-                ILogicalOperator topOp1 = roots.get(j).getValue();
-                ILogicalOperator topOp2 = rootsArg.get(j).getValue();
-                boolean isomorphic = IsomorphismUtilities.isOperatorIsomorphicPlanSegment(topOp1, topOp2);
-                if (!isomorphic) {
-                    return Boolean.FALSE;
-                }
-            }
-        }
-        return Boolean.TRUE;
+        List<ILogicalPlan> plansArg = ((SubplanOperator) arg).getNestedPlans();
+        return compareSubplans(plans, plansArg);
     }
 
     @Override
@@ -651,7 +621,7 @@ public class IsomorphismOperatorVisitor implements ILogicalOperatorVisitor<Boole
         }
 
         // Check our nested plans as well.
-        return compareSubplans(op.getNestedPlans(), insertOpArg.getNestedPlans());
+        return compareSubplans(op.getNestedPlans(), ((IndexInsertDeleteUpsertOperator) arg).getNestedPlans());
     }
 
     @Override
@@ -707,7 +677,7 @@ public class IsomorphismOperatorVisitor implements ILogicalOperatorVisitor<Boole
             return false;
         }
         List<ILogicalPlan> plans = op.getNestedPlans();
-        List<ILogicalPlan> plansArg = windowOpArg.getNestedPlans();
+        List<ILogicalPlan> plansArg = ((WindowOperator) arg).getNestedPlans();
         boolean isomorphic = compareSubplans(plans, plansArg);
         return isomorphic;
     }


(asterixdb) 08/22: [NO ISSUE][*DB][STO] Fix IndexOutOfBoundsException when flushPtr is 0

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 1c5a87019bc4913177d593c70e920f118933ad10
Author: Peeyush Gupta <pe...@couchbase.com>
AuthorDate: Mon Dec 15 22:22:15 2025 -0800

    [NO ISSUE][*DB][STO] Fix IndexOutOfBoundsException when flushPtr is 0
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Ext-ref: MB-69772
    Change-Id: I8a3761d0ab3759694af51f77bf8bfa9cbbcb8d1d
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20652
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Michael Blow <mb...@apache.org>
    Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
---
 .../org/apache/asterix/common/context/GlobalVirtualBufferCache.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/GlobalVirtualBufferCache.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/GlobalVirtualBufferCache.java
index 7fe3c4c50c..43f04e4d0c 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/GlobalVirtualBufferCache.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/GlobalVirtualBufferCache.java
@@ -145,7 +145,7 @@ public class GlobalVirtualBufferCache implements IVirtualBufferCache, ILifeCycle
                     }
                     if (primaryIndexes.isEmpty()) {
                         flushPtr = 0;
-                    } else if (flushPtr >= pos) {
+                    } else if (flushPtr >= pos && flushPtr > 0) {
                         // If the removed index is before flushPtr, we should decrement flushPtr by 1 so that
                         // it still points to the same index.
                         flushPtr = (flushPtr - 1) % primaryIndexes.size();


(asterixdb) 05/22: Merge branch 'gerrit/neo' into 'gerrit/trinity'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit d66c907a92f7488bd9b4917ede1117d7841b217a
Merge: bd0e9b44a2 933d132e6d
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Thu Dec 4 11:41:04 2025 -0500

    Merge branch 'gerrit/neo' into 'gerrit/trinity'
    
     * [ASTERIXDB-3451][STO] Avoid unlocking twice when pin fails (MB-69637)
    
    Ext-ref: MB-69637
    Change-Id: I927f9fb4c2ec77cd7678ce16f2a31cc3c6498850

 .../java/org/apache/hyracks/storage/am/btree/impls/DiskBTree.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)