Skip to content

Only discover public methods annotated with @ScalarFunction #8544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
siddharthteotia merged 2 commits into from
Apr 14, 2022
Merged

Only discover public methods annotated with @ScalarFunction #8544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4596643
only discover public functions
richardstartin Apr 14, 2022
9e38700
make test function public
richardstartin Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pinot-common/src/main/java/org/apache/pinot/common/function/FunctionInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public class FunctionInfo {
private final boolean _nullableParameters;

public FunctionInfo(Method method, Class<?> clazz, boolean nullableParameters) {
method.setAccessible(true);
_method = method;
_clazz = clazz;
_nullableParameters = nullableParameters;
Expand Down
1 change: 0 additions & 1 deletion pinot-common/src/main/java/org/apache/pinot/common/function/FunctionInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public FunctionInvoker(FunctionInfo functionInfo) {
Class<?> clazz = functionInfo.getClazz();
try {
Constructor<?> constructor = functionInfo.getClazz().getDeclaredConstructor();
constructor.setAccessible(true);
_instance = constructor.newInstance();
} catch (Exception e) {
throw new IllegalStateException("Caught exception while constructing class: " + clazz, e);
Expand Down
4 changes: 4 additions & 0 deletions pinot-common/src/main/java/org/apache/pinot/common/function/FunctionRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import com.google.common.base.Preconditions;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -59,6 +60,9 @@ private FunctionRegistry() {
.setScanners(new MethodAnnotationsScanner()));
Set<Method> methodSet = reflections.getMethodsAnnotatedWith(ScalarFunction.class);
for (Method method : methodSet) {
if (!Modifier.isPublic(method.getModifiers())) {
continue;
}
ScalarFunction scalarFunction = method.getAnnotation(ScalarFunction.class);
if (scalarFunction.enabled()) {
// Annotated function names
Expand Down
4 changes: 2 additions & 2 deletions ...-core/src/test/java/org/apache/pinot/core/data/function/InbuiltFunctionEvaluatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ public void testNullReturnedByInbuiltFunctionEvaluatorThatCannotTakeNull() {
}
}

private static class MyFunc {
public static class MyFunc {
String _baseString = "";

String appendToStringAndReturn(String addedString) {
public String appendToStringAndReturn(String addedString) {
_baseString += addedString;
return _baseString;
}
Expand Down