Cleanup white space

README.md

@@ -53,5 +53,5 @@ To benchmark Uppend:
 
 ```sh
 ./gradlew clean fatJar
-java -jar build/libs/uppend-all-*.jar benchmark --help
+java -jar build/libs/uppend-all-*.jar --help
 ```

src/main/java/com/upserve/uppend/AppendOnlyStoreBuilder.java

@@ -2,8 +2,6 @@
 
 import com.upserve.uppend.metrics.AppendOnlyStoreWithMetrics;
 
-import java.util.concurrent.*;
-
 public class AppendOnlyStoreBuilder extends FileStoreBuilder<AppendOnlyStoreBuilder> {
     // Blocked Longs Config Options
     public static final int DEFAULT_BLOBS_PER_BLOCK = 127;

src/main/java/com/upserve/uppend/AppendStorePartition.java

@@ -13,8 +13,6 @@
 import java.util.function.*;
 import java.util.stream.*;
 
-import static java.lang.Math.min;
-
 public class AppendStorePartition extends Partition implements Flushable, Closeable {
     private static final Logger log = org.slf4j.LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 

src/main/java/com/upserve/uppend/BlockedLongs.java

@@ -43,7 +43,6 @@ public class BlockedLongs implements AutoCloseable, Flushable {
     private final LongAdder allocCounter;
     private final LongAdder valuesReadCounter;
 
-
     public BlockedLongs(Path file, int valuesPerBlock, boolean readOnly) {
         if (file == null) {
             throw new IllegalArgumentException("null file");

src/main/java/com/upserve/uppend/CounterStorePartition.java

@@ -13,8 +13,6 @@
 import java.util.function.ObjLongConsumer;
 import java.util.stream.*;
 
-import static java.lang.Math.min;
-
 public class CounterStorePartition extends Partition {
     private static final Logger log = org.slf4j.LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 

src/main/java/com/upserve/uppend/Partition.java

@@ -121,7 +121,6 @@ public void flush() {
         Arrays.stream(lookups).forEach(LookupData::flush);
     }
 
-
     @Override
     public void trim() {
         Arrays.stream(lookups).forEach(LookupData::trim);

src/main/java/com/upserve/uppend/PartitionStats.java

@@ -72,7 +72,6 @@ public long getFindKeyTimer() {
 
     public long getMaxLookupSize() { return maxLookupSize; }
 
-
     @Override
     public String toString() {
         return "PartitionStats{" +
@@ -109,7 +108,6 @@ public String present(PartitionStats previous) {
                 "}";
     }
 
-
     public PartitionStats minus(PartitionStats other) {
         if (Objects.isNull(other)) throw new NullPointerException("PartitionStats minus method argument is null");
         return new PartitionStats(

src/main/java/com/upserve/uppend/blobs/FilePage.java

@@ -7,7 +7,7 @@
 import static java.lang.Integer.min;
 
 /**
- * Mapped Byte Buffer backed implementation of Page
+ * File backed implementation of Page
  */
 public class FilePage implements Page {
 

src/main/java/com/upserve/uppend/blobs/VirtualLongBlobStore.java

@@ -1,6 +1,5 @@
 package com.upserve.uppend.blobs;
 
-
 import com.google.common.collect.Maps;
 import org.slf4j.Logger;
 

src/main/java/com/upserve/uppend/cli/CommandBenchmark.java

@@ -27,7 +27,6 @@ public class CommandBenchmark implements Callable<Void> {
     public static final String ROOT_NAME = "Root";
     public static final String STORE_NAME = "Benchmark";
 
-
     @Parameters(index = "0", description = "Store path")
     Path path;
 
@@ -62,7 +61,6 @@ public Void call() throws Exception {
         return null;
     }
 
-
     private Benchmark createBenchmark() {
         long keys;
         long count;

src/main/java/com/upserve/uppend/cli/benchmark/Benchmark.java

@@ -38,7 +38,6 @@ public class Benchmark {
     private final ForkJoinPool readerPool;
     private final String ioStatArgs;
 
-
     AtomicReference<PartitionStats> partitionStats;
     AtomicReference<BlockStats> blockStats;
 
@@ -159,7 +158,6 @@ private TimerTask watcherTimer() {
         AtomicLong read = new AtomicLong(readBytesMeter.getCount());
         AtomicLong readCount = new AtomicLong(readCounter.get());
 
-
         return new TimerTask() {
             @Override
             public void run() {

src/main/java/com/upserve/uppend/lookup/LookupData.java

@@ -296,7 +296,6 @@ public Long put(LookupKey key, final long value) {
         return ref[0];
     }
 
-
     /**
      * read the LookupKey by index
      *
@@ -317,7 +316,6 @@ public Map.Entry<LookupKey, Long> readEntry(long keyPosition) {
         return Maps.immutableEntry(readKey(keyPosition), readValue(keyPosition));
     }
 
-
     /**
      * Read the long value associated with a particular key number
      *
@@ -615,7 +613,6 @@ public synchronized void flush() {
         flushing.set(false);
     }
 
-
     @Override
     public void trim() {
         if (!readOnly) {

src/main/java/com/upserve/uppend/lookup/LookupMetadata.java

@@ -7,7 +7,6 @@
 import java.lang.invoke.MethodHandles;
 import java.nio.*;
 import java.util.Arrays;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.LongAdder;
 /**
  * The bisect tree is linearized as follows
@@ -65,7 +64,6 @@ public static LookupMetadata generateMetadata(LookupKey minKey, LookupKey maxKey
         this(minKey, maxKey, keyStorageOrder, metadataGeneration, new LongAdder(), new LongAdder());
     }
 
-
     private LookupMetadata(LookupKey minKey, LookupKey maxKey, int[] keyStorageOrder, int metadataGeneration, LongAdder missCount, LongAdder hitCount) {
         this.numKeys = keyStorageOrder.length;
         this.minKey = minKey;
@@ -129,7 +127,6 @@ private LookupMetadata(byte[] bytes, int metadataGeneration, LongAdder missCount
      * @param key the key to find and mark
      * @return the position of the key
      */
-
     public Long findKey(VirtualLongBlobStore longBlobStore, LookupKey key) {
 
         key.setMetaDataGeneration(metadataGeneration);

src/test/java/com/upserve/uppend/CounterStoreTest.java

@@ -94,7 +94,6 @@ public void incrTwiceTwoTest() throws Exception {
         assertEquals(Long.valueOf(3), store.get("partition", "foo"));
     }
 
-
     @Test
     public void testWriteCloseReadRepeat() throws Exception {
         store.set("partition", "foo", 5);

src/test/java/com/upserve/uppend/TestHelper.java

@@ -3,11 +3,9 @@
 import org.slf4j.*;
 
 import java.lang.reflect.*;
-import java.util.Random;
 import java.util.concurrent.*;
 
 public class TestHelper {
-
     public static void resetLogger(Class clazz, String fieldName) throws Exception {
         setLogger(clazz, fieldName, LoggerFactory.getLogger(clazz));
     }
@@ -70,5 +68,4 @@ public static byte[] genBytes(int len) {
         ThreadLocalRandom.current().nextBytes(bytes);
         return bytes;
     }
-
 }

src/test/java/com/upserve/uppend/blobs/FilePageTest.java

@@ -54,7 +54,6 @@ public void putIllegalStateText() throws IOException{
         when(channel.write(any(ByteBuffer.class), anyLong())).thenReturn(127);
         thrown.expect(IllegalStateException.class);
         filePage.put(0,new byte[130], 7);
-
     }
     @Test
     public void getTest() throws IOException{

src/test/java/com/upserve/uppend/blobs/VirtualAppendOnlyBlobStoreTest.java

@@ -56,7 +56,6 @@ public void testGetPosition() {
         assertEquals(7, store.getPosition());
     }
 
-
     @Test
     public void testAppendReadEmpty() {
         setup(12);

src/test/java/com/upserve/uppend/blobs/VirtualLongBlobStoreTest.java

@@ -167,7 +167,6 @@ public void testConcurrent() {
     }
 
     private void concurrentHelper(int virtualBlobStoreNumber) {
-
         VirtualLongBlobStore blobStore = new VirtualLongBlobStore(virtualBlobStoreNumber, virtualPageFile);
 
         ConcurrentMap<Long, byte[]> testData = new ConcurrentHashMap<>();

src/test/java/com/upserve/uppend/blobs/VirtualPageFileTest.java

@@ -12,7 +12,6 @@
 import static org.junit.Assert.assertFalse;
 
 public class VirtualPageFileTest {
-
     private String name = "virtual_page_file_test";
     private Path rootPath = Paths.get("build/test/blobs/virtual_page_file");
     private Path path = rootPath.resolve(name);
@@ -81,7 +80,6 @@ public void testReadOnlyTruncation() throws IOException {
         Page page = instance.getOrCreatePage(5,0);
         page.put(12, "abc".getBytes(), 0);
 
-
         page = instance.getExistingPage(5,0);
 
         assertEquals(313016, instance.getFileSize());
@@ -119,7 +117,6 @@ public void testReadOnlyTruncation() throws IOException {
         assertArrayEquals("ghi".getBytes(), bytes);
     }
 
-
     @Test
     public void testTableExtension() throws IOException {
         instance = new VirtualPageFile(path, 5, 16, 16384, false);

src/test/java/com/upserve/uppend/lookup/LookupDataTest.java

@@ -17,7 +17,6 @@
 import static org.junit.Assert.*;
 
 public class LookupDataTest {
-
     private static final int RELOAD_INTERVAL = -1;
     private static final int FLUSH_THRESHOLD = -1;
 
@@ -44,7 +43,6 @@ public void initialize() throws Exception {
         setup(false);
     }
 
-
     public void setup(boolean readOnly) {
         metadataPageFile = new VirtualPageFile(lookupDir.resolve("metadata"), NUMBER_OF_STORES, 1024, 16384, readOnly);
         mutableBlobStore = new VirtualMutableBlobStore(1, metadataPageFile);
@@ -124,8 +122,6 @@ public void testIncrement() {
         assertEquals(Long.valueOf(12), data.getValue(key));
     }
 
-
-
     @Test
     public void testFlushAndClose() throws IOException {
         LookupData data = LookupData.lookupWriter(keyBlobStore, mutableBlobStore, FLUSH_THRESHOLD);
@@ -153,7 +149,6 @@ public void testWriteCacheUnderLoad() throws IOException {
                     data.putIfNotExists(new LookupKey(String.valueOf(val)), val);
                 });
 
-
         assertEquals(100_000, data.writeCache.size());
 
         data.flush();
@@ -169,10 +164,7 @@ public void testWriteCacheUnderLoad() throws IOException {
                 .forEach(val -> {
                     data.putIfNotExists(new LookupKey(String.valueOf(val)), val);
                 });
-
         assertEquals(10, data.writeCache.size());
-
-
     }
 
     @Test
@@ -280,7 +272,6 @@ public void testLoadReadRepairMetadata() {
 
         LookupMetadata expected = data.getMetadata();
 
-
         mutableBlobStore.write(0, Ints.toByteArray(50));
         mutableBlobStore.write(4, Ints.toByteArray(284482732)); // Invalid Check checksum
 
@@ -298,8 +289,6 @@ public void testLoadReadRepairMetadata() {
 
     @Test
     public void testFlushWithAppendLoad() throws ExecutionException, InterruptedException {
-
-
         LookupData data = LookupData.lookupWriter(keyBlobStore, mutableBlobStore, 100);
 
         int n = 500;

src/test/java/com/upserve/uppend/lookup/LookupMetadataTest.java

@@ -21,7 +21,6 @@
 
 @RunWith(MockitoJUnitRunner.class)
 public class LookupMetadataTest {
-
     private final String name = "lookupMetadata-test";
     private final Path rootPath = Paths.get("build/test/lookup/lookupMetadata");
     private final Path path = rootPath.resolve(name);
@@ -85,7 +84,6 @@ public void testInvalidContent() throws Exception {
         LookupMetadata.open(metadataBlobs, 0);
     }
 
-
     @Test
     public void testCorrectReadWrite() throws Exception {
         buildSimpleTestData(metadataBlobs);
@@ -121,7 +119,6 @@ public void testOpenReadOnly() throws Exception {
         assertEquals(2, initialMetadata.getMetadataGeneration());
     }
 
-
     @Test
     public void testEmptyLookup() {
         LookupMetadata initialMetadata = new LookupMetadata(null, null, new int[0], 1);
@@ -135,7 +132,6 @@ public void testEmptyLookup() {
         assertEquals(-1, searchKey.getInsertAfterSortIndex());
         assertEquals(1, searchKey.getMetaDataGeneration());
         assertEquals(-1, searchKey.getPosition());
-
     }
 
     @Test
@@ -152,7 +148,6 @@ public void testOneKeyLookupAbove() {
         assertEquals(-1, searchKey.getInsertAfterSortIndex());
         assertEquals(1, searchKey.getMetaDataGeneration());
         assertEquals(-1, searchKey.getPosition());
-
     }
 
     @Test
@@ -169,7 +164,6 @@ public void testOneKeyLookupBelow() {
         assertEquals(0, searchKey.getInsertAfterSortIndex());
         assertEquals(1, searchKey.getMetaDataGeneration());
         assertEquals(-1, searchKey.getPosition());
-
     }
 
     @Test
@@ -206,7 +200,6 @@ public void testTwoKeyLookupBelowLower() {
         assertEquals(-1, searchKey.getInsertAfterSortIndex());
         assertEquals(1, searchKey.getMetaDataGeneration());
         assertEquals(-1, searchKey.getPosition());
-
     }
 
     @Test
@@ -389,7 +382,6 @@ public void testManyKeysAboveLastMidpoint() {
         LookupKey yKey = new LookupKey("y");
         LookupMetadata metadata = new LookupMetadata(bKey, yKey, new int[]{12, 7, 8, 1, 11, 6, 3, 5, 10, 2, 0, 4, 9}, 1);
 
-
         when(mockLongBlobStore.readBlob(3L)).thenReturn("m".getBytes()); // First midpoint is the 6th sort value => 3
         when(mockLongBlobStore.readBlob(2L)).thenReturn("u".getBytes()); // Second midpoint is the 9th sort value => 2
         when(mockLongBlobStore.readBlob(5L)).thenReturn("o".getBytes()); // Second midpoint is the 7th sort value => 5
@@ -429,7 +421,6 @@ public void testManyKeysAboveLastMidpoint() {
         verifyNoMoreInteractions(mockLongBlobStore);
     }
 
-
     @Test
     public void testMetadataLookup() {
         AppendOnlyStoreBuilder defaults = TestHelper.getDefaultAppendStoreTestBuilder()

src/test/java/com/upserve/uppend/metrics/CounterStoreWithMetricsTest.java

@@ -44,7 +44,6 @@ public void testGetName() {
         assertEquals("testStore", instance.getName());
     }
 
-
     @Test
     public void testIncrement() {
         assertEquals(0, metrics.timer(MetricRegistry.name("MetricsRoot", UPPEND_COUNTER_STORE, store.getName(), INCREMENT_TIMER_METRIC_NAME)).getCount());