[accumulo] branch main updated: convert text to printable string before logging in merge tablets (#2906)

[do...@apache.org]

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

domgarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new 4603ea875d convert text to printable string before logging in merge tablets (#2906)
4603ea875d is described below

commit 4603ea875df537c751577320c09bd962f92a928a
Author: Scott Kirklin <sc...@gmail.com>
AuthorDate: Thu Sep 1 10:15:34 2022 -0700

    convert text to printable string before logging in merge tablets (#2906)
    
    * convert text to printable string before logging in merge tablets
    
    * pr feedback: start formatter should take start.getLength
    
    Co-authored-by: Scott Kirklin <sc...@gh.st>
---
 core/src/main/java/org/apache/accumulo/core/util/Merge.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/util/Merge.java b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
index b9f10fe86e..2cfeb9f045 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Merge.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
@@ -33,6 +33,7 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.ConfigurationCopy;
 import org.apache.accumulo.core.conf.ConfigurationTypeHelper;
 import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.metadata.MetadataTable;
@@ -225,8 +226,11 @@ public class Merge {
     try {
       Text start = sizes.get(0).extent.prevEndRow();
       Text end = sizes.get(numToMerge - 1).extent.endRow();
-      message("Merging %d tablets from (%s to %s]", numToMerge, start == null ? "-inf" : start,
-          end == null ? "+inf" : end);
+      message("Merging %d tablets from (%s to %s]", numToMerge,
+          start == null ? "-inf"
+              : Key.toPrintableString(start.getBytes(), 0, start.getLength(), start.getLength()),
+          end == null ? "+inf"
+              : Key.toPrintableString(end.getBytes(), 0, end.getLength(), end.getLength()));
       client.tableOperations().merge(table, start, end);
     } catch (Exception ex) {
       throw new MergeException(ex);