WIP proof of concept write blocks as file to disk

Signed-off-by: Atanas Atanasov <[email protected]>

common/src/main/java/com/hedera/block/common/utils/Preconditions.java

@@ -90,8 +90,8 @@ public static int requirePositive(final int toCheck) {
     public static int requirePositive(final int toCheck, final String errorMessage) {
         if (0 >= toCheck) {
             final String message = Objects.isNull(errorMessage)
-                ? "The input integer [%d] is required be positive.".formatted(toCheck)
-                : errorMessage;
+                    ? "The input integer [%d] is required be positive.".formatted(toCheck)
+                    : errorMessage;
             throw new IllegalArgumentException(message);
         } else {
             return toCheck;
@@ -126,8 +126,8 @@ public static long requirePositive(final long toCheck) {
     public static long requirePositive(final long toCheck, final String errorMessage) {
         if (0 >= toCheck) {
             final String message = Objects.isNull(errorMessage)
-                ? "The input long [%d] is required be positive.".formatted(toCheck)
-                : errorMessage;
+                    ? "The input long [%d] is required be positive.".formatted(toCheck)
+                    : errorMessage;
             throw new IllegalArgumentException(message);
         } else {
             return toCheck;

common/src/test/java/com/hedera/block/common/utils/PreconditionsTest.java

@@ -155,8 +155,7 @@ void testRequirePositiveFail(final int toTest) {
     @ParameterizedTest
     @MethodSource("com.hedera.block.common.CommonsTestUtility#positiveIntegers")
     void testRequirePositiveLongPass(final long toTest) {
-        final Consumer<Long> asserts =
-            actual -> assertThat(actual).isPositive().isEqualTo(toTest);
+        final Consumer<Long> asserts = actual -> assertThat(actual).isPositive().isEqualTo(toTest);
 
         final long actual = Preconditions.requirePositive(toTest);
         assertThat(actual).satisfies(asserts);
@@ -180,8 +179,8 @@ void testRequirePositiveLongFail(final long toTest) {
 
         final String testErrorMessage = "test error message";
         assertThatIllegalArgumentException()
-            .isThrownBy(() -> Preconditions.requirePositive(toTest, testErrorMessage))
-            .withMessage(testErrorMessage);
+                .isThrownBy(() -> Preconditions.requirePositive(toTest, testErrorMessage))
+                .withMessage(testErrorMessage);
     }
 
     /**

server/src/main/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializer.java

@@ -26,16 +26,13 @@
  * A class that extends {@link MappedConfigSource} ir order to have project-relevant initialization.
  */
 public final class ServerMappedConfigSourceInitializer {
-    private static final List<ConfigMapping> MAPPINGS =
-            List.of(
-                    new ConfigMapping(
-                            "consumer.timeoutThresholdMillis", "CONSUMER_TIMEOUT_THRESHOLD_MILLIS"),
-                    new ConfigMapping(
-                            "persistence.storage.rootPath", "PERSISTENCE_STORAGE_ROOT_PATH"),
-                    new ConfigMapping("service.delayMillis", "SERVICE_DELAY_MILLIS"),
-                    new ConfigMapping("mediator.ringBufferSize", "MEDIATOR_RING_BUFFER_SIZE"),
-                    new ConfigMapping("notifier.ringBufferSize", "NOTIFIER_RING_BUFFER_SIZE"),
-                    new ConfigMapping("persistence.storage.type", "PERSISTENCE_STORAGE_TYPE"));
+    private static final List<ConfigMapping> MAPPINGS = List.of(
+            new ConfigMapping("consumer.timeoutThresholdMillis", "CONSUMER_TIMEOUT_THRESHOLD_MILLIS"),
+            new ConfigMapping("persistence.storage.rootPath", "PERSISTENCE_STORAGE_ROOT_PATH"),
+            new ConfigMapping("service.delayMillis", "SERVICE_DELAY_MILLIS"),
+            new ConfigMapping("mediator.ringBufferSize", "MEDIATOR_RING_BUFFER_SIZE"),
+            new ConfigMapping("notifier.ringBufferSize", "NOTIFIER_RING_BUFFER_SIZE"),
+            new ConfigMapping("persistence.storage.type", "PERSISTENCE_STORAGE_TYPE"));
 
     private ServerMappedConfigSourceInitializer() {}
 
@@ -48,8 +45,7 @@ private ServerMappedConfigSourceInitializer() {}
      */
     @NonNull
     public static MappedConfigSource getMappedConfigSource() {
-        final MappedConfigSource config =
-                new MappedConfigSource(SystemEnvironmentConfigSource.getInstance());
+        final MappedConfigSource config = new MappedConfigSource(SystemEnvironmentConfigSource.getInstance());
         MAPPINGS.forEach(config::addMapping);
         return config;
     }

server/src/main/java/com/hedera/block/server/persistence/storage/path/BlockAsFilePathResolver.java

@@ -37,8 +37,8 @@ public Path resolvePathToBlock(final long blockNumber) {
         Preconditions.requirePositive(blockNumber); // todo do we have block number 0?
         final String inputString = String.format("%0" + MAX_LONG_DIGITS + "d", blockNumber);
         final String[] blockPath = inputString.split("");
-        final String blockFileName = blockPath[blockPath.length - 1].concat(Constants.BLOCK_FILE_EXTENSION);
-        blockPath[blockPath.length -1] = blockFileName;
+        final String blockFileName = inputString.concat(Constants.BLOCK_FILE_EXTENSION);
+        blockPath[blockPath.length - 1] = blockFileName;
         return Paths.get(root.toAbsolutePath().toString(), blockPath);
     }
 }

server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsFileWriter.java

@@ -34,6 +34,8 @@
  * TODO: add documentation
  */
 class BlockAsFileWriter extends AbstractBlockWriter<List<BlockItem>> {
+    private Block curentBlock; // fixme this is temporary just to explore the workflow and make proof of concept
+
     BlockAsFileWriter(
             @NonNull final BlockNodeContext blockNodeContext,
             @NonNull final BlockRemover blockRemover,
@@ -43,19 +45,27 @@ class BlockAsFileWriter extends AbstractBlockWriter<List<BlockItem>> {
 
     @Override
     public Optional<List<BlockItem>> write(@NonNull final List<BlockItem> toWrite) throws IOException {
-        if (!toWrite.getFirst().hasBlockHeader()) {
-            throw new RuntimeException("Block header is missing");
-            // todo handle this properly for now just not to forget
-            // order of the items is significant
-            // also do we need to check for proof here or below like in dir writer?
+        if (toWrite.getFirst().hasBlockHeader()) {
+            curentBlock = Block.newBuilder().items(toWrite).build();
+        } else {
+            final List<BlockItem> currentItems = curentBlock.items();
+            currentItems.addAll(toWrite);
+            curentBlock = Block.newBuilder().items(currentItems).build();
+        }
+
+        if (toWrite.getLast().hasBlockProof()) {
+            return writeToFs(curentBlock);
+        } else {
+            return Optional.empty();
         }
-        final Block blockToWrite = Block.newBuilder().items(toWrite).build();
-        final long number = toWrite.getFirst().blockHeader().number(); // fixme could be null, handle!
+    }
+
+    private Optional<List<BlockItem>> writeToFs(final Block blockToWrite) throws IOException {
+        final long number = blockToWrite.items().getFirst().blockHeader().number(); // fixme could be null, handle!
 
         // todo we should handle cases where the block path exists, we do not expect it to
         // exist at this stage, if it does, there is something wrong here
         final Path blockToWritePathResolved = pathResolver.resolvePathToBlock(number);
-
         Files.createDirectories(blockToWritePathResolved.getParent());
         Files.createFile(blockToWritePathResolved);
 
@@ -73,6 +83,7 @@ public Optional<List<BlockItem>> write(@NonNull final List<BlockItem> toWrite) t
             // todo handle properly
             throw new RuntimeException(e);
         }
-        return Optional.of(toWrite);
+        curentBlock = null;
+        return Optional.of(blockToWrite.items());
     }
 }

server/src/test/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializerTest.java

@@ -60,19 +60,16 @@ void test_VerifyAllSupportedMappingsAreAddedToInstance() throws ReflectiveOperat
 
         for (final ConfigMapping current : SUPPORTED_MAPPINGS) {
             final Predicate<ConfigMapping> predicate =
-                    cm ->
-                            current.mappedName().equals(cm.mappedName())
-                                    && current.originalName().equals(cm.originalName());
+                    cm -> current.mappedName().equals(cm.mappedName())
+                            && current.originalName().equals(cm.originalName());
             assertTrue(
                     actual.stream().anyMatch(predicate),
-                    () ->
-                            "when testing for: [%s] it is not contained in mappings of the actual initialized object %s"
-                                    .formatted(current, actual));
+                    () -> "when testing for: [%s] it is not contained in mappings of the actual initialized object %s"
+                            .formatted(current, actual));
         }
     }
 
-    private static Queue<ConfigMapping> extractConfigMappings()
-            throws ReflectiveOperationException {
+    private static Queue<ConfigMapping> extractConfigMappings() throws ReflectiveOperationException {
         final Field configMappings = MappedConfigSource.class.getDeclaredField("configMappings");
         try {
             configMappings.setAccessible(true);

server/src/test/java/com/hedera/block/server/persistence/PersistenceInjectionModuleTest.java

@@ -80,8 +80,8 @@ void setup() throws IOException {
     @Test
     void testProvidesBlockWriter() {
 
-        BlockWriter<List<BlockItem>> blockWriter =
-                PersistenceInjectionModule.providesBlockWriter(blockNodeContext, new NoOpRemover(), new NoOpPathResolver());
+        BlockWriter<List<BlockItem>> blockWriter = PersistenceInjectionModule.providesBlockWriter(
+                blockNodeContext, new NoOpRemover(), new NoOpPathResolver());
 
         assertNotNull(blockWriter);
     }
@@ -105,7 +105,8 @@ void testProvidesBlockWriter_IOException() {
         // Expect a RuntimeException due to the IOException
         assertThatRuntimeException()
                 .isThrownBy(() -> {
-                    PersistenceInjectionModule.providesBlockWriter(blockNodeContext, new NoOpRemover(), new NoOpPathResolver());
+                    PersistenceInjectionModule.providesBlockWriter(
+                            blockNodeContext, new NoOpRemover(), new NoOpPathResolver());
                 })
                 .withCauseInstanceOf(IOException.class)
                 .withMessage("Failed to create BlockWriter");