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 2024/11/05 13:45:16 UTC

(asterixdb) branch master updated: [ASTERIXDB-3522][COMP] Invalid sample query generated

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


The following commit(s) were added to refs/heads/master by this push:
     new 663d14abae [ASTERIXDB-3522][COMP] Invalid sample query generated
     new e562443a6a Merge branch 'gerrit/goldfish' into 'master'
663d14abae is described below

commit 663d14abae72a24f769bd937fca65cd67d76c770
Author: Peeyush Gupta <pe...@couchbase.com>
AuthorDate: Mon Oct 28 14:10:13 2024 -0700

    [ASTERIXDB-3522][COMP] Invalid sample query generated
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Ext-ref: MB-64066
    
    Change-Id: I5504e494c72dab692607f26d33839b280c4a3fcc
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19025
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Peeyush Gupta <pe...@couchbase.com>
    Reviewed-by: Vijay Sarathy <vi...@couchbase.com>
    Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
---
 .../org/apache/asterix/optimizer/rules/cbo/JoinNode.java     | 12 ++++++------
 asterixdb/asterix-app/src/test/resources/cc-analyze.conf     |  1 +
 .../objects/object_add/object_add.7.query.sqlpp              |  3 +++
 .../objects/object_put/object_put.7.query.sqlpp              |  3 +++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/JoinNode.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/JoinNode.java
index d6ea457f85..2c430b1826 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/JoinNode.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/JoinNode.java
@@ -613,14 +613,14 @@ public class JoinNode {
                 if (selectivityAnnotation != null) {
                     sel = selectivityAnnotation.getSelectivity();
                 } else {
-                    if (leafInput.getOperatorTag().equals(LogicalOperatorTag.SELECT)) {
-                        selOp = (SelectOperator) joinEnum.getStatsHandle().findSelectOpWithExpr(leafInput, afce);
-                        if (selOp == null) {
+                    selOp = (SelectOperator) joinEnum.getStatsHandle().findSelectOpWithExpr(leafInput, afce);
+                    if (selOp == null) {
+                        if (leafInput.getOperatorTag().equals(LogicalOperatorTag.SELECT)) {
                             selOp = (SelectOperator) leafInput;
+                        } else {
+                            selOp = new SelectOperator(new MutableObject<>(afce));
+                            selOp.getInputs().add(new MutableObject<>(leafInput));
                         }
-                    } else {
-                        selOp = new SelectOperator(new MutableObject<>(afce));
-                        selOp.getInputs().add(new MutableObject<>(leafInput));
                     }
                     sel = joinEnum.getStatsHandle().findSelectivityForThisPredicate(selOp, afce,
                             chosenIndex.getIndexType().equals(DatasetConfig.IndexType.ARRAY)
diff --git a/asterixdb/asterix-app/src/test/resources/cc-analyze.conf b/asterixdb/asterix-app/src/test/resources/cc-analyze.conf
index 16fa0aeea4..93a4d15cc4 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-analyze.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-analyze.conf
@@ -54,3 +54,4 @@ log.dir = logs/
 log.level = INFO
 compiler.groupmemory=64MB
 storage.buffercache.pagesize=32KB
+compiler.internal.sanitycheck=true
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_add/object_add.7.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_add/object_add.7.query.sqlpp
index 71f6974766..c59346163a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_add/object_add.7.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_add/object_add.7.query.sqlpp
@@ -18,7 +18,10 @@
  */
 
 // For OBJECT_ADD.
+// ASTERIXDB-3522 disable parallel sort. enable when fixed
+
 USE     TestDataverse;
+set `compiler.sort.parallel` "false";
 LET     openUValues = (
           FROM    UsersOpen U2
           WHERE   U2._id = 4
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_put/object_put.7.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_put/object_put.7.query.sqlpp
index 52943a08e4..8525e249f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_put/object_put.7.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_put/object_put.7.query.sqlpp
@@ -18,7 +18,10 @@
  */
 
 // For OBJECT_PUT.
+// ASTERIXDB-3522 disable parallel sort. enable when fixed
+
 USE     TestDataverse;
+set `compiler.sort.parallel` "false";
 LET     openUValues = (
           FROM    UsersOpen U2
           WHERE   U2._id = 4