(asterixdb) branch master updated: [NO ISSUE][COMP] Fix distinct cardinality estimation query compile error

[vsarathy1]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new a09d0c6192 [NO ISSUE][COMP] Fix distinct cardinality estimation query 
compile error
a09d0c6192 is described below

commit a09d0c619299f7aa91509b43caabc102282b1fb7
Author: Peeyush Gupta <peeyush.gu...@couchbase.com>
AuthorDate: Thu Jan 11 13:34:02 2024 +0530

    [NO ISSUE][COMP] Fix distinct cardinality estimation query compile error
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Change-Id: If76618bea2bf9cfbeae24dadf6e712764bef65df
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18091
    Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Ali Alsuliman <ali.al.solai...@gmail.com>
    Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
---
 .../java/org/apache/asterix/optimizer/rules/cbo/OperatorUtils.java  | 2 +-
 .../cardinality-estimation/join-queries/join-queries.3.plan         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/OperatorUtils.java
 
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/OperatorUtils.java
index f617a5a0ad..f20e912431 100644
--- 
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/OperatorUtils.java
+++ 
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/OperatorUtils.java
@@ -100,7 +100,7 @@ public class OperatorUtils {
             }
 
             if (scanOp != null) {
-                ILogicalOperator inputOp = (selOp != null) ? selOp : 
((assignOp != null) ? assignOp : scanOp);
+                ILogicalOperator inputOp = (assignOp != null) ? assignOp : 
((selOp != null) ? selOp : scanOp);
                 SourceLocation sourceLocation = inputOp.getSourceLocation();
                 DistinctOperator distinctOp =
                         createDistinctOp(foundDistinctVars, inputOp, 
sourceLocation, distinctPair.second, context);
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/cardinality-estimation/join-queries/join-queries.3.plan
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/cardinality-estimation/join-queries/join-queries.3.plan
index cd3f2d4afa..25d39e022b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/cardinality-estimation/join-queries/join-queries.3.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/results_cbo/cardinality-estimation/join-queries/join-queries.3.plan
@@ -1,8 +1,8 @@
-distribute result [$$35] [cardinality: 960.71, op-cost: 0.0, total-cost: 
136471.34]
+distribute result [$$35] [cardinality: 924.07, op-cost: 0.0, total-cost: 
136471.34]
 -- DISTRIBUTE_RESULT  |PARTITIONED|
-  exchange [cardinality: 960.71, op-cost: 0.0, total-cost: 136471.34]
+  exchange [cardinality: 924.07, op-cost: 0.0, total-cost: 136471.34]
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-    distinct ([$$35]) [cardinality: 960.71, op-cost: 58474.7, total-cost: 
136471.34]
+    distinct ([$$35]) [cardinality: 924.07, op-cost: 58474.7, total-cost: 
136471.34]
     -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
       exchange [cardinality: 4783.64, op-cost: 0.0, total-cost: 77996.64]
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|