(ignite-3) branch main updated: IGNITE-24911 Fix ExplainRelAsTextWriter to render correct collation for merge join (#5818)

[amashenkov]

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

amashenkov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 82f1f446228 IGNITE-24911 Fix ExplainRelAsTextWriter to render correct 
collation for merge join (#5818)
82f1f446228 is described below

commit 82f1f446228d73a236c3c730a29baa29779b7550
Author: Andrew V. Mashenkov <amashen...@users.noreply.github.com>
AuthorDate: Thu May 22 11:58:14 2025 +0300

    IGNITE-24911 Fix ExplainRelAsTextWriter to render correct collation for 
merge join (#5818)
---
 .../org/apache/ignite/internal/sql/engine/rel/IgniteMergeJoin.java   | 5 +++--
 modules/sql-engine/src/test/resources/tpch/plan/q21.plan             | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rel/IgniteMergeJoin.java
 
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rel/IgniteMergeJoin.java
index aeea60471e0..ab23020b95a 100644
--- 
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rel/IgniteMergeJoin.java
+++ 
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rel/IgniteMergeJoin.java
@@ -51,6 +51,7 @@ import org.apache.calcite.util.mapping.IntPair;
 import org.apache.ignite.internal.sql.engine.externalize.RelInputEx;
 import org.apache.ignite.internal.sql.engine.metadata.cost.IgniteCost;
 import org.apache.ignite.internal.sql.engine.metadata.cost.IgniteCostFactory;
+import org.apache.ignite.internal.sql.engine.prepare.ExplainUtils;
 import org.apache.ignite.internal.sql.engine.trait.TraitUtils;
 import org.apache.ignite.internal.sql.engine.util.Commons;
 
@@ -301,8 +302,8 @@ public class IgniteMergeJoin extends AbstractIgniteJoin {
     @Override
     public RelWriter explainTerms(RelWriter pw) {
         return super.explainTerms(pw)
-                .item("leftCollation", leftCollation)
-                .item("rightCollation", rightCollation);
+                .itemIf("leftCollation", leftCollation, 
!ExplainUtils.forExplain(pw))
+                .itemIf("rightCollation", rightCollation, 
!ExplainUtils.forExplain(pw));
     }
 
     /** {@inheritDoc} */
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q21.plan 
b/modules/sql-engine/src/test/resources/tpch/plan/q21.plan
index 7acd4887340..becb49248ce 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q21.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q21.plan
@@ -53,8 +53,6 @@ Limit
                       MergeJoin
                           condition: =(S_NATIONKEY, N_NATIONKEY)
                           joinType: inner
-                          leftCollation: [S_NATIONKEY ASC]
-                          rightCollation: [S_SUPPKEY ASC]
                           est: (rows=3330)
                         Exchange
                             distribution: single