[pinot] branch master updated: Minor change to keep all distinct executor consistent (#11405)

[jackie]

This is an automated email from the ASF dual-hosted git repository.

jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new 32e47c7b00 Minor change to keep all distinct executor consistent 
(#11405)
32e47c7b00 is described below

commit 32e47c7b0027254098818234e33cf0939773ef40
Author: Xiaotian (Jackie) Jiang <17555551+jackie-ji...@users.noreply.github.com>
AuthorDate: Tue Aug 22 11:17:07 2023 -0700

    Minor change to keep all distinct executor consistent (#11405)
---
 .../distinct/raw/BaseRawBigDecimalSingleColumnDistinctExecutor.java     | 2 +-
 .../query/distinct/raw/BaseRawBytesSingleColumnDistinctExecutor.java    | 2 +-
 .../query/distinct/raw/BaseRawStringSingleColumnDistinctExecutor.java   | 2 +-
 .../core/query/distinct/raw/RawIntSingleColumnDistinctOnlyExecutor.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBigDecimalSingleColumnDistinctExecutor.java
 
b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBigDecimalSingleColumnDistinctExecutor.java
index 8d06d2fe7c..ed60dcbf31 100644
--- 
a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBigDecimalSingleColumnDistinctExecutor.java
+++ 
b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBigDecimalSingleColumnDistinctExecutor.java
@@ -68,7 +68,7 @@ public abstract class 
BaseRawBigDecimalSingleColumnDistinctExecutor implements D
     if (_hasNull) {
       records.add(new Record(new Object[]{null}));
     }
-    assert (records.size() - _limit) <= 1;
+    assert records.size() - (_hasNull ? 1 : 0) <= _limit;
     return new DistinctTable(dataSchema, records, _nullHandlingEnabled);
   }
 
diff --git 
a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBytesSingleColumnDistinctExecutor.java
 
b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBytesSingleColumnDistinctExecutor.java
index 18f72482e3..73ad83e672 100644
--- 
a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBytesSingleColumnDistinctExecutor.java
+++ 
b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawBytesSingleColumnDistinctExecutor.java
@@ -68,7 +68,7 @@ abstract class BaseRawBytesSingleColumnDistinctExecutor 
implements DistinctExecu
     if (_hasNull) {
       records.add(new Record(new Object[]{null}));
     }
-    assert (records.size() - _limit) <= 1;
+    assert records.size() - (_hasNull ? 1 : 0) <= _limit;
     return new DistinctTable(dataSchema, records, _nullHandlingEnabled);
   }
 
diff --git 
a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawStringSingleColumnDistinctExecutor.java
 
b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawStringSingleColumnDistinctExecutor.java
index acbd271bd3..2a939862ea 100644
--- 
a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawStringSingleColumnDistinctExecutor.java
+++ 
b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/BaseRawStringSingleColumnDistinctExecutor.java
@@ -67,7 +67,7 @@ abstract class BaseRawStringSingleColumnDistinctExecutor 
implements DistinctExec
     if (_hasNull) {
       records.add(new Record(new Object[]{null}));
     }
-    assert (records.size() - _limit) <= 1;
+    assert records.size() - (_hasNull ? 1 : 0) <= _limit;
     return new DistinctTable(dataSchema, records, _nullHandlingEnabled);
   }
 
diff --git 
a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawIntSingleColumnDistinctOnlyExecutor.java
 
b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawIntSingleColumnDistinctOnlyExecutor.java
index 5e15eccc77..c585d77c5d 100644
--- 
a/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawIntSingleColumnDistinctOnlyExecutor.java
+++ 
b/pinot-core/src/main/java/org/apache/pinot/core/query/distinct/raw/RawIntSingleColumnDistinctOnlyExecutor.java
@@ -36,6 +36,6 @@ public class RawIntSingleColumnDistinctOnlyExecutor extends 
BaseRawIntSingleColu
   @Override
   protected boolean add(int val) {
     _valueSet.add(val);
-    return (_valueSet.size() >= _limit);
+    return _valueSet.size() >= _limit;
   }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org