[FLINK-17175][core] StringUtils.arrayToString() should consider Objec…

…t[] lastly
tongcheng-elong · Apr 24, 2020 · 6128bd1 · 6128bd1
1 parent c4b44e9
commit 6128bd1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/flink-core/src/main/java/org/apache/flink/util/StringUtils.java b/flink-core/src/main/java/org/apache/flink/util/StringUtils.java
@@ -139,9 +139,6 @@ public static String arrayToString(Object array) {
  if (array instanceof long[]) {
  return Arrays.toString((long[]) array);
  }
- if (array instanceof Object[]) {
- return Arrays.toString((Object[]) array);
- }
  // for array of byte array
  if (array instanceof byte[][]) {
  byte[][] b = (byte[][]) array;
@@ -171,6 +168,9 @@ public static String arrayToString(Object array) {
  if (array instanceof short[]) {
  return Arrays.toString((short[]) array);
  }
+ if (array instanceof Object[]) {
+ return Arrays.toString((Object[]) array);
+ }
 
  if (array.getClass().isArray()) {
  return "<unknown array type>";

diff --git a/flink-core/src/test/java/org/apache/flink/util/StringUtilsTest.java b/flink-core/src/test/java/org/apache/flink/util/StringUtilsTest.java
@@ -38,6 +38,17 @@ public void testControlCharacters() {
  assertEquals("\\b \\t \\n \\f \\r default", controlString);
  }
 
+ @Test
+ public void testArrayOfBytesArray() {
+ byte[][] expectedArray = new byte[][]{
+ {1, -97, 49, 74 },
+ {2, -92, 48, 73 }
+ };
+
+ String controlString = StringUtils.arrayToString(expectedArray);
+ assertEquals("[[1, -97, 49, 74], [2, -92, 48, 73]]", controlString);
+ }
+
  @Test
  public void testArrayToString() {
  double[] array = {1.0};