fix by repalcing HashSet with TreeSet (apache#12047)

soumitra-st · Dec 5, 2023 · 96c2f3d · 96c2f3d
1 parent 9d779b4
commit 96c2f3d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/ExprMinMaxRewriter.java b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/rewriter/ExprMinMaxRewriter.java
@@ -20,12 +20,11 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.TreeSet;
 import org.apache.pinot.common.request.Expression;
 import org.apache.pinot.common.request.Function;
 import org.apache.pinot.common.request.PinotQuery;
@@ -162,15 +161,8 @@ private boolean updateExprMinMaxFunctionMap(List<Expression> exprMinMaxMeasuring
     int size = exprMinMaxFunctionIDMap.size();
     int id = exprMinMaxFunctionIDMap.computeIfAbsent(exprMinMaxMeasuringExpressions, (k) -> size);
 
-    AtomicBoolean added = new AtomicBoolean(true);
-
-    exprMinMaxFunctionMap.compute(exprMinMaxMeasuringExpressions, (k, v) -> {
-      if (v == null) {
-        v = new HashSet<>();
-      }
-      added.set(v.add(exprMinMaxProjectionExpression));
-      return v;
-    });
+    boolean added = exprMinMaxFunctionMap.computeIfAbsent(exprMinMaxMeasuringExpressions, k -> new TreeSet<>())
+        .add(exprMinMaxProjectionExpression);
 
     String operator = function.getOperator();
     function.setOperator(CommonConstants.RewriterConstants.CHILD_AGGREGATION_NAME_PREFIX + operator);
@@ -179,6 +171,6 @@ private boolean updateExprMinMaxFunctionMap(List<Expression> exprMinMaxMeasuring
     operands.add(0, exprMinMaxProjectionExpression);
     operands.add(0, RequestUtils.getLiteralExpression(id));
 
-    return added.get();
+    return added;
   }
 }
diff --git a/pinot-common/src/test/java/org/apache/pinot/sql/parsers/rewriter/ExprMinMaxRewriterTest.java b/pinot-common/src/test/java/org/apache/pinot/sql/parsers/rewriter/ExprMinMaxRewriterTest.java
@@ -43,7 +43,7 @@ public void testQueryRewrite() {
         "SELECT CHILD_EXPR_MIN(0,col5,col5,col1,col2), "
             + "CHILD_EXPR_MIN(0,col6,col6,col1,col2), "
             + "CHILD_EXPR_MAX(0,col6,col6,col1,col2),"
-            + "PARENT_EXPR_MIN(0,2,col1,col2,col6,col5),"
+            + "PARENT_EXPR_MIN(0,2,col1,col2,col5,col6),"
             + "PARENT_EXPR_MAX(0,2,col1,col2,col6) FROM myTable");
   }