add log statement inside + changes to the tester

made this test only run when sidecar is enabled

custom add fn file

Author: soumiiow

presto-native-execution/presto_cpp/main/dynamic_registry/examples/CMakeLists.txt

@@ -11,10 +11,10 @@
 # limitations under the License.
 
 add_library(presto_example_function_dynamic SHARED DynamicFunction.cpp)
-add_library(presto_example_varchar_function_dynamic SHARED
-            DynamicVarcharFunction.cpp)
-add_library(presto_example_non_default_function_dynamic SHARED
-            DynamicNonDefaultFunction.cpp)
+add_library(presto_example_varchar_function_dynamic SHARED DynamicVarcharFunction.cpp)
+add_library(presto_example_non_default_function_dynamic SHARED DynamicNonDefaultFunction.cpp)
+add_library(add_function_dynamic SHARED CustomAddDynamic.cpp)
+
 
 set(CMAKE_DYLIB_TEST_LINK_LIBRARIES fmt::fmt gflags::gflags)
 target_link_libraries(presto_example_function_dynamic
@@ -23,6 +23,8 @@ target_link_libraries(presto_example_varchar_function_dynamic
                       PRIVATE ${CMAKE_DYLIB_TEST_LINK_LIBRARIES})
 target_link_libraries(presto_example_non_default_function_dynamic
                       PRIVATE ${CMAKE_DYLIB_TEST_LINK_LIBRARIES})
+target_link_libraries(add_function_dynamic
+                      PRIVATE ${CMAKE_DYLIB_TEST_LINK_LIBRARIES})
 
 if(APPLE)
   set(COMMON_LIBRARY_LINK_OPTIONS "-Wl,-undefined,dynamic_lookup")
@@ -36,3 +38,5 @@ target_link_options(presto_example_varchar_function_dynamic PRIVATE
                     ${COMMON_LIBRARY_LINK_OPTIONS})
 target_link_options(presto_example_non_default_function_dynamic PRIVATE
                     ${COMMON_LIBRARY_LINK_OPTIONS})
+target_link_options(add_function_dynamic PRIVATE
+                    ${COMMON_LIBRARY_LINK_OPTIONS})

presto-native-execution/presto_cpp/main/dynamic_registry/examples/CustomAddDynamic.cpp

@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+ #include "presto_cpp/main/dynamic_registry/DynamicFunctionRegistrar.h"
+ // This file defines a mock function that will be dynamically linked and
+ // registered. There are no restrictions as to how the function needs to be
+ // defined, but the library (.so) needs to provide a `void registerExtensions()`
+ // C function in the top-level namespace.
+ //
+ // (note the extern "C" directive to prevent the compiler from mangling the
+ // symbol name).
+
+namespace facebook::velox::common::dynamicRegistry {
+
+    template <typename T>
+    struct DynamicFunction {
+      VELOX_DEFINE_FUNCTION_TYPES(T);
+      FOLLY_ALWAYS_INLINE bool call(
+          int64_t& result,
+          const arg_type<int64_t>& x1,
+          const arg_type<int64_t>& x2) {
+            LOG(INFO) <<"inside the custom_add fn!!!";
+        result = x1 + x2;
+        return true;
+      }
+    };
+} // namespace facebook::velox::common::dynamicRegistry
+
+extern "C" {
+    // In this case, we assume that facebook::presto::registerPrestoFunction
+    // will be available and resolve when this library gets loaded.
+    void registerExtensions() {
+      facebook::presto::registerPrestoFunction<
+          facebook::velox::common::dynamicRegistry::DynamicFunction,
+          int64_t,
+          int64_t,
+          int64_t>("custom_add");
+    }
+}

presto-native-tests/src/test/java/com/facebook/presto/nativetests/TestDynamicFunctions.java

@@ -1,3 +1,16 @@
+/*
+ * 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.nativetests;
 
 import com.facebook.presto.nativeworker.NativeQueryRunnerUtils;
@@ -38,18 +51,26 @@ protected void createTables()
     protected QueryRunner createQueryRunner() throws Exception
     {
         Path workingDir = Paths.get(System.getProperty("user.dir"));
-        // TODO make sure in CI working dir is the right path. should be PRESTO_HOME there but locally, its at working dir.
+//        Path pluginDir = workingDir
+//                .resolve("presto-native-tests")
+//                .resolve("src")
+//                .resolve("test")
+//                .resolve("resources")
+//                .resolve("plugin");
         Path pluginDir = workingDir
-                .resolve("src")
-                .resolve("test")
-                .resolve("resources")
-                .resolve("plugin");
+                .resolve("presto-native-execution")
+                .resolve("_build")
+                .resolve("debug") //TODO change to release for CI
+                .resolve("presto_cpp")
+                .resolve("main")
+                .resolve("dynamic_registry")
+                .resolve("examples");
         boolean sidecar = parseBoolean(System.getProperty("sidecarEnabled"));
         QueryRunner queryRunner = PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
                 .setStorageFormat(System.getProperty("storageFormat"))
                 .setAddStorageFormatToPath(true)
                 .setUseThrift(true)
-                .setCoordinatorSidecarEnabled(sidecar)
+                .setCoordinatorSidecarEnabled(true)
                 .setPluginDirectory(Optional.of(pluginDir.toString()))
                 .build();
         if (sidecar) {
@@ -58,6 +79,18 @@ protected QueryRunner createQueryRunner() throws Exception
         return queryRunner;
     }
 
+    @Override
+    @Parameters("sidecarEnabled")
+    @Test
+    public void testCustomAdd()
+    {
+        if (parseBoolean(System.getProperty("sidecarEnabled"))) {
+            assertQuery(
+                    "SELECT custom_add(orderkey, custkey) FROM orders",
+                    "SELECT orderkey + custkey FROM orders");
+        }
+    }
+
     // Aggregate functions are not supported currently.
     @Override
     @Test (enabled = false)

presto-native-tests/src/test/resources/plugin/libadd_function_dynamic.dylib

@@ -1,3 +1,16 @@
+/*
+ * 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;
 
 import org.intellij.lang.annotations.Language;

presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestCustomFunctions.java

@@ -1,3 +1,16 @@
+/*
+ * 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;
 
 import com.facebook.presto.testing.QueryRunner;