This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push:
new 9eed258833 [#8056] fix to string so output is what is expected (#8069)
9eed258833 is described below
commit 9eed258833d7d0a3e5f8d4ec9b8c0b08f785d33c
Author: ankamde <[email protected]>
AuthorDate: Fri Aug 15 04:19:07 2025 +0200
[#8056] fix to string so output is what is expected (#8069)
### What changes were proposed in this pull request?
The output of toString in
api/src/main/java/org/apache/gravitino/rel/expressions/FunctionExpression.java
is a little odd and outputs things in the form "func([a,b)]" when
"func(a,b)" would be expected.
### Why are the changes needed?
Update toString method of FunctionalExpressoin.java
Fix: #8056
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
By running unt tests.
---
.../rel/expressions/FunctionExpression.java | 6 +++-
.../rel/expressions/TestFunctionExpression.java | 37 ++++++++++++++++++++++
.../apache/gravitino/cli/output/TestLineUtil.java | 2 +-
.../gravitino/cli/output/TestTableFormat.java | 2 +-
4 files changed, 44 insertions(+), 3 deletions(-)
diff --git
a/api/src/main/java/org/apache/gravitino/rel/expressions/FunctionExpression.java
b/api/src/main/java/org/apache/gravitino/rel/expressions/FunctionExpression.java
index 5115b30336..39e77e33da 100644
---
a/api/src/main/java/org/apache/gravitino/rel/expressions/FunctionExpression.java
+++
b/api/src/main/java/org/apache/gravitino/rel/expressions/FunctionExpression.java
@@ -20,6 +20,7 @@ package org.apache.gravitino.rel.expressions;
import java.util.Arrays;
import java.util.Objects;
+import java.util.stream.Collectors;
import org.apache.gravitino.annotation.Evolving;
/**
@@ -87,7 +88,10 @@ public interface FunctionExpression extends Expression {
if (arguments.length == 0) {
return functionName + "()";
}
- return functionName + "(" + String.join(", ",
Arrays.toString(arguments)) + ")";
+ return functionName
+ + Arrays.stream(arguments)
+ .map(Expression::toString)
+ .collect(Collectors.joining(", ", "(", ")"));
}
@Override
diff --git
a/api/src/test/java/org/apache/gravitino/rel/expressions/TestFunctionExpression.java
b/api/src/test/java/org/apache/gravitino/rel/expressions/TestFunctionExpression.java
new file mode 100644
index 0000000000..5c0f58336b
--- /dev/null
+++
b/api/src/test/java/org/apache/gravitino/rel/expressions/TestFunctionExpression.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.gravitino.rel.expressions;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class TestFunctionExpression {
+ @Test
+ public void testToStringWithArguments() {
+ FunctionExpression expr =
+ FunctionExpression.of("func", NamedReference.field("a"),
NamedReference.field("b"));
+ Assertions.assertEquals("func(a, b)", expr.toString());
+ }
+
+ @Test
+ public void testToStringWithoutArguments() {
+ FunctionExpression expr = FunctionExpression.of("func");
+ Assertions.assertEquals("func()", expr.toString());
+ }
+}
diff --git
a/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestLineUtil.java
b/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestLineUtil.java
index b1f7a83bc2..f4c5d0a7cf 100644
---
a/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestLineUtil.java
+++
b/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestLineUtil.java
@@ -239,6 +239,6 @@ public class TestLineUtil {
when(mockColumn1.dataType()).thenReturn(Types.StringType.get());
when(mockColumn1.defaultValue()).thenReturn(FunctionExpression.of("date",
field("b")));
- Assertions.assertEquals("date([b])",
LineUtil.getDefaultValue(mockColumn1));
+ Assertions.assertEquals("date(b)", LineUtil.getDefaultValue(mockColumn1));
}
}
diff --git
a/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestTableFormat.java
b/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestTableFormat.java
index 66d58bddc4..54140a1d0d 100644
---
a/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestTableFormat.java
+++
b/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestTableFormat.java
@@ -524,7 +524,7 @@ public class TestTableFormat {
+ "| column2 | string | default value | |
true | This is a string column |\n"
+ "| column2 | string | '' | |
true | This is a string column |\n"
+ "| column2 | string | current_timestamp() | |
true | This is a string column |\n"
- + "| column2 | string | date([b]) | |
true | This is a string column |\n"
+ + "| column2 | string | date(b) | |
true | This is a string column |\n"
+
"+---------+---------+---------------------+---------------+----------+-------------------------+",
output);
}
