yashmayya commented on code in PR #13711: URL: https://github.com/apache/pinot/pull/13711#discussion_r1717173858
########## 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: Hmm, the `FunctionInfo` class is using `java.lang.reflect.Method` to store the method reference and this is invoked directly in `FunctionInvoker` via `Method::invoke`, so I don't think it's possible to avoid using reflection here. Although since this is in a static initializer block that will only be executed once in a JVM when each of these classes is initialized, it shouldn't be much of a performance concern right? ########## 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: Makes sense, updated everywhere. ########## 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: I've made this a parameterized test and added cases for `STRING`, `INT`, `LONG`, `FLOAT`, `DOUBLE`, `BOOLEAN`, `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; Review Comment: Are you suggesting using the `=` and `!=` operators directly instead of doing a "fuzzy" comparison? > We can keep the existing behavior in `getFunctionInfo(int numArguments)` for backward compatibility Currently, we're simply returning the `double` based comparison function in this case for backward compatibility, so we'll need to create a new "fuzzy" equals / notEquals implementation and return that instead? Also I thought we're planning to move all usages of `getFunctionInfo(int numArguments)` to `getFunctionInfo(ColumnDataType[] argumentTypes)` ########## 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: That makes sense, I'd implemented this since the `PinotScalarFunction` interface doesn't have a default implementation for the `toPinotSqlFunction` method (and I hadn't noticed that it is annotated as `Nullable` with `null` handled appropriately at the call-site in `PinotOperatorTable`). I've added a default implementation of the method in the interface that returns `null` and removed this overridden implementation. ########## 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: Nope, in such queries the filter is simply removed even before any optimization rules are applied in this part of the `SqlToRelConverter` - https://github.com/apache/pinot/blob/14e51e87b8334b7fbcc5b3dfe67a7061710c5279/pinot-query-planner/src/main/java/org/apache/pinot/query/QueryEnvironment.java#L294 -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
