From eff3b25394c2c004e5985e1c4094a2dfe50afd14 Mon Sep 17 00:00:00 2001
From: cgivre <cgivre@gmail.com>
Date: Thu, 14 Nov 2024 09:32:39 -0500
Subject: [PATCH] WIP

---
 .../org/apache/drill/common/types/Types.java  |  2 +-
 .../exec/planner/physical/AggPrelBase.java    | 34 -------------------
 .../sql/conversion/DrillRexBuilder.java       |  4 +--
 3 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/common/src/main/java/org/apache/drill/common/types/Types.java b/common/src/main/java/org/apache/drill/common/types/Types.java
index 1b36409d17f..4f4a9a35a7a 100644
--- a/common/src/main/java/org/apache/drill/common/types/Types.java
+++ b/common/src/main/java/org/apache/drill/common/types/Types.java
@@ -815,7 +815,7 @@ public static MajorType.Builder calculateTypePrecisionAndScale(MajorType leftTyp
       return typeBuilder.setPrecision(Math.max(leftType.getPrecision(), rightType.getPrecision()));
     }
 
-    MinorType minorType = leftType.getMinorType();s
+    MinorType minorType = leftType.getMinorType();
     if (isDecimalType(leftType)) {
       int scale = Math.max(leftType.getScale(), rightType.getScale());
       // resulting precision should take into account resulting scale value and be calculated as
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPrelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPrelBase.java
index f15b0791774..a984b44a899 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPrelBase.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPrelBase.java
@@ -188,40 +188,6 @@ protected void createKeysAndExprs() {
                   aggCall.e.getType(),
                   aggCall.e.getName());
 
-          /*
-          SqlAggFunction aggFunction,
-      boolean distinct,
-      boolean approximate,
-      boolean ignoreNulls,
-      List<Integer> argList,
-      int filterArg,
-      @Nullable ImmutableBitSet distinctKeys,
-      RelCollation collation,
-      RelDataType type,
-      @Nullable String name
-
-SqlAggFunction aggFunction,
-      boolean distinct,
-       boolean approximate,
-        boolean ignoreNulls,
-      List<RexNode> rexList,
-      List<Integer> argList,
-      int filterArg,
-      @Nullable ImmutableBitSet distinctKeys, RelCollation collation,
-      RelDataType type, @Nullable String name
-
-      public static AggregateCall create(SqlAggFunction aggFunction, boolean distinct, boolean approximate, boolean ignoreNulls,
-      List<Integer> argList, int filterArg,
-      @Nullable ImmutableBitSet distinctKeys, RelCollation collation,
-      RelDataType type, @Nullable String name) {
-    final boolean distinct2 = distinct
-        && (aggFunction.getDistinctOptionality() != Optionality.IGNORED);
-    return new AggregateCall(aggFunction, distinct2, approximate, ignoreNulls,
-        argList, filterArg, distinctKeys, collation, type, name);
-  }
-
-           */
-
           phase2AggCallList.add(newAggCall);
         } else {
           AggregateCall newAggCall =
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillRexBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillRexBuilder.java
index 299859c8427..dd76f9c35e3 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillRexBuilder.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillRexBuilder.java
@@ -17,8 +17,6 @@
  */
 package org.apache.drill.exec.planner.sql.conversion;
 
-import java.math.BigDecimal;
-
 import org.apache.calcite.rel.type.RelDataType;
 import org.apache.calcite.rel.type.RelDataTypeFactory;
 import org.apache.calcite.rex.RexBuilder;
@@ -30,6 +28,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.math.BigDecimal;
+
 class DrillRexBuilder extends RexBuilder {
 
   private static final Logger logger = LoggerFactory.getLogger(DrillRexBuilder.class);