-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Allow different namespaces in builtin function namespace manager #25330
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
presto-spi/src/main/java/com/facebook/presto/spi/function/FunctionNamespace.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /* | ||
| * Licensed 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 com.facebook.presto.spi.function; | ||
|
|
||
| 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.TYPE) | ||
| public @interface FunctionNamespace | ||
| { | ||
| String value() default ""; | ||
| } |
48 changes: 48 additions & 0 deletions
48
presto-tests/src/main/java/com/facebook/presto/tests/function/TestFunctions.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Licensed 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 com.facebook.presto.tests.function; | ||
|
|
||
| import com.facebook.presto.common.type.StandardTypes; | ||
| import com.facebook.presto.spi.function.Description; | ||
| import com.facebook.presto.spi.function.FunctionNamespace; | ||
| import com.facebook.presto.spi.function.ScalarFunction; | ||
| import com.facebook.presto.spi.function.SqlType; | ||
| import io.airlift.slice.Slice; | ||
|
|
||
| import static com.facebook.presto.tests.function.TestScalarFunctions.TEST_FUNCTION_NAMESPACE; | ||
|
|
||
| @FunctionNamespace(TEST_FUNCTION_NAMESPACE) | ||
| public final class TestFunctions | ||
| { | ||
| private TestFunctions() | ||
| {} | ||
|
|
||
| @Description("Returns modulo of value by numberOfBuckets") | ||
| @ScalarFunction | ||
| @SqlType(StandardTypes.BIGINT) | ||
| public static long modulo( | ||
| @SqlType(StandardTypes.BIGINT) long value, | ||
| @SqlType(StandardTypes.BIGINT) long numberOfBuckets) | ||
| { | ||
| return value % numberOfBuckets; | ||
| } | ||
|
|
||
| @Description(("Return the input string")) | ||
| @ScalarFunction | ||
| @SqlType(StandardTypes.VARCHAR) | ||
| public static Slice identity(@SqlType(StandardTypes.VARCHAR) Slice slice) | ||
| { | ||
| return slice; | ||
| } | ||
| } |
106 changes: 106 additions & 0 deletions
106
presto-tests/src/main/java/com/facebook/presto/tests/function/TestScalarFunctions.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| /* | ||
| * Licensed 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 com.facebook.presto.tests.function; | ||
|
|
||
| import com.facebook.presto.common.type.TimeZoneKey; | ||
| import com.facebook.presto.common.type.Type; | ||
| import com.facebook.presto.common.type.TypeManager; | ||
| import com.facebook.presto.server.testing.TestingPrestoServer; | ||
| import com.facebook.presto.spi.Plugin; | ||
| import com.facebook.presto.testing.MaterializedResult; | ||
| import com.facebook.presto.tests.TestingPrestoClient; | ||
| import com.google.common.collect.ImmutableSet; | ||
| import com.google.inject.Key; | ||
| import org.intellij.lang.annotations.Language; | ||
| import org.testng.annotations.BeforeClass; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| import static com.facebook.presto.common.type.BigintType.BIGINT; | ||
| import static com.facebook.presto.common.type.VarcharType.VARCHAR; | ||
| import static com.facebook.presto.testing.TestingSession.testSessionBuilder; | ||
| import static java.lang.String.format; | ||
| import static org.testng.Assert.assertEquals; | ||
| import static org.testng.Assert.fail; | ||
|
|
||
| public class TestScalarFunctions | ||
| { | ||
| public static final String TEST_FUNCTION_NAMESPACE = "test.namespace"; | ||
|
|
||
| protected TestingPrestoServer server; | ||
| protected TestingPrestoClient client; | ||
| protected TypeManager typeManager; | ||
|
|
||
| @BeforeClass | ||
| public void setup() | ||
| throws Exception | ||
| { | ||
| server = new TestingPrestoServer(); | ||
| server.installPlugin(new TestFunctionPlugin()); | ||
| client = new TestingPrestoClient(server, testSessionBuilder() | ||
| .setTimeZoneKey(TimeZoneKey.getTimeZoneKey("America/Bahia_Banderas")) | ||
| .build()); | ||
| typeManager = server.getInstance(Key.get(TypeManager.class)); | ||
| } | ||
|
|
||
| public void assertInvalidFunction(String expr, String exceptionPattern) | ||
| { | ||
| try { | ||
| client.execute("SELECT " + expr); | ||
| fail("Function expected to fail but not"); | ||
| } | ||
| catch (Exception e) { | ||
| if (!(e.getMessage().matches(exceptionPattern))) { | ||
| fail(format("Expected exception message '%s' to match '%s' but not", | ||
| e.getMessage(), exceptionPattern)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private class TestFunctionPlugin | ||
| implements Plugin | ||
| { | ||
| @Override | ||
| public Set<Class<?>> getFunctions() | ||
| { | ||
| return ImmutableSet.<Class<?>>builder() | ||
| .add(TestFunctions.class) | ||
| .build(); | ||
| } | ||
| } | ||
|
|
||
| public void check(@Language("SQL") String query, Type expectedType, Object expectedValue) | ||
| { | ||
| MaterializedResult result = client.execute(query).getResult(); | ||
| assertEquals(result.getRowCount(), 1); | ||
| assertEquals(result.getTypes().get(0), expectedType); | ||
| Object actual = result.getMaterializedRows().get(0).getField(0); | ||
| assertEquals(actual, expectedValue); | ||
| } | ||
|
|
||
| @Test | ||
| public void testNewFunctionNamespaceFunction() | ||
| { | ||
| check("SELECT test.namespace.modulo(10,3)", BIGINT, 1L); | ||
| check("SELECT test.namespace.identity('test-functions')", VARCHAR, "test-functions"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testInvalidFunctionAndNamespace() | ||
| { | ||
| assertInvalidFunction("invalid.namespace.modulo(10,3)", "line 1:8: Function invalid.namespace.modulo not registered"); | ||
| assertInvalidFunction("test.namespace.dummy(10)", "line 1:8: Function test.namespace.dummy not registered"); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not used. Can you please add some tests with invalide function name and namespace?