Fix unit test case

facebookincubator · Feb 7, 2025 · 0b99987 · 0b99987
1 parent ccc3096
commit 0b99987
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/velox/functions/remote/client/tests/RemoteFunctionRestTest.cpp b/velox/functions/remote/client/tests/RemoteFunctionRestTest.cpp
@@ -55,39 +55,47 @@ class RemoteFunctionRestTest
   void registerRemoteFunctions() const {
     RemoteVectorFunctionMetadata metadata;
     metadata.serdeFormat = remote::PageFormat::PRESTO_PAGE;
-    metadata.location = location_;
 
+    auto functionName = "remote_abs";
+    metadata.location = location_ + '/' + functionName;
     auto absSignature = {exec::FunctionSignatureBuilder()
                              .returnType("integer")
                              .argumentType("integer")
                              .build()};
-    registerRemoteFunction("remote_abs", absSignature, metadata);
+    registerRemoteFunction(functionName, absSignature, metadata);
 
+    functionName = "remote_plus";
+    metadata.location = location_ + '/' + functionName;
     auto plusSignatures = {exec::FunctionSignatureBuilder()
                                .returnType("bigint")
                                .argumentType("bigint")
                                .argumentType("bigint")
                                .build()};
     registerRemoteFunction("remote_plus", plusSignatures, metadata);
 
+    functionName = "remote_wrong_port";
     RemoteVectorFunctionMetadata wrongMetadata = metadata;
     wrongMetadata.serdeFormat = remote::PageFormat::PRESTO_PAGE;
-    wrongMetadata.location = wrongLocation_;
-    registerRemoteFunction("remote_wrong_port", plusSignatures, wrongMetadata);
+    wrongMetadata.location = wrongLocation_ + functionName;
+    registerRemoteFunction(functionName, plusSignatures, wrongMetadata);
 
+    functionName = "remote_divide";
+    metadata.location = location_ + '/' + functionName;
     auto divSignatures = {exec::FunctionSignatureBuilder()
                               .returnType("double")
                               .argumentType("double")
                               .argumentType("double")
                               .build()};
-    registerRemoteFunction("remote_divide", divSignatures, metadata);
+    registerRemoteFunction(functionName, divSignatures, metadata);
 
+    functionName = "remote_substr";
+    metadata.location = location_ + '/' + functionName;
     auto substrSignatures = {exec::FunctionSignatureBuilder()
                                  .returnType("varchar")
                                  .argumentType("varchar")
                                  .argumentType("integer")
                                  .build()};
-    registerRemoteFunction("remote_substr", substrSignatures, metadata);
+    registerRemoteFunction(functionName, substrSignatures, metadata);
 
     // Registers the actual function under a different prefix. This is only
     // needed for tests since the HTTP service runs in the same process.

diff --git a/velox/functions/remote/server/RemoteFunctionRestService.cpp b/velox/functions/remote/server/RemoteFunctionRestService.cpp
@@ -110,9 +110,8 @@ void session::handle_request(
   folly::split('/', path, pathComponents);
 
   std::string functionName;
-  if (pathComponents.size() >= 7 && pathComponents[1] == "v1" &&
-      pathComponents[2] == "functions") {
-    functionName = pathComponents[4];
+  if (pathComponents.size() <= 2) {
+    functionName = pathComponents[1];
   } else {
     res_.result(boost::beast::http::status::bad_request);
     res_.set(boost::beast::http::field::content_type, "text/plain");