(flink) 06/06: [FLINK-35691][table] Fix cluster info displayed incorrectly on SqlClient when RowFormat is PLAIN_TEXT

[ron]

This is an automated email from the ASF dual-hosted git repository.

ron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 27287a105f6585e89795e2a6cbffa8254abb6e57
Author: fengli <ldliu...@163.com>
AuthorDate: Wed Jun 26 14:29:11 2024 +0800

    [FLINK-35691][table] Fix cluster info displayed incorrectly on SqlClient 
when RowFormat is PLAIN_TEXT
---
 .../flink/table/api/internal/StaticResultProvider.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git 
a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/StaticResultProvider.java
 
b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/StaticResultProvider.java
index c9eb3f776a8..fda247683c9 100644
--- 
a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/StaticResultProvider.java
+++ 
b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/StaticResultProvider.java
@@ -22,6 +22,8 @@ import org.apache.flink.annotation.Internal;
 import org.apache.flink.annotation.VisibleForTesting;
 import org.apache.flink.core.execution.JobClient;
 import org.apache.flink.table.api.TableException;
+import org.apache.flink.table.data.GenericArrayData;
+import org.apache.flink.table.data.GenericMapData;
 import org.apache.flink.table.data.GenericRowData;
 import org.apache.flink.table.data.RowData;
 import org.apache.flink.table.data.StringData;
@@ -30,8 +32,10 @@ import 
org.apache.flink.table.utils.print.RowDataToStringConverter;
 import org.apache.flink.types.Row;
 import org.apache.flink.util.CloseableIterator;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /** Create result provider from a static set of data using external types. */
 @Internal
@@ -51,6 +55,20 @@ public class StaticResultProvider implements ResultProvider {
                         results[i] = "TRUE";
                     } else if (Boolean.FALSE.equals(value)) {
                         results[i] = "FALSE";
+                    } else if (value instanceof GenericMapData) {
+                        // TODO: This is a temporary solution, the long-term 
solution is to use
+                        // RowDataToStringConverterImpl
+                        GenericMapData mapData = (GenericMapData) value;
+                        if (mapData.size() == 0) {
+                            results[i] = PrintStyle.NULL_VALUE;
+                        } else {
+                            Object[] keyArr =
+                                    ((GenericArrayData) 
mapData.keyArray()).toObjectArray();
+                            results[i] =
+                                    Arrays.stream(keyArr)
+                                            .map(key -> key + "=" + 
mapData.get(key))
+                                            .collect(Collectors.joining(", ", 
"{", "}"));
+                        }
                     } else {
                         results[i] = value == null ? PrintStyle.NULL_VALUE : 
"" + value;
                     }