Address comments

jasperjiaguo · jasperjiaguo · commit 1a04903dd58f · 2022-08-27T23:44:12.000-07:00
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByOrderByCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByOrderByCombineOperator.java
@@ -58,7 +58,7 @@
 @SuppressWarnings("rawtypes")
 public class GroupByOrderByCombineOperator extends BaseCombineOperator {
   public static final int MAX_TRIM_THRESHOLD = 1_000_000_000;
-  public static final int MAX_GROUP_BY_KEYS_PER_MERGE_CALL = 10_000;
+  public static final int MAX_GROUP_BY_KEYS_MERGED_PER_INTERRUPTION_CHECK = 10_000;
 
   private static final Logger LOGGER = LoggerFactory.getLogger(GroupByOrderByCombineOperator.class);
 
@@ -208,7 +208,7 @@ protected void processSegments(int taskIndex) {
 
   // Check for thread interruption, every time after merging 10_000 keys
   private void checkMergePhaseInterruption(int mergedKeys) {
-    if (mergedKeys % MAX_GROUP_BY_KEYS_PER_MERGE_CALL == 0 && Thread.interrupted()) {
+    if (mergedKeys % MAX_GROUP_BY_KEYS_MERGED_PER_INTERRUPTION_CHECK == 0 && Thread.interrupted()) {
       throw new EarlyTerminationException();
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@`
`58`	`58`	`@SuppressWarnings("rawtypes")`
`59`	`59`	`public class GroupByOrderByCombineOperator extends BaseCombineOperator {`
`60`	`60`	`public static final int MAX_TRIM_THRESHOLD = 1_000_000_000;`
`61`		`- public static final int MAX_GROUP_BY_KEYS_PER_MERGE_CALL = 10_000;`
	`61`	`+ public static final int MAX_GROUP_BY_KEYS_MERGED_PER_INTERRUPTION_CHECK = 10_000;`
`62`	`62`
`63`	`63`	`private static final Logger LOGGER = LoggerFactory.getLogger(GroupByOrderByCombineOperator.class);`
`64`	`64`
`@@ -208,7 +208,7 @@ protected void processSegments(int taskIndex) {`
`208`	`208`
`209`	`209`	`// Check for thread interruption, every time after merging 10_000 keys`
`210`	`210`	`private void checkMergePhaseInterruption(int mergedKeys) {`
`211`		`- if (mergedKeys % MAX_GROUP_BY_KEYS_PER_MERGE_CALL == 0 && Thread.interrupted()) {`
	`211`	`+ if (mergedKeys % MAX_GROUP_BY_KEYS_MERGED_PER_INTERRUPTION_CHECK == 0 && Thread.interrupted()) {`
`212`	`212`	`throw new EarlyTerminationException();`
`213`	`213`	`}`
`214`	`214`	`}`