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 2a3a171af3 rename arrayIndexOfAll -> arrayIndexesOf; use
it.unimi.dsi.fastutil.ints.IntArray (#11654)
2a3a171af3 is described below
commit 2a3a171af3edc8252e3fbd803c8d563e433c7e53
Author: Xuanyi Li <[email protected]>
AuthorDate: Sat Sep 23 18:24:18 2023 -0700
rename arrayIndexOfAll -> arrayIndexesOf; use
it.unimi.dsi.fastutil.ints.IntArray (#11654)
---
.../common/function/scalar/ArrayFunctions.java | 56 +++++-----------------
.../ScalarTransformFunctionWrapperTest.java | 10 ++--
2 files changed, 17 insertions(+), 49 deletions(-)
diff --git
a/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/ArrayFunctions.java
b/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/ArrayFunctions.java
index a9a6d39e72..d8529e9842 100644
---
a/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/ArrayFunctions.java
+++
b/pinot-common/src/main/java/org/apache/pinot/common/function/scalar/ArrayFunctions.java
@@ -23,9 +23,7 @@ import it.unimi.dsi.fastutil.ints.IntLinkedOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet;
import it.unimi.dsi.fastutil.objects.ObjectSet;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.pinot.spi.annotations.ScalarFunction;
import org.apache.pinot.spi.utils.CommonConstants.NullValuePlaceHolder;
@@ -77,58 +75,28 @@ public class ArrayFunctions {
}
@ScalarFunction
- public static int[] arrayIndexOfAllInt(int[] value, int valueToFind) {
- List<Integer> indices = new ArrayList<>();
- for (int i = 0; i < value.length; i++) {
- if (value[i] == valueToFind) {
- indices.add(i);
- }
- }
- return indices.stream().mapToInt(Integer::intValue).toArray();
+ public static int[] arrayIndexesOfInt(int[] value, int valueToFind) {
+ return ArrayUtils.indexesOf(value, valueToFind).stream().toArray();
}
@ScalarFunction
- public static int[] arrayIndexOfAllLong(long[] value, long valueToFind) {
- List<Integer> indices = new ArrayList<>();
- for (int i = 0; i < value.length; i++) {
- if (value[i] == valueToFind) {
- indices.add(i);
- }
- }
- return indices.stream().mapToInt(Integer::intValue).toArray();
+ public static int[] arrayIndexesOfLong(long[] value, long valueToFind) {
+ return ArrayUtils.indexesOf(value, valueToFind).stream().toArray();
}
@ScalarFunction
- public static int[] arrayIndexOfAllFloat(float[] value, float valueToFind) {
- List<Integer> indices = new ArrayList<>();
- for (int i = 0; i < value.length; i++) {
- if (value[i] == valueToFind) {
- indices.add(i);
- }
- }
- return indices.stream().mapToInt(Integer::intValue).toArray();
+ public static int[] arrayIndexesOfFloat(float[] value, float valueToFind) {
+ return ArrayUtils.indexesOf(value, valueToFind).stream().toArray();
}
@ScalarFunction
- public static int[] arrayIndexOfAllDouble(double[] value, double
valueToFind) {
- List<Integer> indices = new ArrayList<>();
- for (int i = 0; i < value.length; i++) {
- if (value[i] == valueToFind) {
- indices.add(i);
- }
- }
- return indices.stream().mapToInt(Integer::intValue).toArray();
+ public static int[] arrayIndexesOfDouble(double[] value, double valueToFind)
{
+ return ArrayUtils.indexesOf(value, valueToFind).stream().toArray();
}
@ScalarFunction
- public static int[] arrayIndexOfAllString(String[] value, String
valueToFind) {
- List<Integer> indices = new ArrayList<>();
- for (int i = 0; i < value.length; i++) {
- if (valueToFind.equals(value[i])) {
- indices.add(i);
- }
- }
- return indices.stream().mapToInt(Integer::intValue).toArray();
+ public static int[] arrayIndexesOfString(String[] value, String valueToFind)
{
+ return ArrayUtils.indexesOf(value, valueToFind).stream().toArray();
}
/**
@@ -144,7 +112,7 @@ public class ArrayFunctions {
// TODO: if values1.length << values2.length. Use binary search can speed
up the query
int i = 0;
int j = 0;
- List<Integer> indices = new ArrayList<>();
+ IntArrayList indices = new IntArrayList();
while (i < values1.length && j < values2.length) {
if (values1[i] == values2[j]) {
indices.add(values1[i]);
@@ -152,7 +120,7 @@ public class ArrayFunctions {
}
i++;
}
- return indices.stream().mapToInt(Integer::intValue).toArray();
+ return indices.toIntArray();
}
@ScalarFunction
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 5befeccc07..49a86abc65 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
@@ -956,7 +956,7 @@ public class ScalarTransformFunctionWrapperTest extends
BaseTransformFunctionTes
@Test
public void testArrayIndexOfAllInt() {
ExpressionContext expression = RequestContextUtils.getExpression(
- String.format("array_index_of_all_int(%s, 0)",
INT_MONO_INCREASING_MV_1));
+ String.format("array_indexes_of_int(%s, 0)",
INT_MONO_INCREASING_MV_1));
TransformFunction transformFunction =
TransformFunctionFactory.get(expression, _dataSourceMap);
assertTrue(transformFunction instanceof ScalarTransformFunctionWrapper);
assertEquals(transformFunction.getResultMetadata().getDataType(),
DataType.INT);
@@ -972,7 +972,7 @@ public class ScalarTransformFunctionWrapperTest extends
BaseTransformFunctionTes
@Test
public void testArrayIndexOfAllLong() {
ExpressionContext expression = RequestContextUtils.getExpression(
- String.format("array_index_of_all_long(%s, 1)", LONG_MV_COLUMN_2));
+ String.format("array_indexes_of_long(%s, 1)", LONG_MV_COLUMN_2));
TransformFunction transformFunction =
TransformFunctionFactory.get(expression, _dataSourceMap);
assertTrue(transformFunction instanceof ScalarTransformFunctionWrapper);
assertEquals(transformFunction.getResultMetadata().getDataType(),
DataType.INT);
@@ -992,7 +992,7 @@ public class ScalarTransformFunctionWrapperTest extends
BaseTransformFunctionTes
@Test
public void testArrayIndexOfAllFloat() {
ExpressionContext expression = RequestContextUtils.getExpression(
- String.format("array_index_of_all_float(%s, 1.0)", FLOAT_MV_COLUMN_2));
+ String.format("array_indexes_of_float(%s, 1.0)", FLOAT_MV_COLUMN_2));
TransformFunction transformFunction =
TransformFunctionFactory.get(expression, _dataSourceMap);
assertTrue(transformFunction instanceof ScalarTransformFunctionWrapper);
assertEquals(transformFunction.getResultMetadata().getDataType(),
DataType.INT);
@@ -1012,7 +1012,7 @@ public class ScalarTransformFunctionWrapperTest extends
BaseTransformFunctionTes
@Test
public void testArrayIndexOfAllDouble() {
ExpressionContext expression = RequestContextUtils.getExpression(
- String.format("array_index_of_all_double(%s, 1.0)",
DOUBLE_MV_COLUMN_2));
+ String.format("array_indexes_of_double(%s, 1.0)", DOUBLE_MV_COLUMN_2));
TransformFunction transformFunction =
TransformFunctionFactory.get(expression, _dataSourceMap);
assertTrue(transformFunction instanceof ScalarTransformFunctionWrapper);
assertEquals(transformFunction.getResultMetadata().getDataType(),
DataType.INT);
@@ -1032,7 +1032,7 @@ public class ScalarTransformFunctionWrapperTest extends
BaseTransformFunctionTes
@Test
public void testArrayIndexOfAllString() {
ExpressionContext expression = RequestContextUtils.getExpression(
- String.format("array_index_of_all_string(%s, 'a')",
STRING_ALPHANUM_MV_COLUMN_2));
+ String.format("array_indexes_of_string(%s, 'a')",
STRING_ALPHANUM_MV_COLUMN_2));
TransformFunction transformFunction =
TransformFunctionFactory.get(expression, _dataSourceMap);
assertTrue(transformFunction instanceof ScalarTransformFunctionWrapper);
assertEquals(transformFunction.getResultMetadata().getDataType(),
DataType.INT);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
