From a2520c0238c8a09efc1f1731da4b7c9b8f56b581 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Sat, 13 Oct 2018 20:03:02 +0200 Subject: [PATCH] move method only used in tests to the tests --- .../org/lucares/pdb/diskstorage/DiskStorage.java | 12 ------------ .../lucares/pdb/diskstorage/DiskStorageTest.java | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/block-storage/src/main/java/org/lucares/pdb/diskstorage/DiskStorage.java b/block-storage/src/main/java/org/lucares/pdb/diskstorage/DiskStorage.java index 00f7f10..7e2e51a 100644 --- a/block-storage/src/main/java/org/lucares/pdb/diskstorage/DiskStorage.java +++ b/block-storage/src/main/java/org/lucares/pdb/diskstorage/DiskStorage.java @@ -54,18 +54,6 @@ public class DiskStorage implements AutoCloseable { fileChannel.close(); } - public long[] allocateBlocks(final int numNewBlocks, final int blockSize) throws IOException { - - final long[] result = new long[numNewBlocks]; - synchronized (fileChannel) { - for (int i = 0; i < numNewBlocks; i++) { - final long blockOffset = allocateBlock(blockSize); - result[i] = blockOffset; - } - } - return result; - } - public synchronized long allocateBlock(final int blockSize) throws IOException { if (blockSize < FREE_LIST_NODE_SIZE) { diff --git a/block-storage/src/test/java/org/lucares/pdb/diskstorage/DiskStorageTest.java b/block-storage/src/test/java/org/lucares/pdb/diskstorage/DiskStorageTest.java index 3df8814..f31c95d 100644 --- a/block-storage/src/test/java/org/lucares/pdb/diskstorage/DiskStorageTest.java +++ b/block-storage/src/test/java/org/lucares/pdb/diskstorage/DiskStorageTest.java @@ -46,7 +46,7 @@ public class DiskStorageTest { try (DiskStorage ds = new DiskStorage(databaseFile)) { final int numBlocks = 10; - ds.allocateBlocks(numBlocks, BLOCK_SIZE); + allocateBlocks(ds, numBlocks, BLOCK_SIZE); final List blocks = new ArrayList<>(); // fill the first 16 512-byte blocks @@ -101,7 +101,7 @@ public class DiskStorageTest { try (DiskStorage ds = new DiskStorage(databaseFile)) { final int numBlocks = 10; - final long[] blockOffsets = ds.allocateBlocks(numBlocks, BLOCK_SIZE); + final long[] blockOffsets = allocateBlocks(ds, numBlocks, BLOCK_SIZE); for (final long blockOffset : blockOffsets) { @@ -292,4 +292,15 @@ public class DiskStorageTest { buffer[i] = val; } } + + private long[] allocateBlocks(final DiskStorage ds, final int numNewBlocks, final int blockSize) + throws IOException { + + final long[] result = new long[numNewBlocks]; + for (int i = 0; i < numNewBlocks; i++) { + final long blockOffset = ds.allocateBlock(blockSize); + result[i] = blockOffset; + } + return result; + } }