>From Peeyush Gupta <[email protected]>: Peeyush Gupta has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19025 )
Change subject: [ASTERIXDB-3522][COMP] Invalid sample query generated ...................................................................... [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 <[email protected]> Reviewed-by: Peeyush Gupta <[email protected]> Reviewed-by: Vijay Sarathy <[email protected]> Integration-Tests: Jenkins <[email protected]> --- M asterixdb/asterix-app/src/test/resources/cc-analyze.conf M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/JoinNode.java M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_add/object_add.7.query.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_put/object_put.7.query.sqlpp 4 files changed, 33 insertions(+), 6 deletions(-) Approvals: Vijay Sarathy: Looks good to me, approved Peeyush Gupta: Looks good to me, but someone else must approve Jenkins: Verified; Verified Anon. E. Moose #1000171: 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 d6ea457..2c430b1 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 @@ 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 16fa0ae..93a4d15 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.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 71f6974..c593461 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 52943a0..8525e24 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 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19025 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: goldfish Gerrit-Change-Id: I5504e494c72dab692607f26d33839b280c4a3fcc Gerrit-Change-Number: 19025 Gerrit-PatchSet: 5 Gerrit-Owner: Peeyush Gupta <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Peeyush Gupta <[email protected]> Gerrit-Reviewer: Vijay Sarathy <[email protected]> Gerrit-CC: Ali Alsuliman <[email protected]> Gerrit-MessageType: merged
