From 9448c2f14d851859e2a4e440f22eb65705135d2a Mon Sep 17 00:00:00 2001 From: David Phillips Date: Mon, 27 Dec 2021 23:43:15 -0800 Subject: [PATCH] Fix trailing whitespace in function resolution error --- .../src/main/java/io/trino/metadata/FunctionResolver.java | 7 +++---- .../src/test/java/io/trino/type/TestArrayOperators.java | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/trino-main/src/main/java/io/trino/metadata/FunctionResolver.java b/core/trino-main/src/main/java/io/trino/metadata/FunctionResolver.java index 569c8f47bac3..48913ce8b2fa 100644 --- a/core/trino-main/src/main/java/io/trino/metadata/FunctionResolver.java +++ b/core/trino-main/src/main/java/io/trino/metadata/FunctionResolver.java @@ -144,10 +144,9 @@ FunctionBinding resolveFunction(Session session, Collection al List expectedParameters = new ArrayList<>(); for (FunctionMetadata function : allCandidates) { - expectedParameters.add(format("%s(%s) %s", - name, - Joiner.on(", ").join(function.getSignature().getArgumentTypes()), - Joiner.on(", ").join(function.getSignature().getTypeVariableConstraints()))); + String arguments = Joiner.on(", ").join(function.getSignature().getArgumentTypes()); + String constraints = Joiner.on(", ").join(function.getSignature().getTypeVariableConstraints()); + expectedParameters.add(format("%s(%s) %s", name, arguments, constraints).stripTrailing()); } String parameters = Joiner.on(", ").join(parameterTypes); diff --git a/core/trino-main/src/test/java/io/trino/type/TestArrayOperators.java b/core/trino-main/src/test/java/io/trino/type/TestArrayOperators.java index c09f36a85a43..a1e6f8835f2d 100644 --- a/core/trino-main/src/test/java/io/trino/type/TestArrayOperators.java +++ b/core/trino-main/src/test/java/io/trino/type/TestArrayOperators.java @@ -439,7 +439,7 @@ public void testArrayToArrayConcat() assertThatThrownBy(() -> assertFunction("ARRAY [ARRAY [1]] || ARRAY [ARRAY ['x']]", new ArrayType(new ArrayType(INTEGER)), null)) .isInstanceOf(TrinoException.class) - .hasMessage("line 1:19: Unexpected parameters (array(array(integer)), array(array(varchar(1)))) for function concat. Expected: concat(char(x), char(y)) , concat(array(E), E) E, concat(E, array(E)) E, concat(array(E)) E, concat(varchar) , concat(varbinary) "); + .hasMessage("line 1:19: Unexpected parameters (array(array(integer)), array(array(varchar(1)))) for function concat. Expected: concat(char(x), char(y)), concat(array(E), E) E, concat(E, array(E)) E, concat(array(E)) E, concat(varchar), concat(varbinary)"); assertCachedInstanceHasBoundedRetainedSize("ARRAY [1, NULL] || ARRAY [3]"); } @@ -477,7 +477,7 @@ public void testElementArrayConcat() assertThatThrownBy(() -> assertFunction("ARRAY [ARRAY[1]] || ARRAY ['x']", new ArrayType(new ArrayType(INTEGER)), null)) .isInstanceOf(TrinoException.class) - .hasMessage("line 1:18: Unexpected parameters (array(array(integer)), array(varchar(1))) for function concat. Expected: concat(char(x), char(y)) , concat(array(E), E) E, concat(E, array(E)) E, concat(array(E)) E, concat(varchar) , concat(varbinary) "); + .hasMessage("line 1:18: Unexpected parameters (array(array(integer)), array(varchar(1))) for function concat. Expected: concat(char(x), char(y)), concat(array(E), E) E, concat(E, array(E)) E, concat(array(E)) E, concat(varchar), concat(varbinary)"); assertCachedInstanceHasBoundedRetainedSize("ARRAY [1, NULL] || 3"); assertCachedInstanceHasBoundedRetainedSize("3 || ARRAY [1, NULL]");