feat(native): Support custom schemas in native sidecar function registry (#26236)

Joe-Abraham · web-flow · commit 6d3b641471ff · 2025-10-27T13:33:17.000-07:00
## Description Fixes - #25429 - Add hive variant of initcap to `hive.default.` namespace ## Motivation and Context Add support for custom schemas in native sidecar function registry ## Impact Enables functions to be registered in connector specific or custom namespaces. ## Test Plan Included with this PR. ``` == RELEASE NOTES == Prestissimo (Native Execution) Changes * Add support for custom schemas in native sidecar function registry. ```
diff --git a/presto-docs/src/main/sphinx/presto_cpp/sidecar.rst b/presto-docs/src/main/sphinx/presto_cpp/sidecar.rst
@@ -24,6 +24,14 @@ The following HTTP endpoints are implemented by the Presto C++ sidecar.
    Presto C++ worker. Each function's metadata is serialized to JSON in
    format ``JsonBasedUdfFunctionMetadata``.
 
+.. function:: GET /v1/functions/{catalog}
+
+   Returns a list of function metadata for all functions registered in the
+   Presto C++ worker that belong to the specified catalog. Each function's
+   metadata is serialized to JSON in format ``JsonBasedUdfFunctionMetadata``.
+   This endpoint allows filtering functions by catalog to support namespace
+   separation.
+
 .. function:: POST /v1/velox/plan
 
    Converts a Presto plan fragment to its corresponding Velox plan and
diff --git a/presto-native-execution/presto_cpp/main/CMakeLists.txt b/presto-native-execution/presto_cpp/main/CMakeLists.txt
@@ -66,6 +66,7 @@ target_link_libraries(
   presto_operators
   presto_session_properties
   presto_velox_plan_conversion
+  presto_hive_functions
   velox_abfs
   velox_aggregates
   velox_caching
diff --git a/presto-native-execution/presto_cpp/main/PrestoServer.cpp b/presto-native-execution/presto_cpp/main/PrestoServer.cpp
@@ -28,6 +28,7 @@
 #include "presto_cpp/main/common/Utils.h"
 #include "presto_cpp/main/connectors/Registration.h"
 #include "presto_cpp/main/connectors/SystemConnector.h"
+#include "presto_cpp/main/connectors/hive/functions/HiveFunctionRegistration.h"
 #include "presto_cpp/main/functions/FunctionMetadata.h"
 #include "presto_cpp/main/http/HttpConstants.h"
 #include "presto_cpp/main/http/filters/AccessLogFilter.h"
@@ -50,6 +51,7 @@
 #include "velox/common/file/FileSystems.h"
 #include "velox/common/memory/SharedArbitrator.h"
 #include "velox/connectors/Connector.h"
+#include "velox/connectors/hive/HiveConnector.h"
 #include "velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.h"
 #include "velox/connectors/hive/storage_adapters/gcs/RegisterGcsFileSystem.h"
 #include "velox/connectors/hive/storage_adapters/hdfs/RegisterHdfsFileSystem.h"
@@ -1359,6 +1361,12 @@ void PrestoServer::registerFunctions() {
       prestoBuiltinFunctionPrefix_);
   velox::window::prestosql::registerAllWindowFunctions(
       prestoBuiltinFunctionPrefix_);
+
+  if (velox::connector::hasConnector(
+          velox::connector::hive::HiveConnectorFactory::kHiveConnectorName) ||
+      velox::connector::hasConnector("hive-hadoop2")) {
+    hive::functions::registerHiveNativeFunctions();
+  }
 }
 
 void PrestoServer::registerRemoteFunctions() {
@@ -1691,6 +1699,18 @@ void PrestoServer::registerSidecarEndpoints() {
          proxygen::ResponseHandler* downstream) {
         http::sendOkResponse(downstream, getFunctionsMetadata());
       });
+  httpServer_->registerGet(
+      R"(/v1/functions/([^/]+))",
+      [](proxygen::HTTPMessage* /*message*/,
+         const std::vector<std::string>& pathMatch) {
+        return new http::CallbackRequestHandler(
+            [catalog = pathMatch[1]](
+                proxygen::HTTPMessage* /*message*/,
+                std::vector<std::unique_ptr<folly::IOBuf>>& /*body*/,
+                proxygen::ResponseHandler* downstream) {
+              http::sendOkResponse(downstream, getFunctionsMetadata(catalog));
+            });
+      });
   httpServer_->registerPost(
       "/v1/velox/plan",
       [server = this](
diff --git a/presto-native-execution/presto_cpp/main/connectors/CMakeLists.txt b/presto-native-execution/presto_cpp/main/connectors/CMakeLists.txt
@@ -35,3 +35,5 @@ target_link_libraries(
   velox_type_fbhive
   velox_tpcds_connector
 )
+
+add_subdirectory(hive)
diff --git a/presto-native-execution/presto_cpp/main/connectors/hive/CMakeLists.txt b/presto-native-execution/presto_cpp/main/connectors/hive/CMakeLists.txt
@@ -0,0 +1,13 @@
+# 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.
+
+add_subdirectory(functions)
diff --git a/presto-native-execution/presto_cpp/main/connectors/hive/functions/CMakeLists.txt b/presto-native-execution/presto_cpp/main/connectors/hive/functions/CMakeLists.txt
@@ -0,0 +1,22 @@
+# 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.
+
+add_library(presto_hive_functions HiveFunctionRegistration.cpp)
+target_link_libraries(
+  presto_hive_functions
+  presto_dynamic_function_registrar
+  velox_functions_string
+)
+
+if(PRESTO_ENABLE_TESTING)
+  add_subdirectory(tests)
+endif()
diff --git a/presto-native-execution/presto_cpp/main/connectors/hive/functions/HiveFunctionRegistration.cpp b/presto-native-execution/presto_cpp/main/connectors/hive/functions/HiveFunctionRegistration.cpp
@@ -0,0 +1,36 @@
+/*
+ * 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/connectors/hive/functions/HiveFunctionRegistration.h"
+
+#include "presto_cpp/main/connectors/hive/functions/InitcapFunction.h"
+#include "presto_cpp/main/functions/dynamic_registry/DynamicFunctionRegistrar.h"
+
+using namespace facebook::velox;
+namespace facebook::presto::hive::functions {
+
+namespace {
+void registerHiveFunctions() {
+  // Register functions under the 'hive.default' namespace.
+  facebook::presto::registerPrestoFunction<InitCapFunction, Varchar, Varchar>(
+      "initcap", "hive.default");
+}
+} // namespace
+
+void registerHiveNativeFunctions() {
+  static std::once_flag once;
+  std::call_once(once, []() { registerHiveFunctions(); });
+}
+
+} // namespace facebook::presto::hive::functions
diff --git a/presto-native-execution/presto_cpp/main/connectors/hive/functions/HiveFunctionRegistration.h b/presto-native-execution/presto_cpp/main/connectors/hive/functions/HiveFunctionRegistration.h
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+#pragma once
+
+namespace facebook::presto::hive::functions {
+
+// Registers Hive-specific native functions into the 'hive.default' namespace.
+// This method is safe to call multiple times; it performs one-time registration
+// guarded by an internal call_once.
+void registerHiveNativeFunctions();
+
+} // namespace facebook::presto::hive::functions
diff --git a/presto-native-execution/presto_cpp/main/connectors/hive/functions/InitcapFunction.h b/presto-native-execution/presto_cpp/main/connectors/hive/functions/InitcapFunction.h
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include "velox/functions/Macros.h"
+#include "velox/functions/lib/string/StringImpl.h"
+
+namespace facebook::presto::hive::functions {
+
+/// The InitCapFunction capitalizes the first character of each word in a
+/// string, and lowercases the rest.
+template <typename T>
+struct InitCapFunction {
+  VELOX_DEFINE_FUNCTION_TYPES(T);
+
+  // ASCII input always produces ASCII result. This is required for ASCII fast
+  // path
+  static constexpr bool is_default_ascii_behavior = true;
+
+  FOLLY_ALWAYS_INLINE void call(
+      out_type<velox::Varchar>& result,
+      const arg_type<velox::Varchar>& input) {
+    velox::functions::stringImpl::initcap<
+        /*strictSpace=*/false,
+        /*isAscii=*/false,
+        /*turkishCasing=*/true,
+        /*greekFinalSigma=*/true>(result, input);
+  }
+
+  FOLLY_ALWAYS_INLINE void callAscii(
+      out_type<velox::Varchar>& result,
+      const arg_type<velox::Varchar>& input) {
+    velox::functions::stringImpl::initcap<
+        /*strictSpace=*/false,
+        /*isAscii=*/true,
+        /*turkishCasing=*/true,
+        /*greekFinalSigma=*/true>(result, input);
+  }
+};
+
+} // namespace facebook::presto::hive::functions
diff --git a/presto-native-execution/presto_cpp/main/connectors/hive/functions/tests/CMakeLists.txt b/presto-native-execution/presto_cpp/main/connectors/hive/functions/tests/CMakeLists.txt
@@ -0,0 +1,28 @@
+# 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.
+
+add_executable(presto_hive_functions_test InitcapTest.cpp)
+
+add_test(
+  NAME presto_hive_functions_test
+  COMMAND presto_hive_functions_test
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_link_libraries(
+  presto_hive_functions_test
+  presto_hive_functions
+  presto_common
+  velox_functions_test_lib
+  GTest::gtest
+  GTest::gtest_main
+)
diff --git a/presto-native-execution/presto_cpp/main/connectors/hive/functions/tests/InitcapTest.cpp b/presto-native-execution/presto_cpp/main/connectors/hive/functions/tests/InitcapTest.cpp
@@ -0,0 +1,80 @@
+/*
+ * 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 <gtest/gtest.h>
+
+#include "presto_cpp/main/connectors/hive/functions/HiveFunctionRegistration.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
+
+namespace facebook::presto::functions::test {
+class InitcapTest : public velox::functions::test::FunctionBaseTest {
+ protected:
+  static void SetUpTestCase() {
+    velox::functions::test::FunctionBaseTest::SetUpTestCase();
+    facebook::presto::hive::functions::registerHiveNativeFunctions();
+  }
+};
+
+TEST_F(InitcapTest, initcap) {
+  const auto initcap = [&](const std::optional<std::string>& value) {
+    return evaluateOnce<std::string>("\"hive.default.initcap\"(c0)", value);
+  };
+
+  // Unicode only.
+  EXPECT_EQ(
+      initcap("àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ"),
+      "Àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ");
+  EXPECT_EQ(initcap("αβγδεζηθικλμνξοπρςστυφχψ"), "Αβγδεζηθικλμνξοπρςστυφχψ");
+  // Mix of ascii and unicode.
+  EXPECT_EQ(initcap("αβγδεζ world"), "Αβγδεζ World");
+  EXPECT_EQ(initcap("αfoo wβ"), "Αfoo Wβ");
+  // Ascii only.
+  EXPECT_EQ(initcap("hello world"), "Hello World");
+  EXPECT_EQ(initcap("HELLO WORLD"), "Hello World");
+  EXPECT_EQ(initcap("1234"), "1234");
+  EXPECT_EQ(initcap("a b c d"), "A B C D");
+  EXPECT_EQ(initcap("abcd"), "Abcd");
+  // Numbers.
+  EXPECT_EQ(initcap("123"), "123");
+  EXPECT_EQ(initcap("1abc"), "1abc");
+  // Edge cases.
+  EXPECT_EQ(initcap(""), "");
+  EXPECT_EQ(initcap(std::nullopt), std::nullopt);
+
+  // Test with various whitespace characters
+  EXPECT_EQ(initcap("YQ\tY"), "Yq\tY");
+  EXPECT_EQ(initcap("YQ\nY"), "Yq\nY");
+  EXPECT_EQ(initcap("YQ\rY"), "Yq\rY");
+  EXPECT_EQ(initcap("hello\tworld\ntest"), "Hello\tWorld\nTest");
+  EXPECT_EQ(initcap("foo\r\nbar"), "Foo\r\nBar");
+
+  // Test with multiple consecutive whitespaces
+  EXPECT_EQ(initcap("hello  world"), "Hello  World");
+  EXPECT_EQ(initcap("a   b   c"), "A   B   C");
+  EXPECT_EQ(initcap("test\t\tvalue"), "Test\t\tValue");
+  EXPECT_EQ(initcap("line\n\n\nbreak"), "Line\n\n\nBreak");
+
+  // Test with leading and trailing whitespaces
+  EXPECT_EQ(initcap("  hello"), "  Hello");
+  EXPECT_EQ(initcap("world  "), "World  ");
+  EXPECT_EQ(initcap("  spaces  "), "  Spaces  ");
+  EXPECT_EQ(initcap("\thello"), "\tHello");
+  EXPECT_EQ(initcap("\nworld"), "\nWorld");
+  EXPECT_EQ(initcap("test\n"), "Test\n");
+
+  // Test with mixed whitespace types
+  EXPECT_EQ(initcap("hello \t\nworld"), "Hello \t\nWorld");
+  EXPECT_EQ(initcap("a\tb\nc\rd"), "A\tB\nC\rD");
+  EXPECT_EQ(initcap(" \t\n "), " \t\n ");
+}
+} // namespace facebook::presto::functions::test
diff --git a/presto-native-execution/presto_cpp/main/functions/FunctionMetadata.cpp b/presto-native-execution/presto_cpp/main/functions/FunctionMetadata.cpp
@@ -265,9 +265,14 @@ json buildWindowMetadata(
 
 } // namespace
 
-json getFunctionsMetadata() {
+json getFunctionsMetadata(const std::optional<std::string>& catalog) {
   json j;
 
+  // Lambda to check if a function should be skipped based on catalog filter
+  auto skipCatalog = [&catalog](const std::string& functionCatalog) {
+    return catalog.has_value() && functionCatalog != catalog.value();
+  };
+
   // Get metadata for all registered scalar functions in velox.
   const auto signatures = getFunctionSignatures();
   static const std::unordered_set<std::string> kBlockList = {
@@ -285,6 +290,9 @@ json getFunctionsMetadata() {
     }
 
     const auto parts = getFunctionNameParts(name);
+    if (skipCatalog(parts[0])) {
+      continue;
+    }
     const auto schema = parts[1];
     const auto function = parts[2];
     j[function] = buildScalarMetadata(name, schema, entry.second);
@@ -295,6 +303,9 @@ json getFunctionsMetadata() {
     if (!aggregateFunctions.at(entry.first).metadata.companionFunction) {
       const auto name = entry.first;
       const auto parts = getFunctionNameParts(name);
+      if (skipCatalog(parts[0])) {
+        continue;
+      }
       const auto schema = parts[1];
       const auto function = parts[2];
       j[function] =
@@ -309,6 +320,9 @@ json getFunctionsMetadata() {
     if (aggregateFunctions.count(entry.first) == 0) {
       const auto name = entry.first;
       const auto parts = getFunctionNameParts(entry.first);
+      if (skipCatalog(parts[0])) {
+        continue;
+      }
       const auto schema = parts[1];
       const auto function = parts[2];
       j[function] = buildWindowMetadata(name, schema, entry.second.signatures);
diff --git a/presto-native-execution/presto_cpp/main/functions/FunctionMetadata.h b/presto-native-execution/presto_cpp/main/functions/FunctionMetadata.h
@@ -14,11 +14,13 @@
 
 #pragma once
 
+#include <optional>
 #include "presto_cpp/external/json/nlohmann/json.hpp"
 
 namespace facebook::presto {
 
 // Returns metadata for all registered functions as json.
-nlohmann::json getFunctionsMetadata();
+nlohmann::json getFunctionsMetadata(
+    const std::optional<std::string>& catalog = std::nullopt);
 
 } // namespace facebook::presto
diff --git a/presto-native-execution/presto_cpp/main/functions/tests/FunctionMetadataTest.cpp b/presto-native-execution/presto_cpp/main/functions/tests/FunctionMetadataTest.cpp
diff --git a/presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/functionNamespace/NativeFunctionDefinitionProvider.java b/presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/functionNamespace/NativeFunctionDefinitionProvider.java
diff --git a/presto-native-sidecar-plugin/src/test/java/com/facebook/presto/sidecar/NativeSidecarPluginQueryRunnerUtils.java b/presto-native-sidecar-plugin/src/test/java/com/facebook/presto/sidecar/NativeSidecarPluginQueryRunnerUtils.java
diff --git a/presto-native-sidecar-plugin/src/test/java/com/facebook/presto/sidecar/TestNativeSidecarHiveCatalog.java b/presto-native-sidecar-plugin/src/test/java/com/facebook/presto/sidecar/TestNativeSidecarHiveCatalog.java
diff --git a/presto-native-sidecar-plugin/src/test/java/com/facebook/presto/sidecar/TestNativeSidecarNotSetForCatalog.java b/presto-native-sidecar-plugin/src/test/java/com/facebook/presto/sidecar/TestNativeSidecarNotSetForCatalog.java
diff --git a/presto-openapi/src/main/resources/rest_function_server.yaml b/presto-openapi/src/main/resources/rest_function_server.yaml

Original file line number	Diff line number	Diff line change
`@@ -35,3 +35,5 @@ target_link_libraries(`
`35`	`35`	`velox_type_fbhive`
`36`	`36`	`velox_tpcds_connector`
`37`	`37`	`)`
	`38`	`+`
	`39`	`+add_subdirectory(hive)`