prefer toStringBinary in attribute deserialization

Author: Ray Mattingly

hbase-client/src/main/java/org/apache/hadoop/hbase/client/OnlineLogRecord.java

@@ -379,8 +379,8 @@ public String toString() {
   }
 
   public static Map<String, String> deserializeAttributes(Map<String, byte[]> attributes) {
-    return attributes.entrySet().stream()
-      .collect(Collectors.toMap(Map.Entry::getKey, entry -> Bytes.toString(entry.getValue())));
+    return attributes.entrySet().stream().collect(
+      Collectors.toMap(Map.Entry::getKey, entry -> Bytes.toStringBinary(entry.getValue())));
   }
 
 }

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOnlineLogRecord.java

@@ -60,31 +60,52 @@ public void itSerializesScan() {
 
   @Test
   public void itSerializesRequestAttributes() {
-    Map<String, byte[]> requestAttributes =
-      ImmutableMap.<String, byte[]> builder().put("r", Bytes.toBytes("1")).build();
+    Map<String, byte[]> requestAttributes = ImmutableMap.<String, byte[]> builder()
+      .put("r", Bytes.toBytes("1")).put("2", Bytes.toBytes(0.0)).build();
     String expectedOutput = "{\n" + "  \"startTime\": 1,\n" + "  \"processingTime\": 2,\n"
       + "  \"queueTime\": 3,\n" + "  \"responseSize\": 4,\n" + "  \"blockBytesScanned\": 5,\n"
       + "  \"multiGetsCount\": 6,\n" + "  \"multiMutationsCount\": 7,\n"
-      + "  \"requestAttributes\": {\n" + "    \"r\": \"1\"\n" + "  }\n" + "}";
+      + "  \"requestAttributes\": {\n" + "    \"r\": \"1\",\n"
+      + "    \"2\": \"\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\"\n" + "  }\n" + "}";
     OnlineLogRecord o = new OnlineLogRecord(1, 2, 3, 4, 5, null, null, null, null, null, null, null,
       6, 7, 0, null, requestAttributes, Collections.emptyMap());
     String actualOutput = o.toJsonPrettyPrint();
     System.out.println(actualOutput);
     Assert.assertEquals(actualOutput, expectedOutput);
   }
 
+  @Test
+  public void itOmitsEmptyRequestAttributes() {
+    OnlineLogRecord o = new OnlineLogRecord(1, 2, 3, 4, 5, null, null, null, null, null, null, null,
+      6, 7, 0, null, Collections.emptyMap(), Collections.emptyMap());
+    String actualOutput = o.toJsonPrettyPrint();
+    System.out.println(actualOutput);
+    Assert.assertFalse(actualOutput.contains("requestAttributes"));
+  }
+
   @Test
   public void itSerializesConnectionAttributes() {
-    Map<String, byte[]> connectionAttributes =
-      ImmutableMap.<String, byte[]> builder().put("c", Bytes.toBytes("1")).build();
+    Map<String, byte[]> connectionAttributes = ImmutableMap.<String, byte[]> builder()
+      .put("c", Bytes.toBytes("1")).put("2", Bytes.toBytes(0.0)).build();
     String expectedOutput = "{\n" + "  \"startTime\": 1,\n" + "  \"processingTime\": 2,\n"
       + "  \"queueTime\": 3,\n" + "  \"responseSize\": 4,\n" + "  \"blockBytesScanned\": 5,\n"
       + "  \"multiGetsCount\": 6,\n" + "  \"multiMutationsCount\": 7,\n"
-      + "  \"connectionAttributes\": {\n" + "    \"c\": \"1\"\n" + "  }\n" + "}";
+      + "  \"connectionAttributes\": {\n"
+      + "    \"2\": \"\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\",\n"
+      + "    \"c\": \"1\"\n" + "  }\n" + "}";
     OnlineLogRecord o = new OnlineLogRecord(1, 2, 3, 4, 5, null, null, null, null, null, null, null,
       6, 7, 0, null, Collections.emptyMap(), connectionAttributes);
     String actualOutput = o.toJsonPrettyPrint();
     System.out.println(actualOutput);
     Assert.assertEquals(actualOutput, expectedOutput);
   }
+
+  @Test
+  public void itOmitsEmptyConnectionAttributes() {
+    OnlineLogRecord o = new OnlineLogRecord(1, 2, 3, 4, 5, null, null, null, null, null, null, null,
+      6, 7, 0, null, Collections.emptyMap(), Collections.emptyMap());
+    String actualOutput = o.toJsonPrettyPrint();
+    System.out.println(actualOutput);
+    Assert.assertFalse(actualOutput.contains("connectionAttributes"));
+  }
 }