From fa959f2e42caf833c30bf8f40e6ed12db83a1241 Mon Sep 17 00:00:00 2001 From: kasakrisz Date: Thu, 17 Oct 2024 17:22:33 +0200 Subject: [PATCH] replace deprecated Calcite api with new one --- .../java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java index bea51fa08fe2..2d61c0c6e490 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java @@ -5605,7 +5605,7 @@ RelNode sortLimit(RexNode offsetRN, RexNode fetchRN) throws SemanticException { // 4. Construct SortRel RelOptCluster cluster = calcitePlannerAction.cluster; RelTraitSet traitSet = cluster.traitSetOf(HiveRelNode.CONVENTION); - RelCollation canonizedCollation = traitSet.canonize(RelCollationImpl.of(fieldCollations)); + RelCollation canonizedCollation = RelCollations.of(fieldCollations); RelNode sortRel = new HiveSortLimit(cluster, traitSet, obInputRel, canonizedCollation, offsetRN, fetchRN); return endGenOBLogicalPlan(sortRel); } @@ -5613,8 +5613,7 @@ RelNode sortLimit(RexNode offsetRN, RexNode fetchRN) throws SemanticException { RelNode sortExchange() throws SemanticException { genOBProject(); - RelTraitSet traitSet = calcitePlannerAction.cluster.traitSetOf(HiveRelNode.CONVENTION); - RelCollation canonizedCollation = traitSet.canonize(RelCollationImpl.of(fieldCollations)); + RelCollation canonizedCollation = RelCollations.of(fieldCollations); ImmutableList.Builder builder = ImmutableList.builder(); for (RelFieldCollation relFieldCollation : canonizedCollation.getFieldCollations()) { int index = relFieldCollation.getFieldIndex();