Jackie-Jiang commented on code in PR #13711: URL: https://github.com/apache/pinot/pull/13711#discussion_r1716063997
########## pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiStageEngineIntegrationTest.java: ########## @@ -704,6 +704,97 @@ public void testVariadicFunction() throws Exception { assertEquals(jsonNode.get("numRowsResultSet").asInt(), 3); } + @Test + public void testPolymorphicScalarComparisonFunctions() throws Exception { Review Comment: Suggest adding test for all single value types, including BOOLEAN and TIMESTAMP ########## pinot-common/src/main/java/org/apache/pinot/common/function/scalar/comparison/PolymorphicComparisonScalarFunction.java: ########## @@ -0,0 +1,75 @@ +/** + * 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.scalar.comparison; + +import javax.annotation.Nullable; +import org.apache.calcite.sql.type.ReturnTypes; +import org.apache.calcite.sql.type.SameOperandTypeChecker; +import org.apache.pinot.common.function.FunctionInfo; +import org.apache.pinot.common.function.PinotScalarFunction; +import org.apache.pinot.common.function.sql.PinotSqlFunction; +import org.apache.pinot.common.utils.DataSchema; + + +/** + * Base class for polymorphic comparison scalar functions + */ +public abstract class PolymorphicComparisonScalarFunction implements PinotScalarFunction { + + protected static final double DOUBLE_COMPARISON_TOLERANCE = 1e-7d; + + @Nullable + @Override + public PinotSqlFunction toPinotSqlFunction() { + return new PinotSqlFunction(getName(), ReturnTypes.BOOLEAN_FORCE_NULLABLE, new SameOperandTypeChecker(2)); + } + + @Nullable + @Override + public FunctionInfo getFunctionInfo(DataSchema.ColumnDataType[] argumentTypes) { Review Comment: (minor) I usually directly import `DataSchema.ColumnDataType` to be more concise ########## pinot-common/src/main/java/org/apache/pinot/common/function/scalar/comparison/PolymorphicComparisonScalarFunction.java: ########## @@ -0,0 +1,75 @@ +/** + * 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.scalar.comparison; + +import javax.annotation.Nullable; +import org.apache.calcite.sql.type.ReturnTypes; +import org.apache.calcite.sql.type.SameOperandTypeChecker; +import org.apache.pinot.common.function.FunctionInfo; +import org.apache.pinot.common.function.PinotScalarFunction; +import org.apache.pinot.common.function.sql.PinotSqlFunction; +import org.apache.pinot.common.utils.DataSchema; + + +/** + * Base class for polymorphic comparison scalar functions + */ +public abstract class PolymorphicComparisonScalarFunction implements PinotScalarFunction { + + protected static final double DOUBLE_COMPARISON_TOLERANCE = 1e-7d; + + @Nullable + @Override + public PinotSqlFunction toPinotSqlFunction() { + return new PinotSqlFunction(getName(), ReturnTypes.BOOLEAN_FORCE_NULLABLE, new SameOperandTypeChecker(2)); Review Comment: I don't think we need to register a `PinotSqlFunction` because all the comparison functions are standard function ########## pinot-common/src/main/java/org/apache/pinot/common/function/scalar/comparison/PolymorphicComparisonScalarFunction.java: ########## @@ -0,0 +1,75 @@ +/** + * 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.scalar.comparison; + +import javax.annotation.Nullable; +import org.apache.calcite.sql.type.ReturnTypes; +import org.apache.calcite.sql.type.SameOperandTypeChecker; +import org.apache.pinot.common.function.FunctionInfo; +import org.apache.pinot.common.function.PinotScalarFunction; +import org.apache.pinot.common.function.sql.PinotSqlFunction; +import org.apache.pinot.common.utils.DataSchema; + + +/** + * Base class for polymorphic comparison scalar functions + */ +public abstract class PolymorphicComparisonScalarFunction implements PinotScalarFunction { + + protected static final double DOUBLE_COMPARISON_TOLERANCE = 1e-7d; Review Comment: Not introduced in this PR, but I don't think this is the standard SQL behavior. I guess it might be introduced to workaround the float - double casting problem. Should we consider fixing it to follow the standard behavior? We can keep the existing behavior in `getFunctionInfo(int numArguments)` for backward compatibility. ########## pinot-common/src/main/java/org/apache/pinot/common/function/scalar/comparison/NotEqualsScalarFunction.java: ########## @@ -0,0 +1,154 @@ +/** + * 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.scalar.comparison; + +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import org.apache.pinot.common.function.FunctionInfo; +import org.apache.pinot.common.utils.DataSchema; +import org.apache.pinot.spi.annotations.ScalarFunction; + +/** + * Polymorphic notEquals (!=) scalar function implementation + */ +@ScalarFunction +public class NotEqualsScalarFunction extends PolymorphicComparisonScalarFunction { + + private static final Map<DataSchema.ColumnDataType, FunctionInfo> TYPE_FUNCTION_INFO_MAP = new HashMap<>(); + + static { + try { + // Set nullable parameters to false for each function because the return value should be null if any argument + // is null + TYPE_FUNCTION_INFO_MAP.put(DataSchema.ColumnDataType.INT, new FunctionInfo( + NotEqualsScalarFunction.class.getMethod("intNotEquals", int.class, int.class), Review Comment: Is there a way to directly access a method without reflection? ########## pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MultiStageEngineIntegrationTest.java: ########## @@ -704,6 +704,97 @@ public void testVariadicFunction() throws Exception { assertEquals(jsonNode.get("numRowsResultSet").asInt(), 3); } + @Test + public void testPolymorphicScalarComparisonFunctions() throws Exception { + // Queries written this way will trigger the PinotEvaluateLiteralRule which will call the scalar equals function Review Comment: Will `SELECT ... WHERE 'test' = 'test'` trigger the same rule? -- 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. To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org