[FLINK-34469][table] Implement TableDistribution toString

aiven · Feb 29, 2024 · 322a841 · 322a841
1 parent 9e81177
commit 322a841
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/...-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/TableDescriptor.java b/...-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/TableDescriptor.java
@@ -154,8 +154,7 @@ public String toString() {
                         .map(EncodingUtils::escapeIdentifier)
                         .collect(Collectors.joining(", "));
 
-        final String distributedBy =
-                distribution == null ? "" : distribution.asSerializableString();
+        final String distributedBy = distribution == null ? "" : distribution.toString();
 
         final String partitionedBy =
                 !partitionKeys.isEmpty()

diff --git a/...link-table-api-java/src/main/java/org/apache/flink/table/api/internal/ShowCreateUtil.java b/...link-table-api-java/src/main/java/org/apache/flink/table/api/internal/ShowCreateUtil.java
@@ -200,7 +200,7 @@ static Optional<String> extractFormattedComment(ResolvedCatalogBaseTable<?> tabl
     }
 
     static Optional<String> extractFormattedDistributedInfo(ResolvedCatalogTable catalogTable) {
-        return catalogTable.getDistribution().map(TableDistribution::asSerializableString);
+        return catalogTable.getDistribution().map(TableDistribution::toString);
     }
 
     static Optional<String> extractFormattedPartitionedInfo(ResolvedCatalogTable catalogTable) {

diff --git a/...flink-table-api-java/src/test/java/org/apache/flink/table/test/program/TableTestStep.java b/...flink-table-api-java/src/test/java/org/apache/flink/table/test/program/TableTestStep.java
@@ -66,9 +66,7 @@ public TableResult apply(TableEnvironment env, Map<String, String> extraOptions)
         allOptions.putAll(extraOptions);
 
         final String distributedBy =
-                Optional.ofNullable(distribution)
-                        .map(TableDistribution::asSerializableString)
-                        .orElse("");
+                Optional.ofNullable(distribution).map(TableDistribution::toString).orElse("");
         final String partitionedBy =
                 partitionKeys.isEmpty()
                         ? ""

diff --git a/...le/flink-table-common/src/main/java/org/apache/flink/table/catalog/TableDistribution.java b/...le/flink-table-common/src/main/java/org/apache/flink/table/catalog/TableDistribution.java
@@ -116,7 +116,7 @@ public Optional<Integer> getBucketCount() {
         return Optional.ofNullable(bucketCount);
     }
 
-    public String asSerializableString() {
+    private String asSerializableString() {
         if (getBucketKeys().isEmpty()
                 && getBucketCount().isPresent()
                 && getBucketCount().get() != 0) {
@@ -142,4 +142,9 @@ && getBucketCount().get() != 0) {
         sb.append("\n");
         return sb.toString();
     }
+
+    @Override
+    public String toString() {
+        return asSerializableString();
+    }
 }