Fix trailing whitespace in function resolution error

trinodb · Jan 16, 2022 · 9448c2f · 9448c2f
1 parent 3080414
commit 9448c2f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -144,10 +144,9 @@ FunctionBinding resolveFunction(Session session, Collection<FunctionMetadata> al
 
         List<String> 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
@@ -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]");