You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by GitBox <gi...@apache.org> on 2020/05/25 08:13:04 UTC
[GitHub] [incubator-pinot] KKcorps opened a new pull request #5440: Add UDFs for String Transformation
KKcorps opened a new pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440
- Functions Added in Function Registry
- Generic Transform Function modified to handle more types
Missing:
- The return type of Generic Transform function is still restricted to String.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] siddharthteotia commented on pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
siddharthteotia commented on pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#issuecomment-636196791
> @fx19880617 @siddharthteotia Should I add tests in CalciteSQL for all the functions?
@KKcorps , sorry missed seeing this. Yes, the query compilation tests should be in CalciteSqlCompilerTest. Here we can verify that PinotQuery is being built correctly and that gets converted to BrokerRequest correctly. Most other tests in this file do this.
The other suggestion was to also add unit tests for exercising end-to-end execution path. Please consider adding these tests to an appropriate file in `/incubator-pinot/pinot-core/src/test/java/org/apache/pinot/queries/`. May be TransformQueriesTest
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] KKcorps commented on a change in pull request #5440: Add UDFs for String Transformation
Posted by GitBox <gi...@apache.org>.
KKcorps commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r430488587
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunction.java
##########
@@ -0,0 +1,170 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class GenericTransformFunction extends BaseTransformFunction {
+
+ private FunctionInfo _info;
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ String[] _stringResult;
+
+ public GenericTransformFunction() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _info = info;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _args[i] = Integer.parseInt(literal);
+ break;
+ case "java.lang.String":
+ _args[i] = literal;
+ break;
+ case "java.lang.Double":
+ _args[i] = Double.valueOf(literal);
+ break;
+ case "java.lang.Long":
+ _args[i] = Long.valueOf(literal);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ } else {
+ _nonLiteralArgIndices.add(i);
+ _nonLiteralTransformFunction.add(function);
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _nonLiteralArgType.add(FieldSpec.DataType.INT);
+ break;
+ case "java.lang.String":
+ _nonLiteralArgType.add(FieldSpec.DataType.STRING);
+ break;
+ case "java.lang.Double":
+ _nonLiteralArgType.add(FieldSpec.DataType.DOUBLE);
+ break;
+ case "java.lang.Long":
+ _nonLiteralArgType.add(FieldSpec.DataType.LONG);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ }
+ }
+ }
+
+ @Override
+ public TransformResultMetadata getResultMetadata() {
+ return STRING_SV_NO_DICTIONARY_METADATA;
Review comment:
does it look better now?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] KKcorps edited a comment on pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
KKcorps edited a comment on pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#issuecomment-634088300
@fx19880617 @siddharthteotia Should I add tests in CalciteSQL for all the functions?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] siddharthteotia edited a comment on pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
siddharthteotia edited a comment on pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#issuecomment-636196791
> @fx19880617 @siddharthteotia Should I add tests in CalciteSQL for all the functions?
@KKcorps , sorry missed this. Yes, the query compilation tests should be in CalciteSqlCompilerTest. Here we can verify that PinotQuery is being built correctly and that gets converted to BrokerRequest correctly. Most other tests in this file do this.
The other suggestion was to also add unit tests for exercising end-to-end execution path. Please consider adding these tests to an appropriate file in `/incubator-pinot/pinot-core/src/test/java/org/apache/pinot/queries/`. May be TransformQueriesTest
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] kishoreg commented on a change in pull request #5440: Add UDFs for String Transformation
Posted by GitBox <gi...@apache.org>.
kishoreg commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r430095391
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunction.java
##########
@@ -0,0 +1,170 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class GenericTransformFunction extends BaseTransformFunction {
+
+ private FunctionInfo _info;
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ String[] _stringResult;
+
+ public GenericTransformFunction() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _info = info;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _args[i] = Integer.parseInt(literal);
+ break;
+ case "java.lang.String":
+ _args[i] = literal;
+ break;
+ case "java.lang.Double":
+ _args[i] = Double.valueOf(literal);
+ break;
+ case "java.lang.Long":
+ _args[i] = Long.valueOf(literal);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ } else {
+ _nonLiteralArgIndices.add(i);
+ _nonLiteralTransformFunction.add(function);
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _nonLiteralArgType.add(FieldSpec.DataType.INT);
+ break;
+ case "java.lang.String":
+ _nonLiteralArgType.add(FieldSpec.DataType.STRING);
+ break;
+ case "java.lang.Double":
+ _nonLiteralArgType.add(FieldSpec.DataType.DOUBLE);
+ break;
+ case "java.lang.Long":
+ _nonLiteralArgType.add(FieldSpec.DataType.LONG);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ }
+ }
+ }
+
+ @Override
+ public TransformResultMetadata getResultMetadata() {
+ return STRING_SV_NO_DICTIONARY_METADATA;
Review comment:
You are right, we need to override methods for int, long, double, float. Shouldn't be hard, its mostly copy-paste. similar to _stringResultArray, create a resultArray for each type and instantiate them in the init
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunction.java
##########
@@ -0,0 +1,265 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class GenericTransformFunction extends BaseTransformFunction {
+
+ private FunctionInfo _info;
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ String[] _stringResult;
+ int[] _integerResult;
+ float[] _floatResult;
+ double[] _doubleResult;
+ long[] _longResult;
+
+ public GenericTransformFunction() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _info = info;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _args[i] = Integer.parseInt(literal);
+ break;
+ case "java.lang.String":
+ _args[i] = literal;
+ break;
+ case "java.lang.Double":
+ _args[i] = Double.valueOf(literal);
+ break;
+ case "java.lang.Float":
+ _args[i] = Float.valueOf(literal);
+ break;
+ case "java.lang.Long":
+ _args[i] = Long.valueOf(literal);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ } else {
+ _nonLiteralArgIndices.add(i);
+ _nonLiteralTransformFunction.add(function);
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _nonLiteralArgType.add(FieldSpec.DataType.INT);
+ break;
+ case "java.lang.String":
+ _nonLiteralArgType.add(FieldSpec.DataType.STRING);
+ break;
+ case "java.lang.Double":
+ _nonLiteralArgType.add(FieldSpec.DataType.DOUBLE);
+ break;
+ case "java.lang.Float":
+ _nonLiteralArgType.add(FieldSpec.DataType.FLOAT);
+ break;
+ case "java.lang.Long":
+ _nonLiteralArgType.add(FieldSpec.DataType.LONG);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ }
+ }
+ }
+
+ @Override
+ public TransformResultMetadata getResultMetadata() {
+ Class returnType = _functionInvoker.getReturnType();
+ switch(returnType.getTypeName()) {
+ case "java.lang.Integer": return INT_SV_NO_DICTIONARY_METADATA;
+ case "java.lang.Long": return LONG_SV_NO_DICTIONARY_METADATA;
+ case "java.lang.Float": return DOUBLE_SV_NO_DICTIONARY_METADATA;
+ case "java.lang.Double": return DOUBLE_SV_NO_DICTIONARY_METADATA;
+ case "java.lang.String": return STRING_SV_NO_DICTIONARY_METADATA;
+ default:
+ throw new RuntimeException("Unsupported data type " + returnType.getTypeName() + "for transform function " + getName());
+ }
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
+ if (_integerResult == null) {
+ _integerResult = new int[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ transformValues(projectionBlock);
+ return _integerResult;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
+ if (_longResult == null) {
+ _longResult = new long[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ transformValues(projectionBlock);
+ return _longResult;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
+ if (_floatResult == null) {
+ _floatResult = new float[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ transformValues(projectionBlock);
+ return _floatResult;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
+ if (_doubleResult == null) {
+ _doubleResult = new double[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ transformValues(projectionBlock);
+ return _doubleResult;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
+ if (_stringResult == null) {
+ _stringResult = new String[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ transformValues(projectionBlock);
+ return _stringResult;
+ }
+
+ private void transformValues(ProjectionBlock projectionBlock) {
+ int length = projectionBlock.getNumDocs();
+ int numNonLiteralArgs = _nonLiteralArgIndices.size();
+ Object[][] nonLiteralBlockValues = new Object[numNonLiteralArgs][];
+
+ transformNonLiteralArgsToValues(projectionBlock, numNonLiteralArgs, nonLiteralBlockValues);
+
+ //now invoke the actual function
+ for (int i = 0; i < length; i++) {
+ for (int k = 0; k < numNonLiteralArgs; k++) {
+ _args[_nonLiteralArgIndices.get(k)] = nonLiteralBlockValues[k][i];
+ }
+
+ Class returnType = _functionInvoker.getReturnType();
Review comment:
it's better to duplicate this for every type event though this code looks better for readability.
the switch case on every invocation will hurt perf
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunction.java
##########
@@ -0,0 +1,265 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class GenericTransformFunction extends BaseTransformFunction {
+
+ private FunctionInfo _info;
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ String[] _stringResult;
+ int[] _integerResult;
+ float[] _floatResult;
+ double[] _doubleResult;
+ long[] _longResult;
+
+ public GenericTransformFunction() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _info = info;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _args[i] = Integer.parseInt(literal);
+ break;
+ case "java.lang.String":
+ _args[i] = literal;
+ break;
+ case "java.lang.Double":
+ _args[i] = Double.valueOf(literal);
+ break;
+ case "java.lang.Float":
+ _args[i] = Float.valueOf(literal);
+ break;
+ case "java.lang.Long":
+ _args[i] = Long.valueOf(literal);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ } else {
+ _nonLiteralArgIndices.add(i);
+ _nonLiteralTransformFunction.add(function);
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _nonLiteralArgType.add(FieldSpec.DataType.INT);
+ break;
+ case "java.lang.String":
+ _nonLiteralArgType.add(FieldSpec.DataType.STRING);
+ break;
+ case "java.lang.Double":
+ _nonLiteralArgType.add(FieldSpec.DataType.DOUBLE);
+ break;
+ case "java.lang.Float":
+ _nonLiteralArgType.add(FieldSpec.DataType.FLOAT);
+ break;
+ case "java.lang.Long":
+ _nonLiteralArgType.add(FieldSpec.DataType.LONG);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ }
+ }
+ }
+
+ @Override
+ public TransformResultMetadata getResultMetadata() {
+ Class returnType = _functionInvoker.getReturnType();
Review comment:
better to do this in init and save the metadata, Pinot might call this function multiple times
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunction.java
##########
@@ -0,0 +1,265 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class GenericTransformFunction extends BaseTransformFunction {
+
+ private FunctionInfo _info;
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ String[] _stringResult;
+ int[] _integerResult;
+ float[] _floatResult;
+ double[] _doubleResult;
+ long[] _longResult;
+
+ public GenericTransformFunction() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
Review comment:
should we move this to constructor @mayankshriv @Jackie-Jiang
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunctionFactory.java
##########
@@ -112,13 +115,24 @@ public static TransformFunction get(TransformExpressionTree expression, Map<Stri
switch (expression.getExpressionType()) {
case FUNCTION:
String functionName = expression.getValue();
- Class<? extends TransformFunction> transformFunctionClass = TRANSFORM_FUNCTION_MAP.get(functionName);
+ Class<? extends TransformFunction> transformFunctionClass;
+ FunctionInfo functionInfo = null;
+ if (FunctionRegistry.containsFunctionByName(functionName)) {
+ transformFunctionClass = GenericTransformFunction.class;
+ functionInfo = FunctionRegistry.getFunctionByName(functionName);
Review comment:
its a wrapper for all functions in FunctionRegistry. what name do you suggest - ScalarTransformFunctionWrapper
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] siddharthteotia commented on pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
siddharthteotia commented on pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#issuecomment-637875934
Is the plan to use this wrapper solely for invoking scalar functions (like already done in this PR for StringFunctions) or are we expecting follow-ups to integrate it with rest of the transform functions. I think only the former?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] KKcorps commented on a change in pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
KKcorps commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r433450882
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
##########
@@ -0,0 +1,301 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class ScalarTransformFunctionWrapper extends BaseTransformFunction {
+
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ TransformResultMetadata _transformResultMetadata;
+ String[] _stringResult;
+ int[] _integerResult;
+ float[] _floatResult;
+ double[] _doubleResult;
+ long[] _longResult;
+
+ public ScalarTransformFunctionWrapper() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
Review comment:
It would require changing switch case to a lot of else if since switch doesn't accept Class type
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] siddharthteotia commented on a change in pull request #5440: Add UDFs for String Transformation
Posted by GitBox <gi...@apache.org>.
siddharthteotia commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r430077444
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunctionFactory.java
##########
@@ -112,13 +115,24 @@ public static TransformFunction get(TransformExpressionTree expression, Map<Stri
switch (expression.getExpressionType()) {
case FUNCTION:
String functionName = expression.getValue();
- Class<? extends TransformFunction> transformFunctionClass = TRANSFORM_FUNCTION_MAP.get(functionName);
+ Class<? extends TransformFunction> transformFunctionClass;
+ FunctionInfo functionInfo = null;
+ if (FunctionRegistry.containsFunctionByName(functionName)) {
+ transformFunctionClass = GenericTransformFunction.class;
+ functionInfo = FunctionRegistry.getFunctionByName(functionName);
Review comment:
I am not sure I follow the logic here. Is GenericTransformFunction going to be the wrapper or single point of entry for all transform functions in Pinot. The name seems to suggest so but this code implies that only the functions registered in the registry can be treated as GenericTransformFunction.
This also brings the point that we should add good javadocs to the new class.
##########
File path: pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunctionTest.java
##########
@@ -0,0 +1,173 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.common.request.transform.TransformExpressionTree;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class GenericTransformFunctionTest extends BaseTransformFunctionTest {
+
+ @Test
Review comment:
I believe this exercises the compilation path. You should add tests in CalciteSqlCompiler test file as well.
Also, we should add tests for end to end query execution. See TransformQueriesTest class or consider adding these to one of the existing query tests
##########
File path: pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunctionTest.java
##########
@@ -0,0 +1,173 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.common.request.transform.TransformExpressionTree;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class GenericTransformFunctionTest extends BaseTransformFunctionTest {
+
+ @Test
Review comment:
I believe this exercises the compilation path. You should add tests in CalciteSqlCompiler test file as well.
Also, we should add tests for end to end query execution. See TransformQueriesTest class or consider adding execution tests to one of the existing query tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] fx19880617 commented on pull request #5440: Add UDFs for String Transformation
Posted by GitBox <gi...@apache.org>.
fx19880617 commented on pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#issuecomment-633471678
This is great!
Could you add tests in: `CalciteSqlCompilerTest` to check sql parsing logic.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] Jackie-Jiang commented on a change in pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
Jackie-Jiang commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r433616232
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
##########
@@ -0,0 +1,301 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class ScalarTransformFunctionWrapper extends BaseTransformFunction {
+
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ TransformResultMetadata _transformResultMetadata;
+ String[] _stringResult;
+ int[] _integerResult;
+ float[] _floatResult;
+ double[] _doubleResult;
+ long[] _longResult;
+
+ public ScalarTransformFunctionWrapper() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _args[i] = Integer.parseInt(literal);
+ break;
+ case "java.lang.String":
+ _args[i] = literal;
+ break;
+ case "java.lang.Double":
+ _args[i] = Double.valueOf(literal);
+ break;
+ case "java.lang.Float":
+ _args[i] = Float.valueOf(literal);
+ break;
+ case "java.lang.Long":
+ _args[i] = Long.valueOf(literal);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ } else {
+ _nonLiteralArgIndices.add(i);
+ _nonLiteralTransformFunction.add(function);
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _nonLiteralArgType.add(FieldSpec.DataType.INT);
+ break;
+ case "java.lang.String":
+ _nonLiteralArgType.add(FieldSpec.DataType.STRING);
+ break;
+ case "java.lang.Double":
+ _nonLiteralArgType.add(FieldSpec.DataType.DOUBLE);
+ break;
+ case "java.lang.Float":
+ _nonLiteralArgType.add(FieldSpec.DataType.FLOAT);
+ break;
+ case "java.lang.Long":
+ _nonLiteralArgType.add(FieldSpec.DataType.LONG);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ }
+ }
+
+ Class returnType = _functionInvoker.getReturnType();
+ switch(returnType.getTypeName()) {
+ case "java.lang.Integer":
+ _transformResultMetadata = INT_SV_NO_DICTIONARY_METADATA;
+ break;
+ case "java.lang.Long":
+ _transformResultMetadata = LONG_SV_NO_DICTIONARY_METADATA;
+ break;
+ case "java.lang.Float":
+ case "java.lang.Double":
+ _transformResultMetadata = DOUBLE_SV_NO_DICTIONARY_METADATA;
+ break;
+ case "java.lang.Boolean":
+ case "java.lang.String":
+ _transformResultMetadata = STRING_SV_NO_DICTIONARY_METADATA;
+ break;
+ default:
+ throw new RuntimeException("Unsupported data type " + returnType.getTypeName() + "for transform function " + getName());
+ }
+ }
+
+ @Override
+ public TransformResultMetadata getResultMetadata() {
+ return _transformResultMetadata;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
+ if (_integerResult == null) {
+ _integerResult = new int[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ int length = projectionBlock.getNumDocs();
+ int numNonLiteralArgs = _nonLiteralArgIndices.size();
+ Object[][] nonLiteralBlockValues = new Object[numNonLiteralArgs][];
+
+ transformNonLiteralArgsToValues(projectionBlock, numNonLiteralArgs, nonLiteralBlockValues);
+
+ //now invoke the actual function
+ for (int i = 0; i < length; i++) {
+ for (int k = 0; k < numNonLiteralArgs; k++) {
+ _args[_nonLiteralArgIndices.get(k)] = nonLiteralBlockValues[k][i];
+ }
+ _integerResult[i] = (Integer) _functionInvoker.process(_args);
+ }
+ return _integerResult;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
+ if (_longResult == null) {
+ _longResult = new long[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ int length = projectionBlock.getNumDocs();
+ int numNonLiteralArgs = _nonLiteralArgIndices.size();
+ Object[][] nonLiteralBlockValues = new Object[numNonLiteralArgs][];
+
+ transformNonLiteralArgsToValues(projectionBlock, numNonLiteralArgs, nonLiteralBlockValues);
+
+ //now invoke the actual function
+ for (int i = 0; i < length; i++) {
+ for (int k = 0; k < numNonLiteralArgs; k++) {
+ _args[_nonLiteralArgIndices.get(k)] = nonLiteralBlockValues[k][i];
+ }
+ _longResult[i] = (Long) _functionInvoker.process(_args);
+ }
+ return _longResult;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
+ if (_floatResult == null) {
+ _floatResult = new float[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ int length = projectionBlock.getNumDocs();
+ int numNonLiteralArgs = _nonLiteralArgIndices.size();
+ Object[][] nonLiteralBlockValues = new Object[numNonLiteralArgs][];
+
+ transformNonLiteralArgsToValues(projectionBlock, numNonLiteralArgs, nonLiteralBlockValues);
+
+ //now invoke the actual function
+ for (int i = 0; i < length; i++) {
+ for (int k = 0; k < numNonLiteralArgs; k++) {
+ _args[_nonLiteralArgIndices.get(k)] = nonLiteralBlockValues[k][i];
+ }
+ _floatResult[i] = (Float) _functionInvoker.process(_args);
+ }
+ return _floatResult;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
+ if (_doubleResult == null) {
+ _doubleResult = new double[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ int length = projectionBlock.getNumDocs();
+ int numNonLiteralArgs = _nonLiteralArgIndices.size();
+ Object[][] nonLiteralBlockValues = new Object[numNonLiteralArgs][];
+
+ transformNonLiteralArgsToValues(projectionBlock, numNonLiteralArgs, nonLiteralBlockValues);
+
+ //now invoke the actual function
+ for (int i = 0; i < length; i++) {
+ for (int k = 0; k < numNonLiteralArgs; k++) {
+ _args[_nonLiteralArgIndices.get(k)] = nonLiteralBlockValues[k][i];
+ }
+ _doubleResult[i] = (Double) _functionInvoker.process(_args);
+ }
+ return _doubleResult;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
+ if (_stringResult == null) {
+ _stringResult = new String[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+
+ int length = projectionBlock.getNumDocs();
+ int numNonLiteralArgs = _nonLiteralArgIndices.size();
+ Object[][] nonLiteralBlockValues = new Object[numNonLiteralArgs][];
+
+ transformNonLiteralArgsToValues(projectionBlock, numNonLiteralArgs, nonLiteralBlockValues);
+
+ //now invoke the actual function
+ for (int i = 0; i < length; i++) {
+ for (int k = 0; k < numNonLiteralArgs; k++) {
+ _args[_nonLiteralArgIndices.get(k)] = nonLiteralBlockValues[k][i];
+ }
+ _stringResult[i] = (String) _functionInvoker.process(_args);
+ }
+
+ return _stringResult;
+ }
+
+ private void transformNonLiteralArgsToValues(ProjectionBlock projectionBlock, int numNonLiteralArgs,
+ Object[][] nonLiteralBlockValues) {
+ for (int i = 0; i < numNonLiteralArgs; i++) {
+ TransformFunction transformFunc = _nonLiteralTransformFunction.get(i);
+ FieldSpec.DataType returnType = _nonLiteralArgType.get(i);
+ switch (returnType) {
+ case STRING:
+ nonLiteralBlockValues[i] = transformFunc.transformToStringValuesSV(projectionBlock);
+ break;
+ case INT:
+ int[] values = transformFunc.transformToIntValuesSV(projectionBlock);
+ nonLiteralBlockValues[i] = Arrays.stream(values).boxed().toArray(Integer[]::new);
+ break;
+ case DOUBLE:
+ double[] doubleValues = transformFunc.transformToDoubleValuesSV(projectionBlock);
+ nonLiteralBlockValues[i] = Arrays.stream(doubleValues).boxed().toArray(Double[]::new);
+ break;
+ case FLOAT:
+ float[] floatValues = transformFunc.transformToFloatValuesSV(projectionBlock);
Review comment:
Another way is using `org.apache.commons.lang3.ArrayUtils.toObject()` which is clean and neat
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] KKcorps commented on a change in pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
KKcorps commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r433450882
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
##########
@@ -0,0 +1,301 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class ScalarTransformFunctionWrapper extends BaseTransformFunction {
+
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ TransformResultMetadata _transformResultMetadata;
+ String[] _stringResult;
+ int[] _integerResult;
+ float[] _floatResult;
+ double[] _doubleResult;
+ long[] _longResult;
+
+ public ScalarTransformFunctionWrapper() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
Review comment:
It would require changing switch case to a lot of else if since switch doesn't accept Class type. IMO, switch case looks neat so made this trade off
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] Jackie-Jiang commented on a change in pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
Jackie-Jiang commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r433616803
##########
File path: pinot-common/pom.xml
##########
@@ -33,6 +33,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/..</pinot.root>
+ <reflections.version>0.9.11</reflections.version>
Review comment:
What I mean is moving the dependency and version into `dependencyManagement` in the root pom file. You may refer to other dependencies in pinot-common
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] kishoreg commented on pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
kishoreg commented on pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#issuecomment-637897871
@sidd only for scalarfunctions.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] kishoreg merged pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
kishoreg merged pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] KKcorps commented on a change in pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
KKcorps commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r433462644
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
##########
@@ -0,0 +1,301 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class ScalarTransformFunctionWrapper extends BaseTransformFunction {
Review comment:
IMO, this is a wrapper/adapater around ScalarTransformFunctions hence the name
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] KKcorps commented on pull request #5440: Add UDFs for String Transformation
Posted by GitBox <gi...@apache.org>.
KKcorps commented on pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#issuecomment-634088300
@fx19880617 @siddharthteotia Should I add tests in CalciteSQL for all the functions?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] kishoreg commented on a change in pull request #5440: Add UDFs for String Transformation
Posted by GitBox <gi...@apache.org>.
kishoreg commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r429800263
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunction.java
##########
@@ -0,0 +1,170 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class GenericTransformFunction extends BaseTransformFunction {
+
+ private FunctionInfo _info;
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ String[] _stringResult;
+
+ public GenericTransformFunction() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _info = info;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
Review comment:
missing float
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunction.java
##########
@@ -0,0 +1,170 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class GenericTransformFunction extends BaseTransformFunction {
+
+ private FunctionInfo _info;
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ String[] _stringResult;
+
+ public GenericTransformFunction() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _info = info;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _args[i] = Integer.parseInt(literal);
+ break;
+ case "java.lang.String":
+ _args[i] = literal;
+ break;
+ case "java.lang.Double":
+ _args[i] = Double.valueOf(literal);
+ break;
+ case "java.lang.Long":
+ _args[i] = Long.valueOf(literal);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ } else {
+ _nonLiteralArgIndices.add(i);
+ _nonLiteralTransformFunction.add(function);
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _nonLiteralArgType.add(FieldSpec.DataType.INT);
+ break;
+ case "java.lang.String":
+ _nonLiteralArgType.add(FieldSpec.DataType.STRING);
+ break;
+ case "java.lang.Double":
+ _nonLiteralArgType.add(FieldSpec.DataType.DOUBLE);
+ break;
+ case "java.lang.Long":
+ _nonLiteralArgType.add(FieldSpec.DataType.LONG);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ }
+ }
+ }
+
+ @Override
+ public TransformResultMetadata getResultMetadata() {
+ return STRING_SV_NO_DICTIONARY_METADATA;
Review comment:
you can add another switch statement in init to set this based on the return type of the scalarfunction, see functionInvoker.getReturnType
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] Jackie-Jiang commented on a change in pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
Jackie-Jiang commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r432782384
##########
File path: pinot-common/pom.xml
##########
@@ -33,6 +33,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/..</pinot.root>
+ <reflections.version>0.9.11</reflections.version>
Review comment:
Move the version info into the root pom file
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunctionFactory.java
##########
@@ -112,13 +115,24 @@ public static TransformFunction get(TransformExpressionTree expression, Map<Stri
switch (expression.getExpressionType()) {
case FUNCTION:
String functionName = expression.getValue();
- Class<? extends TransformFunction> transformFunctionClass = TRANSFORM_FUNCTION_MAP.get(functionName);
+ Class<? extends TransformFunction> transformFunctionClass;
+ FunctionInfo functionInfo = null;
+ if (FunctionRegistry.containsFunctionByName(functionName)) {
+ transformFunctionClass = ScalarTransformFunctionWrapper.class;
+ functionInfo = FunctionRegistry.getFunctionByName(functionName);
+ } else {
+ transformFunctionClass = TRANSFORM_FUNCTION_MAP.get(functionName);
+ }
+
if (transformFunctionClass == null) {
throw new BadQueryRequestException("Unsupported transform function: " + functionName);
}
try {
transformFunction = transformFunctionClass.newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
+ if (functionInfo != null) {
+ ((ScalarTransformFunctionWrapper) transformFunction).setFunction(functionName, functionInfo);
Review comment:
Suggest using a constructor with `functionName` and `functionInfo` instead of using `newInstance()`
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
##########
@@ -0,0 +1,301 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class ScalarTransformFunctionWrapper extends BaseTransformFunction {
+
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ TransformResultMetadata _transformResultMetadata;
+ String[] _stringResult;
+ int[] _integerResult;
+ float[] _floatResult;
+ double[] _doubleResult;
+ long[] _longResult;
+
+ public ScalarTransformFunctionWrapper() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+ switch (paramType.getTypeName()) {
Review comment:
For readability, can we always order them as INT, LONG, FLOAT, DOUBLE, STRING? Same for other places
##########
File path: pinot-common/src/main/java/org/apache/pinot/common/function/FunctionRegistry.java
##########
@@ -53,8 +61,12 @@ public static FunctionInfo getFunctionByNameWithApplicableArgumentTypes(String f
}
public static void registerFunction(Method method) {
+ registerFunction(method, method.getName().toLowerCase());
+ }
+
+ public static void registerFunction(Method method, String name) {
Review comment:
(nit) Suggest putting `name` in front of `method`
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
##########
@@ -0,0 +1,301 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class ScalarTransformFunctionWrapper extends BaseTransformFunction {
+
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ TransformResultMetadata _transformResultMetadata;
+ String[] _stringResult;
+ int[] _integerResult;
+ float[] _floatResult;
+ double[] _doubleResult;
+ long[] _longResult;
+
+ public ScalarTransformFunctionWrapper() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
Review comment:
(nit) Use a local variable `int numArguments = arguments.size()`
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
##########
@@ -0,0 +1,301 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class ScalarTransformFunctionWrapper extends BaseTransformFunction {
+
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ TransformResultMetadata _transformResultMetadata;
+ String[] _stringResult;
+ int[] _integerResult;
+ float[] _floatResult;
+ double[] _doubleResult;
+ long[] _longResult;
+
+ public ScalarTransformFunctionWrapper() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
Review comment:
Suggest directly comparing class instead of String comparison for both performance and readability:
```
if (paramType == Integer.class) {
...
} else if (paramType == Long.class) {
...
```
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
##########
@@ -0,0 +1,301 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class ScalarTransformFunctionWrapper extends BaseTransformFunction {
+
+ FunctionInvoker _functionInvoker;
Review comment:
Add `private` or `private final` for these member variables
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunctionFactory.java
##########
@@ -112,13 +115,24 @@ public static TransformFunction get(TransformExpressionTree expression, Map<Stri
switch (expression.getExpressionType()) {
case FUNCTION:
String functionName = expression.getValue();
- Class<? extends TransformFunction> transformFunctionClass = TRANSFORM_FUNCTION_MAP.get(functionName);
+ Class<? extends TransformFunction> transformFunctionClass;
+ FunctionInfo functionInfo = null;
+ if (FunctionRegistry.containsFunctionByName(functionName)) {
+ transformFunctionClass = ScalarTransformFunctionWrapper.class;
+ functionInfo = FunctionRegistry.getFunctionByName(functionName);
+ } else {
+ transformFunctionClass = TRANSFORM_FUNCTION_MAP.get(functionName);
+ }
+
if (transformFunctionClass == null) {
throw new BadQueryRequestException("Unsupported transform function: " + functionName);
}
try {
transformFunction = transformFunctionClass.newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
+ if (functionInfo != null) {
+ ((ScalarTransformFunctionWrapper) transformFunction).setFunction(functionName, functionInfo);
+ }
+ } catch (Exception e) {
Review comment:
Don't catch all Exceptions because it will also catch the BadQueryRequestException. We treat BadQueryRequestException differently on the caller side
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
##########
@@ -0,0 +1,301 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class ScalarTransformFunctionWrapper extends BaseTransformFunction {
Review comment:
Rename it to `ScalarTransformFunction`?
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
##########
@@ -0,0 +1,301 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class ScalarTransformFunctionWrapper extends BaseTransformFunction {
+
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ TransformResultMetadata _transformResultMetadata;
+ String[] _stringResult;
+ int[] _integerResult;
+ float[] _floatResult;
+ double[] _doubleResult;
+ long[] _longResult;
+
+ public ScalarTransformFunctionWrapper() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
Review comment:
Suggest merging this into the constructor
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/ScalarTransformFunctionWrapper.java
##########
@@ -0,0 +1,301 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class ScalarTransformFunctionWrapper extends BaseTransformFunction {
+
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ TransformResultMetadata _transformResultMetadata;
+ String[] _stringResult;
+ int[] _integerResult;
+ float[] _floatResult;
+ double[] _doubleResult;
+ long[] _longResult;
+
+ public ScalarTransformFunctionWrapper() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _args[i] = Integer.parseInt(literal);
+ break;
+ case "java.lang.String":
+ _args[i] = literal;
+ break;
+ case "java.lang.Double":
+ _args[i] = Double.valueOf(literal);
+ break;
+ case "java.lang.Float":
+ _args[i] = Float.valueOf(literal);
+ break;
+ case "java.lang.Long":
+ _args[i] = Long.valueOf(literal);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ } else {
+ _nonLiteralArgIndices.add(i);
+ _nonLiteralTransformFunction.add(function);
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _nonLiteralArgType.add(FieldSpec.DataType.INT);
+ break;
+ case "java.lang.String":
+ _nonLiteralArgType.add(FieldSpec.DataType.STRING);
+ break;
+ case "java.lang.Double":
+ _nonLiteralArgType.add(FieldSpec.DataType.DOUBLE);
+ break;
+ case "java.lang.Float":
+ _nonLiteralArgType.add(FieldSpec.DataType.FLOAT);
+ break;
+ case "java.lang.Long":
+ _nonLiteralArgType.add(FieldSpec.DataType.LONG);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ }
+ }
+
+ Class returnType = _functionInvoker.getReturnType();
+ switch(returnType.getTypeName()) {
+ case "java.lang.Integer":
+ _transformResultMetadata = INT_SV_NO_DICTIONARY_METADATA;
+ break;
+ case "java.lang.Long":
+ _transformResultMetadata = LONG_SV_NO_DICTIONARY_METADATA;
+ break;
+ case "java.lang.Float":
+ case "java.lang.Double":
+ _transformResultMetadata = DOUBLE_SV_NO_DICTIONARY_METADATA;
+ break;
+ case "java.lang.Boolean":
+ case "java.lang.String":
+ _transformResultMetadata = STRING_SV_NO_DICTIONARY_METADATA;
+ break;
+ default:
+ throw new RuntimeException("Unsupported data type " + returnType.getTypeName() + "for transform function " + getName());
+ }
+ }
+
+ @Override
+ public TransformResultMetadata getResultMetadata() {
+ return _transformResultMetadata;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public int[] transformToIntValuesSV(ProjectionBlock projectionBlock) {
+ if (_integerResult == null) {
+ _integerResult = new int[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ int length = projectionBlock.getNumDocs();
+ int numNonLiteralArgs = _nonLiteralArgIndices.size();
+ Object[][] nonLiteralBlockValues = new Object[numNonLiteralArgs][];
+
+ transformNonLiteralArgsToValues(projectionBlock, numNonLiteralArgs, nonLiteralBlockValues);
+
+ //now invoke the actual function
+ for (int i = 0; i < length; i++) {
+ for (int k = 0; k < numNonLiteralArgs; k++) {
+ _args[_nonLiteralArgIndices.get(k)] = nonLiteralBlockValues[k][i];
+ }
+ _integerResult[i] = (Integer) _functionInvoker.process(_args);
+ }
+ return _integerResult;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public long[] transformToLongValuesSV(ProjectionBlock projectionBlock) {
+ if (_longResult == null) {
+ _longResult = new long[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ int length = projectionBlock.getNumDocs();
+ int numNonLiteralArgs = _nonLiteralArgIndices.size();
+ Object[][] nonLiteralBlockValues = new Object[numNonLiteralArgs][];
+
+ transformNonLiteralArgsToValues(projectionBlock, numNonLiteralArgs, nonLiteralBlockValues);
+
+ //now invoke the actual function
+ for (int i = 0; i < length; i++) {
+ for (int k = 0; k < numNonLiteralArgs; k++) {
+ _args[_nonLiteralArgIndices.get(k)] = nonLiteralBlockValues[k][i];
+ }
+ _longResult[i] = (Long) _functionInvoker.process(_args);
+ }
+ return _longResult;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public float[] transformToFloatValuesSV(ProjectionBlock projectionBlock) {
+ if (_floatResult == null) {
+ _floatResult = new float[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ int length = projectionBlock.getNumDocs();
+ int numNonLiteralArgs = _nonLiteralArgIndices.size();
+ Object[][] nonLiteralBlockValues = new Object[numNonLiteralArgs][];
+
+ transformNonLiteralArgsToValues(projectionBlock, numNonLiteralArgs, nonLiteralBlockValues);
+
+ //now invoke the actual function
+ for (int i = 0; i < length; i++) {
+ for (int k = 0; k < numNonLiteralArgs; k++) {
+ _args[_nonLiteralArgIndices.get(k)] = nonLiteralBlockValues[k][i];
+ }
+ _floatResult[i] = (Float) _functionInvoker.process(_args);
+ }
+ return _floatResult;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public double[] transformToDoubleValuesSV(ProjectionBlock projectionBlock) {
+ if (_doubleResult == null) {
+ _doubleResult = new double[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+ int length = projectionBlock.getNumDocs();
+ int numNonLiteralArgs = _nonLiteralArgIndices.size();
+ Object[][] nonLiteralBlockValues = new Object[numNonLiteralArgs][];
+
+ transformNonLiteralArgsToValues(projectionBlock, numNonLiteralArgs, nonLiteralBlockValues);
+
+ //now invoke the actual function
+ for (int i = 0; i < length; i++) {
+ for (int k = 0; k < numNonLiteralArgs; k++) {
+ _args[_nonLiteralArgIndices.get(k)] = nonLiteralBlockValues[k][i];
+ }
+ _doubleResult[i] = (Double) _functionInvoker.process(_args);
+ }
+ return _doubleResult;
+ }
+
+ @SuppressWarnings("Duplicates")
+ @Override
+ public String[] transformToStringValuesSV(ProjectionBlock projectionBlock) {
+ if (_stringResult == null) {
+ _stringResult = new String[DocIdSetPlanNode.MAX_DOC_PER_CALL];
+ }
+
+ int length = projectionBlock.getNumDocs();
+ int numNonLiteralArgs = _nonLiteralArgIndices.size();
+ Object[][] nonLiteralBlockValues = new Object[numNonLiteralArgs][];
+
+ transformNonLiteralArgsToValues(projectionBlock, numNonLiteralArgs, nonLiteralBlockValues);
+
+ //now invoke the actual function
+ for (int i = 0; i < length; i++) {
+ for (int k = 0; k < numNonLiteralArgs; k++) {
+ _args[_nonLiteralArgIndices.get(k)] = nonLiteralBlockValues[k][i];
+ }
+ _stringResult[i] = (String) _functionInvoker.process(_args);
+ }
+
+ return _stringResult;
+ }
+
+ private void transformNonLiteralArgsToValues(ProjectionBlock projectionBlock, int numNonLiteralArgs,
+ Object[][] nonLiteralBlockValues) {
+ for (int i = 0; i < numNonLiteralArgs; i++) {
+ TransformFunction transformFunc = _nonLiteralTransformFunction.get(i);
+ FieldSpec.DataType returnType = _nonLiteralArgType.get(i);
+ switch (returnType) {
+ case STRING:
+ nonLiteralBlockValues[i] = transformFunc.transformToStringValuesSV(projectionBlock);
+ break;
+ case INT:
+ int[] values = transformFunc.transformToIntValuesSV(projectionBlock);
+ nonLiteralBlockValues[i] = Arrays.stream(values).boxed().toArray(Integer[]::new);
+ break;
+ case DOUBLE:
+ double[] doubleValues = transformFunc.transformToDoubleValuesSV(projectionBlock);
+ nonLiteralBlockValues[i] = Arrays.stream(doubleValues).boxed().toArray(Double[]::new);
+ break;
+ case FLOAT:
+ float[] floatValues = transformFunc.transformToFloatValuesSV(projectionBlock);
Review comment:
Why using different way to box the values?
I would suggest changing all types to be the same as FLOAT. From the past experience, seems the streaming fashion has worse performance.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] KKcorps commented on a change in pull request #5440: Add UDFs for String Transformation
Posted by GitBox <gi...@apache.org>.
KKcorps commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r429854523
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunction.java
##########
@@ -0,0 +1,170 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class GenericTransformFunction extends BaseTransformFunction {
+
+ private FunctionInfo _info;
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List<Integer> _nonLiteralArgIndices;
+ List<FieldSpec.DataType> _nonLiteralArgType;
+ List<TransformFunction> _nonLiteralTransformFunction;
+ String[] _stringResult;
+
+ public GenericTransformFunction() {
+ _nonLiteralArgIndices = new ArrayList<>();
+ _nonLiteralArgType = new ArrayList<>();
+ _nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+ return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+ _name = functionName;
+ _info = info;
+ _functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List<TransformFunction> arguments, Map<String, DataSource> dataSourceMap) {
+ Preconditions.checkArgument(arguments.size() == _functionInvoker.getParameterTypes().length,
+ "The number of arguments are not same for scalar function and transform function: %s", getName());
+
+ _args = new Object[arguments.size()];
+ for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+ String literal = ((LiteralTransformFunction) function).getLiteral();
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _args[i] = Integer.parseInt(literal);
+ break;
+ case "java.lang.String":
+ _args[i] = literal;
+ break;
+ case "java.lang.Double":
+ _args[i] = Double.valueOf(literal);
+ break;
+ case "java.lang.Long":
+ _args[i] = Long.valueOf(literal);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ } else {
+ _nonLiteralArgIndices.add(i);
+ _nonLiteralTransformFunction.add(function);
+ Class paramType = _functionInvoker.getParameterTypes()[i];
+
+ switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+ _nonLiteralArgType.add(FieldSpec.DataType.INT);
+ break;
+ case "java.lang.String":
+ _nonLiteralArgType.add(FieldSpec.DataType.STRING);
+ break;
+ case "java.lang.Double":
+ _nonLiteralArgType.add(FieldSpec.DataType.DOUBLE);
+ break;
+ case "java.lang.Long":
+ _nonLiteralArgType.add(FieldSpec.DataType.LONG);
+ break;
+ default:
+ throw new RuntimeException(
+ "Unsupported data type " + paramType.getTypeName() + "for transform function " + getName());
+ }
+ }
+ }
+ }
+
+ @Override
+ public TransformResultMetadata getResultMetadata() {
+ return STRING_SV_NO_DICTIONARY_METADATA;
Review comment:
For return type just a switch won't work
Different return types will need a different function overrides
e.g. transformToStringValuesSV for string, transformToIntValuesSV for int and so on
Or am I missing something?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] kishoreg commented on a change in pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
kishoreg commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r432148125
##########
File path: pinot-common/src/main/java/org/apache/pinot/common/function/StringFunctions.java
##########
@@ -0,0 +1,123 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.common.function;
+
+import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.pinot.common.function.annotations.ScalarFunction;
+
+
+/**
+ *
+ */
+public class StringFunctions {
Review comment:
java doc
##########
File path: pinot-common/pom.xml
##########
@@ -248,6 +248,11 @@
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>0.9.11</version>
Review comment:
move version to pom.properties in root pom.xml
##########
File path: pinot-common/src/main/java/org/apache/pinot/common/function/annotations/ScalarFunction.java
##########
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.common.function.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface ScalarFunction {
Review comment:
add the ability to set name, add javadocs
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] Jackie-Jiang commented on a change in pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
Jackie-Jiang commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r433615835
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunctionFactory.java
##########
@@ -112,13 +115,24 @@ public static TransformFunction get(TransformExpressionTree expression, Map<Stri
switch (expression.getExpressionType()) {
case FUNCTION:
String functionName = expression.getValue();
- Class<? extends TransformFunction> transformFunctionClass = TRANSFORM_FUNCTION_MAP.get(functionName);
+ Class<? extends TransformFunction> transformFunctionClass;
+ FunctionInfo functionInfo = null;
+ if (FunctionRegistry.containsFunctionByName(functionName)) {
+ transformFunctionClass = ScalarTransformFunctionWrapper.class;
+ functionInfo = FunctionRegistry.getFunctionByName(functionName);
+ } else {
+ transformFunctionClass = TRANSFORM_FUNCTION_MAP.get(functionName);
+ }
+
if (transformFunctionClass == null) {
throw new BadQueryRequestException("Unsupported transform function: " + functionName);
}
try {
transformFunction = transformFunctionClass.newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
+ if (functionInfo != null) {
+ ((ScalarTransformFunctionWrapper) transformFunction).setFunction(functionName, functionInfo);
+ }
+ } catch (Exception e) {
Review comment:
Never mind, I thought this try-catch is around line 128
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] KKcorps edited a comment on pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
KKcorps edited a comment on pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#issuecomment-634088300
@fx19880617 @siddharthteotia Should I add tests in CalciteSQL for all the functions?
@KKcorps , sorry missed seeing this. Yes, the query compilation tests should be in CalciteSqlCompilerTest. Here we can verify that PinotQuery is being built correctly and that gets converted to BrokerRequest correctly. Most other tests in this file do this.
The other suggestion was to also add unit tests for exercising end-to-end execution path. Please consider adding these tests to an appropriate file in `/incubator-pinot/pinot-core/src/test/java/org/apache/pinot/queries/`. May be TransformQueriesTest
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] KKcorps commented on a change in pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
KKcorps commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r433466964
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/TransformFunctionFactory.java
##########
@@ -112,13 +115,24 @@ public static TransformFunction get(TransformExpressionTree expression, Map<Stri
switch (expression.getExpressionType()) {
case FUNCTION:
String functionName = expression.getValue();
- Class<? extends TransformFunction> transformFunctionClass = TRANSFORM_FUNCTION_MAP.get(functionName);
+ Class<? extends TransformFunction> transformFunctionClass;
+ FunctionInfo functionInfo = null;
+ if (FunctionRegistry.containsFunctionByName(functionName)) {
+ transformFunctionClass = ScalarTransformFunctionWrapper.class;
+ functionInfo = FunctionRegistry.getFunctionByName(functionName);
+ } else {
+ transformFunctionClass = TRANSFORM_FUNCTION_MAP.get(functionName);
+ }
+
if (transformFunctionClass == null) {
throw new BadQueryRequestException("Unsupported transform function: " + functionName);
}
try {
transformFunction = transformFunctionClass.newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
+ if (functionInfo != null) {
+ ((ScalarTransformFunctionWrapper) transformFunction).setFunction(functionName, functionInfo);
+ }
+ } catch (Exception e) {
Review comment:
Why will a constructor throw BadQueryRequestException since this catch block is meant for only the constructor?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[GitHub] [incubator-pinot] siddharthteotia edited a comment on pull request #5440: Add GenericTransformFunction wrapper for simple ScalarFunctions
Posted by GitBox <gi...@apache.org>.
siddharthteotia edited a comment on pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#issuecomment-636196791
> @fx19880617 @siddharthteotia Should I add tests in CalciteSQL for all the functions?
@KKcorps , sorry missed this. Yes, the query compilation tests should be in CalciteSqlCompilerTest. Here we can verify that PinotQuery is being built correctly and that gets converted to BrokerRequest correctly. Most other tests in this file do this validation.
The other suggestion was to also add unit tests for exercising end-to-end execution path. Please consider adding these tests to an appropriate file in `/incubator-pinot/pinot-core/src/test/java/org/apache/pinot/queries/`. May be TransformQueriesTest
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org