Skip to content

Commit a6b794a

Browse files
committed
Remove the force restriction on function prefix
1 parent 7aed5f2 commit a6b794a

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

presto-native-execution/presto_cpp/main/common/Utils.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ const std::vector<std::string> getFunctionNameParts(
141141
const std::string& registeredFunction) {
142142
std::vector<std::string> parts;
143143
folly::split('.', registeredFunction, parts, true);
144-
VELOX_USER_CHECK(
145-
parts.size() == 3,
146-
fmt::format("Prefix missing for function {}", registeredFunction));
147144
return parts;
148145
}
149146
} // namespace facebook::presto::util

presto-native-execution/presto_cpp/main/common/tests/CommonTest.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -247,14 +247,6 @@ TEST(UtilsTest, getFunctionNameParts) {
247247
EXPECT_EQ(parts[1], "catalog");
248248
EXPECT_EQ(parts[2], "sum");
249249
}
250-
251-
EXPECT_THROW(util::getFunctionNameParts("catalog.function"), VeloxException);
252-
EXPECT_THROW(util::getFunctionNameParts("function"), VeloxException);
253-
EXPECT_THROW(
254-
util::getFunctionNameParts("prefix.catalog.schema.function"),
255-
VeloxException);
256-
EXPECT_THROW(util::getFunctionNameParts(""), VeloxException);
257-
EXPECT_THROW(util::getFunctionNameParts(".."), VeloxException);
258250
}
259251

260252
int main(int argc, char** argv) {

presto-native-execution/presto_cpp/main/functions/FunctionMetadata.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ json getFunctionsMetadata(const std::optional<std::string>& catalog) {
278278
}
279279

280280
const auto parts = util::getFunctionNameParts(name);
281-
if (skipCatalog(parts[0])) {
281+
if (parts.size() < 3 || skipCatalog(parts[0])) {
282282
continue;
283283
}
284284
const auto schema = parts[1];
@@ -291,7 +291,7 @@ json getFunctionsMetadata(const std::optional<std::string>& catalog) {
291291
if (!aggregateFunctions.at(entry.first).metadata.companionFunction) {
292292
const auto name = entry.first;
293293
const auto parts = util::getFunctionNameParts(name);
294-
if (skipCatalog(parts[0])) {
294+
if (parts.size() < 3 || skipCatalog(parts[0])) {
295295
continue;
296296
}
297297
const auto schema = parts[1];
@@ -308,7 +308,7 @@ json getFunctionsMetadata(const std::optional<std::string>& catalog) {
308308
if (aggregateFunctions.count(entry.first) == 0) {
309309
const auto name = entry.first;
310310
const auto parts = util::getFunctionNameParts(entry.first);
311-
if (skipCatalog(parts[0])) {
311+
if (parts.size() < 3 || skipCatalog(parts[0])) {
312312
continue;
313313
}
314314
const auto schema = parts[1];

0 commit comments

Comments
 (0)