Sonar: remove duplicate field

apache · Oct 16, 2024 · 8be8d5a · 8be8d5a
1 parent 5125e58
commit 8be8d5a
Showing 1 changed file with 3 additions and 6 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
@@ -5379,9 +5379,6 @@ class OrderByRelBuilder {
 
     private HiveRelDistribution hiveRelDistribution;
     private RelNode obInputRel;
-    private RowResolver selectOutputRR;
-    private RelNode srcRel;
-
 
     OrderByRelBuilder(
             CalcitePlannerAction calcitePlannerAction, Pair<RelNode, RowResolver> selPair, boolean outermostOB) {
@@ -5555,8 +5552,7 @@ private void genOBProject() throws SemanticException {
       // selPair.getKey() is the operator right before OB
       // selPair.getValue() is RR which only contains columns needed in result
       // set. Extra columns needed by order by will be absent from it.
-      srcRel = selPair.getKey();
-      selectOutputRR = selPair.getValue();
+      RelNode srcRel = selPair.getKey();
       RowResolver inputRR = calcitePlannerAction.relToHiveRR.get(srcRel);
 
       // 3. Add Child Project Rel if needed, Generate Output RR, input Sel Rel
@@ -5640,8 +5636,9 @@ private RelNode endGenOBLogicalPlan(RelNode sortRel) throws CalciteSemanticExcep
       calcitePlannerAction.relToHiveRR.put(sortRel, outputRR);
       calcitePlannerAction.relToHiveColNameCalcitePosMap.put(sortRel, hiveColNameCalcitePosMap);
 
+      RowResolver selectOutputRR = selPair.getValue();
       if (selectOutputRR != null) {
-        List<RexNode> originalInputRefs = calcitePlannerAction.toRexNodeList(srcRel);
+        List<RexNode> originalInputRefs = calcitePlannerAction.toRexNodeList(selPair.getKey());
         List<RexNode> selectedRefs = originalInputRefs.subList(0, selectOutputRR.getColumnInfos().size());
         // We need to add select since order by schema may have more columns than result schema.
         return calcitePlannerAction.genSelectRelNode(selectedRefs, selectOutputRR, sortRel);