encoded the key+value same way as the client side

rsingh433 · Feb 1, 2024 · 4fe7a6e · 4fe7a6e
1 parent 18867e5
commit 4fe7a6e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java b/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java
@@ -55,10 +55,6 @@ public class StoredTabletFile extends AbstractTabletFile<StoredTabletFile> {
   private static final Comparator<StoredTabletFile> comparator = Comparator
       .comparing(StoredTabletFile::getMetadataPath).thenComparing(StoredTabletFile::getRange);
 
-  public byte[] getMetadataBytes() {
-    return getMetadataText().getBytes();
-  }
-
   /**
    * Construct a tablet file using the string read from the metadata. Preserve the exact string so
    * the entry can be deleted.

diff --git a/...base/src/main/java/org/apache/accumulo/server/metadata/iterators/SetEqualityIterator.java b/...base/src/main/java/org/apache/accumulo/server/metadata/iterators/SetEqualityIterator.java
@@ -83,14 +83,22 @@ public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean i
       int count = 0;
 
       while (source.hasTop()) {
-        byte[] ba = source.getTopKey().getColumnQualifierData().toArray();
-        dos.writeInt(ba.length);
-        dos.write(ba, 0, ba.length);
-
         if (includeValue) {
+          byte[] ba = source.getTopKey().getColumnQualifierData().toArray();
           byte[] valueData = source.getTopValue().get();
-          dos.writeInt(valueData.length);
-          dos.write(valueData, 0, valueData.length);
+
+          byte[] encodedData = encodeEntry(Map.entry(ba, valueData));
+
+          dos.writeInt(encodedData.length);
+          dos.write(encodedData, 0, encodedData.length);
+        }
+
+        else {
+
+          // only encode the key/qualifier
+          byte[] ba = source.getTopKey().getColumnQualifierData().toArray();
+          dos.writeInt(ba.length);
+          dos.write(ba, 0, ba.length);
         }
 
         source.next();