Code clean up

rsingh433 · Feb 2, 2024 · 586261c · 586261c
1 parent 65b3c74
commit 586261c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/.../base/src/main/java/org/apache/accumulo/server/metadata/ConditionalTabletMutatorImpl.java b/.../base/src/main/java/org/apache/accumulo/server/metadata/ConditionalTabletMutatorImpl.java
@@ -171,7 +171,6 @@ private void requireSameSingle(TabletMetadata tabletMetadata, ColumnType type) {
       }
         break;
       case FILES: {
-        // ELASTICITY_TODO compare values?
         Condition c = SetEqualityIterator.createCondition(tabletMetadata.getFilesMap(), entry -> {
           var stf = entry.getKey();
           var dfv = entry.getValue();

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
@@ -86,31 +86,22 @@ public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean i
         if (includeValue) {
           byte[] ba = source.getTopKey().getColumnQualifierData().toArray();
           byte[] valueData = source.getTopValue().get();
-
           byte[] encodedData = encodeKeyValue(ba, valueData);
-
           dos.writeInt(encodedData.length);
           dos.write(encodedData, 0, encodedData.length);
-        }
-
-        else {
-
+        } else {
           // only encode the key/qualifier
           byte[] ba = source.getTopKey().getColumnQualifierData().toArray();
           dos.writeInt(ba.length);
           dos.write(ba, 0, ba.length);
         }
-
         source.next();
         count++;
       }
-
       // The lenght is written last so that buffering can be avoided in this iterator.
       dos.writeInt(count);
-
       topValue = new Value(baos.toByteArray());
     }
-
   }
 
   @Override
@@ -225,8 +216,4 @@ private static byte[] encodeKeyValue(byte[] key, byte[] value) {
     return ByteUtils.concat(ByteUtils.escape(key), ByteUtils.escape(value));
   }
 
-  // private static byte[] encodeEntry(Map.Entry<byte[],byte[]> bytesEntry) {
-  // return ByteUtils.concat(ByteUtils.escape(bytesEntry.getKey()),
-  // ByteUtils.escape(bytesEntry.getValue()));
-  // }
 }