You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ja...@apache.org on 2023/07/12 17:33:37 UTC

[pinot] branch master updated: Consistently use isNullRow in transform function tests. (#11079)

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 3f15e10ffd Consistently use isNullRow in transform function tests. (#11079)
3f15e10ffd is described below

commit 3f15e10ffd0bd65636c0d2653ff6d707bc6f0894
Author: Shen Yu <sh...@startree.ai>
AuthorDate: Wed Jul 12 10:33:32 2023 -0700

    Consistently use isNullRow in transform function tests. (#11079)
---
 .../function/AdditionTransformFunctionTest.java    |  7 ++-
 .../function/AndOperatorTransformFunctionTest.java |  6 +--
 .../function/ArrayBaseTransformFunctionTest.java   | 10 ++--
 .../function/BaseTransformFunctionTest.java        | 24 ++++-----
 .../BinaryOperatorTransformFunctionTest.java       |  6 +--
 .../function/CastTransformFunctionTest.java        |  6 +--
 .../function/CoalesceTransformFunctionTest.java    | 24 ++++-----
 .../DateTimeConversionTransformFunctionTest.java   |  6 +--
 .../function/DateTimeTransformFunctionTest.java    |  6 +--
 .../function/DivisionTransformFunctionTest.java    |  6 +--
 .../function/EqualsTransformFunctionTest.java      |  6 +--
 .../function/ExtractTransformFunctionTest.java     |  6 +--
 .../GreaterThanOrEqualTransformFunctionTest.java   |  6 +--
 .../LessThanOrEqualTransformFunctionTest.java      |  6 +--
 .../function/LessThanTransformFunctionTest.java    |  6 +--
 .../LogicalOperatorTransformFunctionTest.java      |  6 +--
 .../function/ModuloTransformFunctionTest.java      |  6 +--
 .../MultiplicationTransformFunctionTest.java       |  6 +--
 .../function/NotEqualsTransformFunctionTest.java   |  6 +--
 .../function/NotOperatorTransformFunctionTest.java |  6 +--
 .../function/OrOperatorTransformFunctionTest.java  |  6 +--
 .../function/PowerTransformFunctionTest.java       |  6 +--
 .../RoundDecimalTransformFunctionTest.java         |  6 +--
 .../ScalarTransformFunctionWrapperTest.java        |  6 +--
 .../SingleParamMathTransformFunctionTest.java      | 60 +++++++++++-----------
 .../function/SubtractionTransformFunctionTest.java |  6 +--
 .../TimeConversionTransformFunctionTest.java       |  6 +--
 .../function/TrigonometricFunctionsTest.java       |  6 +--
 .../TruncateDecimalTransformFunctionTest.java      |  6 +--
 .../TupleSelectionTransformFunctionsTest.java      | 24 ++++-----
 30 files changed, 146 insertions(+), 147 deletions(-)

diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AdditionTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AdditionTransformFunctionTest.java
index 044388dac8..2ffa0d5793 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AdditionTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AdditionTransformFunctionTest.java
@@ -126,12 +126,11 @@ public class AdditionTransformFunctionTest extends BaseTransformFunctionTest {
     double[] expectedValues = new double[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = (double) _intSVValues[i] * 2;
-      } else {
-        //
+      if (isNullRow(i)) {
         expectedValues[i] = (double) Integer.MIN_VALUE + (double) _intSVValues[i];
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = (double) _intSVValues[i] * 2;
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AndOperatorTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AndOperatorTransformFunctionTest.java
index ccb8e2cb0b..a909701d61 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AndOperatorTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/AndOperatorTransformFunctionTest.java
@@ -60,10 +60,10 @@ public class AndOperatorTransformFunctionTest extends LogicalOperatorTransformFu
     int[] expectedValues = new int[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = (_intSVValues[i] == 0) ? 0 : 1;
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = (_intSVValues[i] == 0) ? 0 : 1;
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ArrayBaseTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ArrayBaseTransformFunctionTest.java
index ea9dd79fe5..985dac3cee 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ArrayBaseTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ArrayBaseTransformFunctionTest.java
@@ -100,7 +100,7 @@ public abstract class ArrayBaseTransformFunctionTest extends BaseTransformFuncti
       case INT:
         int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
         for (int i = 0; i < NUM_ROWS; i++) {
-          if (i % 2 == 0) {
+          if (!isNullRow(i)) {
             Assert.assertEquals(intValues[i], getExpectResult(_intMVValues[i]));
           }
         }
@@ -108,7 +108,7 @@ public abstract class ArrayBaseTransformFunctionTest extends BaseTransformFuncti
       case LONG:
         long[] longValues = transformFunction.transformToLongValuesSV(_projectionBlock);
         for (int i = 0; i < NUM_ROWS; i++) {
-          if (i % 2 == 0) {
+          if (!isNullRow(i)) {
             Assert.assertEquals(longValues[i], getExpectResult(_intMVValues[i]));
           }
         }
@@ -116,7 +116,7 @@ public abstract class ArrayBaseTransformFunctionTest extends BaseTransformFuncti
       case FLOAT:
         float[] floatValues = transformFunction.transformToFloatValuesSV(_projectionBlock);
         for (int i = 0; i < NUM_ROWS; i++) {
-          if (i % 2 == 0) {
+          if (!isNullRow(i)) {
             Assert.assertEquals(floatValues[i], getExpectResult(_intMVValues[i]));
           }
         }
@@ -124,7 +124,7 @@ public abstract class ArrayBaseTransformFunctionTest extends BaseTransformFuncti
       case DOUBLE:
         double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
         for (int i = 0; i < NUM_ROWS; i++) {
-          if (i % 2 == 0) {
+          if (!isNullRow(i)) {
             Assert.assertEquals(doubleValues[i], getExpectResult(_intMVValues[i]));
           }
         }
@@ -132,7 +132,7 @@ public abstract class ArrayBaseTransformFunctionTest extends BaseTransformFuncti
       case STRING:
         String[] stringValues = transformFunction.transformToStringValuesSV(_projectionBlock);
         for (int i = 0; i < NUM_ROWS; i++) {
-          if (i % 2 == 0) {
+          if (!isNullRow(i)) {
             Assert.assertEquals(stringValues[i], getExpectResult(_intMVValues[i]));
           }
         }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunctionTest.java
index 6e3c139aee..d36bbd3250 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunctionTest.java
@@ -176,23 +176,23 @@ public abstract class BaseTransformFunctionTest {
       map.put(DOUBLE_SV_COLUMN, _doubleSVValues[i]);
       map.put(BIG_DECIMAL_SV_COLUMN, _bigDecimalSVValues[i]);
       map.put(STRING_SV_COLUMN, _stringSVValues[i]);
-      if (i % 2 == 0) {
-        map.put(STRING_SV_NULL_COLUMN, _stringSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         map.put(STRING_SV_NULL_COLUMN, null);
+      } else {
+        map.put(STRING_SV_NULL_COLUMN, _stringSVValues[i]);
       }
       map.put(STRING_ALPHANUM_SV_COLUMN, _stringAlphaNumericSVValues[i]);
-      if (i % 2 == 0) {
-        map.put(STRING_ALPHANUM_NULL_SV_COLUMN, _stringAlphaNumericSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         map.put(STRING_ALPHANUM_NULL_SV_COLUMN, null);
+      } else {
+        map.put(STRING_ALPHANUM_NULL_SV_COLUMN, _stringAlphaNumericSVValues[i]);
       }
       map.put(BYTES_SV_COLUMN, _bytesSVValues[i]);
       map.put(INT_MV_COLUMN, ArrayUtils.toObject(_intMVValues[i]));
-      if (i % 2 == 0) {
-        map.put(INT_MV_NULL_COLUMN, ArrayUtils.toObject(_intMVValues[i]));
-      } else {
+      if (isNullRow(i)) {
         map.put(INT_MV_NULL_COLUMN, null);
+      } else {
+        map.put(INT_MV_NULL_COLUMN, ArrayUtils.toObject(_intMVValues[i]));
       }
       map.put(LONG_MV_COLUMN, ArrayUtils.toObject(_longMVValues[i]));
       map.put(FLOAT_MV_COLUMN, ArrayUtils.toObject(_floatMVValues[i]));
@@ -201,10 +201,10 @@ public abstract class BaseTransformFunctionTest {
       map.put(STRING_ALPHANUM_MV_COLUMN, _stringAlphaNumericMVValues[i]);
       map.put(STRING_LONG_MV_COLUMN, _stringLongFormatMVValues[i]);
       map.put(TIMESTAMP_COLUMN, _timeValues[i]);
-      if (i % 2 == 0) {
-        map.put(TIMESTAMP_COLUMN_NULL, _timeValues[i]);
-      } else {
+      if (isNullRow(i)) {
         map.put(TIMESTAMP_COLUMN_NULL, null);
+      } else {
+        map.put(TIMESTAMP_COLUMN_NULL, _timeValues[i]);
       }
       map.put(TIME_COLUMN, _timeValues[i]);
       _jsonValues[i] = JsonUtils.objectToJsonNode(map).toString();
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BinaryOperatorTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BinaryOperatorTransformFunctionTest.java
index 11c4ef7b3f..dcf22ecfc3 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BinaryOperatorTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BinaryOperatorTransformFunctionTest.java
@@ -140,10 +140,10 @@ public abstract class BinaryOperatorTransformFunctionTest extends BaseTransformF
     expectedValues = new boolean[NUM_ROWS];
     bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = getExpectedValue(Integer.compare(_intSVValues[i], _intSVValues[0]));
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = getExpectedValue(Integer.compare(_intSVValues[i], _intSVValues[0]));
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CastTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CastTransformFunctionTest.java
index 77dd2323dd..7ae8af7b71 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CastTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CastTransformFunctionTest.java
@@ -279,10 +279,10 @@ public class CastTransformFunctionTest extends BaseTransformFunctionTest {
     int[] expectedValues = new int[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = _intSVValues[i];
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = _intSVValues[i];
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CoalesceTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CoalesceTransformFunctionTest.java
index 0c9f802229..20b83f8770 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CoalesceTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/CoalesceTransformFunctionTest.java
@@ -33,10 +33,10 @@ public class CoalesceTransformFunctionTest extends BaseTransformFunctionTest {
 
     long[] expectedResults = new long[NUM_ROWS];
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedResults[i] = _intSVValues[i];
-      } else {
+      if (isNullRow(i)) {
         expectedResults[i] = _longSVValues[i];
+      } else {
+        expectedResults[i] = _intSVValues[i];
       }
     }
     testTransformFunction(coalesceFunc, expectedResults);
@@ -51,10 +51,10 @@ public class CoalesceTransformFunctionTest extends BaseTransformFunctionTest {
     Assert.assertEquals(coalesceFunc.getName(), "coalesce");
     int[] expectedResults = new int[NUM_ROWS];
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedResults[i] = _intSVValues[i];
-      } else {
+      if (isNullRow(i)) {
         expectedResults[i] = intLiteral;
+      } else {
+        expectedResults[i] = _intSVValues[i];
       }
     }
     testTransformFunction(coalesceFunc, expectedResults);
@@ -67,10 +67,10 @@ public class CoalesceTransformFunctionTest extends BaseTransformFunctionTest {
         _dataSourceMap);
     String[] expectedResults = new String[NUM_ROWS];
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedResults[i] = _stringSVValues[i];
-      } else {
+      if (isNullRow(i)) {
         expectedResults[i] = "234";
+      } else {
+        expectedResults[i] = _stringSVValues[i];
       }
     }
     testTransformFunction(coalesceFunc, expectedResults);
@@ -85,10 +85,10 @@ public class CoalesceTransformFunctionTest extends BaseTransformFunctionTest {
     double[] expectedResults = new double[NUM_ROWS];
     RoaringBitmap expectedNull = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedResults[i] = _intSVValues[i];
-      } else {
+      if (isNullRow(i)) {
         expectedNull.add(i);
+      } else {
+        expectedResults[i] = _intSVValues[i];
       }
     }
     testTransformFunctionWithNull(coalesceFunc, expectedResults, expectedNull);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeConversionTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeConversionTransformFunctionTest.java
index 5b3e420841..1d400922c8 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeConversionTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeConversionTransformFunctionTest.java
@@ -87,10 +87,10 @@ public class DateTimeConversionTransformFunctionTest extends BaseTransformFuncti
     long[] expectedValues = new long[NUM_ROWS];
     RoaringBitmap expectedNulls = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = TimeUnit.MILLISECONDS.toMinutes(_timeValues[i]);
-      } else {
+      if (isNullRow(i)) {
         expectedNulls.add(i);
+      } else {
+        expectedValues[i] = TimeUnit.MILLISECONDS.toMinutes(_timeValues[i]);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, expectedNulls);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeTransformFunctionTest.java
index cf1c055591..f9325c0e04 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DateTimeTransformFunctionTest.java
@@ -102,10 +102,10 @@ public class DateTimeTransformFunctionTest extends BaseTransformFunctionTest {
     RoaringBitmap nullBitmap = transformFunction.getNullBitmap(_projectionBlock);
 
     for (int i = 0; i < _projectionBlock.getNumDocs(); i++) {
-      if (i % 2 == 0) {
-        assertEquals(values[i], expected.applyAsInt(_timeValues[i]));
-      } else {
+      if (isNullRow(i)) {
         assertTrue(nullBitmap.contains(i));
+      } else {
+        assertEquals(values[i], expected.applyAsInt(_timeValues[i]));
       }
     }
   }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DivisionTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DivisionTransformFunctionTest.java
index e1c3b54bd8..fd8b62300a 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DivisionTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/DivisionTransformFunctionTest.java
@@ -157,10 +157,10 @@ public class DivisionTransformFunctionTest extends BaseTransformFunctionTest {
     double[] expectedValues = new double[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = 1;
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 1;
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/EqualsTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/EqualsTransformFunctionTest.java
index 8aad697bc1..b0cae0ba0d 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/EqualsTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/EqualsTransformFunctionTest.java
@@ -59,10 +59,10 @@ public class EqualsTransformFunctionTest extends BinaryOperatorTransformFunction
     int[] expectedValues = new int[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = 1;
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 1;
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ExtractTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ExtractTransformFunctionTest.java
index 146e0c3915..8f25b62c9e 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ExtractTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ExtractTransformFunctionTest.java
@@ -78,10 +78,10 @@ public class ExtractTransformFunctionTest extends BaseTransformFunctionTest {
     int[] values = transformFunction.transformToIntValuesSV(_projectionBlock);
     RoaringBitmap nullBitmap = transformFunction.getNullBitmap(_projectionBlock);
     for (int i = 0; i < _projectionBlock.getNumDocs(); i++) {
-      if (i % 2 == 0) {
-        assertEquals(values[i], expected.applyAsInt(_timeValues[i]));
-      } else {
+      if (isNullRow(i)) {
         assertTrue(nullBitmap.contains(i));
+      } else {
+        assertEquals(values[i], expected.applyAsInt(_timeValues[i]));
       }
     }
   }
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GreaterThanOrEqualTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GreaterThanOrEqualTransformFunctionTest.java
index 730b70553b..4a5058e636 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GreaterThanOrEqualTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GreaterThanOrEqualTransformFunctionTest.java
@@ -60,10 +60,10 @@ public class GreaterThanOrEqualTransformFunctionTest extends BinaryOperatorTrans
     int[] expectedValues = new int[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = 1;
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 1;
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanOrEqualTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanOrEqualTransformFunctionTest.java
index a547f8dc02..4ccc9e5536 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanOrEqualTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanOrEqualTransformFunctionTest.java
@@ -59,10 +59,10 @@ public class LessThanOrEqualTransformFunctionTest extends BinaryOperatorTransfor
     int[] expectedValues = new int[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = 1;
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 1;
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanTransformFunctionTest.java
index 24b2661b65..d4f6d79f3e 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LessThanTransformFunctionTest.java
@@ -60,10 +60,10 @@ public class LessThanTransformFunctionTest extends BinaryOperatorTransformFuncti
     int[] expectedValues = new int[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = 0;
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 0;
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LogicalOperatorTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LogicalOperatorTransformFunctionTest.java
index 2f177a36f1..3d1845b97f 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LogicalOperatorTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/LogicalOperatorTransformFunctionTest.java
@@ -125,10 +125,10 @@ public abstract class LogicalOperatorTransformFunctionTest extends BaseTransform
     boolean[] expectedValues = new boolean[NUM_ROWS];
     RoaringBitmap nullBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = true;
-      } else {
+      if (isNullRow(i)) {
         nullBitmap.add(i);
+      } else {
+        expectedValues[i] = true;
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, nullBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ModuloTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ModuloTransformFunctionTest.java
index e3d6e14375..c71ac818f7 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ModuloTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ModuloTransformFunctionTest.java
@@ -129,10 +129,10 @@ public class ModuloTransformFunctionTest extends BaseTransformFunctionTest {
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     double[] expectedValues = new double[NUM_ROWS];
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = (double) _intSVValues[i] % (double) _longSVValues[i];
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = (double) _intSVValues[i] % (double) _longSVValues[i];
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/MultiplicationTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/MultiplicationTransformFunctionTest.java
index 9ed1a104f1..b5158062f7 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/MultiplicationTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/MultiplicationTransformFunctionTest.java
@@ -106,10 +106,10 @@ public class MultiplicationTransformFunctionTest extends BaseTransformFunctionTe
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     double[] expectedValues = new double[NUM_ROWS];
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = (double) _intSVValues[i] * (double) _intSVValues[i];
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = (double) _intSVValues[i] * (double) _intSVValues[i];
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotEqualsTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotEqualsTransformFunctionTest.java
index eead2eb780..cb6acc1897 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotEqualsTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotEqualsTransformFunctionTest.java
@@ -60,10 +60,10 @@ public class NotEqualsTransformFunctionTest extends BinaryOperatorTransformFunct
     int[] expectedValues = new int[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = 0;
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 0;
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotOperatorTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotOperatorTransformFunctionTest.java
index c3672d1593..c8d460ea77 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotOperatorTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/NotOperatorTransformFunctionTest.java
@@ -113,10 +113,10 @@ public class NotOperatorTransformFunctionTest extends BaseTransformFunctionTest
     int[] expectedValues = new int[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = _intSVValues[i] == 0 ? 1 : 0;
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = _intSVValues[i] == 0 ? 1 : 0;
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/OrOperatorTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/OrOperatorTransformFunctionTest.java
index fb3b2d8a54..4af0e3acbe 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/OrOperatorTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/OrOperatorTransformFunctionTest.java
@@ -63,12 +63,12 @@ public class OrOperatorTransformFunctionTest extends LogicalOperatorTransformFun
     int[] expectedValues = new int[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = (_intSVValues[i] == 0) ? 0 : 1;
-      } else {
+      if (isNullRow(i)) {
         // null int is set to int min in field spec.
         expectedValues[i] = 1;
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = (_intSVValues[i] == 0) ? 0 : 1;
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/PowerTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/PowerTransformFunctionTest.java
index 6af9cb31aa..928a4c719c 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/PowerTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/PowerTransformFunctionTest.java
@@ -118,10 +118,10 @@ public class PowerTransformFunctionTest extends BaseTransformFunctionTest {
     double[] expectedValues = new double[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = 1;
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = 1;
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/RoundDecimalTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/RoundDecimalTransformFunctionTest.java
index 5290254828..3a2ab38e2d 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/RoundDecimalTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/RoundDecimalTransformFunctionTest.java
@@ -90,10 +90,10 @@ public class RoundDecimalTransformFunctionTest extends BaseTransformFunctionTest
     double[] expectedValues = new double[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = _intSVValues[i];
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = _intSVValues[i];
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapperTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapperTest.java
index c9d891481f..117779acac 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapperTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapperTest.java
@@ -1037,10 +1037,10 @@ public class ScalarTransformFunctionWrapperTest extends BaseTransformFunctionTes
     String[] expectedValues = new String[NUM_ROWS];
     RoaringBitmap bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = _stringAlphaNumericSVValues[i].toLowerCase();
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = _stringAlphaNumericSVValues[i].toLowerCase();
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SingleParamMathTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SingleParamMathTransformFunctionTest.java
index 62d4e76800..581ba61c21 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SingleParamMathTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SingleParamMathTransformFunctionTest.java
@@ -95,10 +95,10 @@ public class SingleParamMathTransformFunctionTest extends BaseTransformFunctionT
     Assert.assertTrue(transformFunction instanceof AbsTransformFunction);
     RoaringBitmap bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = Math.abs(_intSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.abs(_intSVValues[i]);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
@@ -161,10 +161,10 @@ public class SingleParamMathTransformFunctionTest extends BaseTransformFunctionT
     Assert.assertTrue(transformFunction instanceof CeilTransformFunction);
     RoaringBitmap bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = Math.ceil(_intSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.ceil(_intSVValues[i]);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
@@ -228,10 +228,10 @@ public class SingleParamMathTransformFunctionTest extends BaseTransformFunctionT
     Assert.assertTrue(transformFunction instanceof ExpTransformFunction);
     RoaringBitmap bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = Math.exp(_intSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.exp(_intSVValues[i]);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
@@ -296,10 +296,10 @@ public class SingleParamMathTransformFunctionTest extends BaseTransformFunctionT
     Assert.assertTrue(transformFunction instanceof FloorTransformFunction);
     RoaringBitmap bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = Math.floor(_intSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.floor(_intSVValues[i]);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
@@ -363,10 +363,10 @@ public class SingleParamMathTransformFunctionTest extends BaseTransformFunctionT
     Assert.assertTrue(transformFunction instanceof LnTransformFunction);
     RoaringBitmap bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = Math.log(_intSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.log(_intSVValues[i]);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
@@ -430,10 +430,10 @@ public class SingleParamMathTransformFunctionTest extends BaseTransformFunctionT
     Assert.assertTrue(transformFunction instanceof SqrtTransformFunction);
     RoaringBitmap bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = Math.sqrt(_intSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.sqrt(_intSVValues[i]);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
@@ -465,10 +465,10 @@ public class SingleParamMathTransformFunctionTest extends BaseTransformFunctionT
     transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
     RoaringBitmap bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = Math.sqrt(_intSVValues[i]) + Math.ceil(_intSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.sqrt(_intSVValues[i]) + Math.ceil(_intSVValues[i]);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
@@ -522,10 +522,10 @@ public class SingleParamMathTransformFunctionTest extends BaseTransformFunctionT
     transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
     RoaringBitmap bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = Math.log10(_intSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.log10(_intSVValues[i]);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
@@ -579,10 +579,10 @@ public class SingleParamMathTransformFunctionTest extends BaseTransformFunctionT
     transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
     RoaringBitmap bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = Math.log(_intSVValues[i]) / Math.log(2);
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.log(_intSVValues[i]) / Math.log(2);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
@@ -635,10 +635,10 @@ public class SingleParamMathTransformFunctionTest extends BaseTransformFunctionT
     transformFunction = TransformFunctionFactory.get(expression, _dataSourceMap);
     RoaringBitmap bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = Math.signum(_intSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = Math.signum(_intSVValues[i]);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SubtractionTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SubtractionTransformFunctionTest.java
index 8083d72108..fc2dfefd12 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SubtractionTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/SubtractionTransformFunctionTest.java
@@ -141,10 +141,10 @@ public class SubtractionTransformFunctionTest extends BaseTransformFunctionTest
     double[] expectedValues = new double[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = _intSVValues[i];
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = _intSVValues[i];
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TimeConversionTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TimeConversionTransformFunctionTest.java
index e01ccbcbb5..5cf5e06dbf 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TimeConversionTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TimeConversionTransformFunctionTest.java
@@ -65,10 +65,10 @@ public class TimeConversionTransformFunctionTest extends BaseTransformFunctionTe
     long[] expectedValues = new long[NUM_ROWS];
     RoaringBitmap expectedNull = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = TimeUnit.MILLISECONDS.toDays(_timeValues[i]);
-      } else {
+      if (isNullRow(i)) {
         expectedNull.add(i);
+      } else {
+        expectedValues[i] = TimeUnit.MILLISECONDS.toDays(_timeValues[i]);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, expectedNull);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TrigonometricFunctionsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TrigonometricFunctionsTest.java
index c6fa6378b0..fdfb3c6084 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TrigonometricFunctionsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TrigonometricFunctionsTest.java
@@ -168,10 +168,10 @@ public class TrigonometricFunctionsTest extends BaseTransformFunctionTest {
     expectedValues = new double[NUM_ROWS];
     RoaringBitmap bitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = op.applyAsDouble(_intSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         bitmap.add(i);
+      } else {
+        expectedValues[i] = op.applyAsDouble(_intSVValues[i]);
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, bitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TruncateDecimalTransformFunctionTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TruncateDecimalTransformFunctionTest.java
index 55c68cacec..05ea6c8888 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TruncateDecimalTransformFunctionTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TruncateDecimalTransformFunctionTest.java
@@ -90,10 +90,10 @@ public class TruncateDecimalTransformFunctionTest extends BaseTransformFunctionT
     double[] expectedValues = new double[NUM_ROWS];
     RoaringBitmap roaringBitmap = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        expectedValues[i] = _intSVValues[i];
-      } else {
+      if (isNullRow(i)) {
         roaringBitmap.add(i);
+      } else {
+        expectedValues[i] = _intSVValues[i];
       }
     }
     testTransformFunctionWithNull(transformFunction, expectedValues, roaringBitmap);
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TupleSelectionTransformFunctionsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TupleSelectionTransformFunctionsTest.java
index 237444c6c9..291b93eff8 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TupleSelectionTransformFunctionsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/TupleSelectionTransformFunctionsTest.java
@@ -234,10 +234,10 @@ public class TupleSelectionTransformFunctionsTest extends BaseTransformFunctionT
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
     double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        assertEquals(doubleValues[i], Math.min(_intSVValues[i], _doubleSVValues[i]));
-      } else {
+      if (isNullRow(i)) {
         assertEquals(doubleValues[i], _doubleSVValues[i]);
+      } else {
+        assertEquals(doubleValues[i], Math.min(_intSVValues[i], _doubleSVValues[i]));
       }
     }
     testNullBitmap(transformFunction, null);
@@ -261,10 +261,10 @@ public class TupleSelectionTransformFunctionsTest extends BaseTransformFunctionT
    int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
     RoaringBitmap expectedNull = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        assertEquals(intValues[i], _intSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         expectedNull.add(i);
+      } else {
+        assertEquals(intValues[i], _intSVValues[i]);
       }
     }
     testNullBitmap(transformFunction, expectedNull);
@@ -378,10 +378,10 @@ public class TupleSelectionTransformFunctionsTest extends BaseTransformFunctionT
     assertEquals(transformFunction.getResultMetadata().getDataType(), FieldSpec.DataType.DOUBLE);
     double[] doubleValues = transformFunction.transformToDoubleValuesSV(_projectionBlock);
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        assertEquals(doubleValues[i], Math.max(_intSVValues[i], _doubleSVValues[i]));
-      } else {
+      if (isNullRow(i)) {
         assertEquals(doubleValues[i], _doubleSVValues[i]);
+      } else {
+        assertEquals(doubleValues[i], Math.max(_intSVValues[i], _doubleSVValues[i]));
       }
     }
     testNullBitmap(transformFunction, null);
@@ -406,10 +406,10 @@ public class TupleSelectionTransformFunctionsTest extends BaseTransformFunctionT
     int[] intValues = transformFunction.transformToIntValuesSV(_projectionBlock);
     RoaringBitmap expectedNull = new RoaringBitmap();
     for (int i = 0; i < NUM_ROWS; i++) {
-      if (i % 2 == 0) {
-        assertEquals(intValues[i], _intSVValues[i]);
-      } else {
+      if (isNullRow(i)) {
         expectedNull.add(i);
+      } else {
+        assertEquals(intValues[i], _intSVValues[i]);
       }
     }
     testNullBitmap(transformFunction, expectedNull);


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