fix#582: Review comments implemented

sirixdb · May 26, 2023 · ee42844 · ee42844
1 parent 22c6419
commit ee42844
Showing 1 changed file with 3 additions and 35 deletions.
diff --git a/bundles/sirix-core/src/main/java/org/sirix/io/combined/CombinedStorageWriter.java b/bundles/sirix-core/src/main/java/org/sirix/io/combined/CombinedStorageWriter.java
@@ -31,61 +31,29 @@ public CombinedStorageWriter(Writer localWriter, Writer remoteWriter, Reader sto
 	@Override
 	public Writer write(PageReadOnlyTrx pageReadOnlyTrx, PageReference pageReference, Bytes<ByteBuffer> bufferedBytes) {
 		Writer writer = localStorageWriter.write(pageReadOnlyTrx, pageReference, bufferedBytes);
-		CompletableFuture<Writer> remoteWriterTask = CompletableFuture.supplyAsync(() -> remoteStorageWriter.write(pageReadOnlyTrx, pageReference, bufferedBytes));
-		if (writer == null) {
-			try {
-				writer = remoteWriterTask.get();
-			} catch (InterruptedException | ExecutionException e) {
-				LOGGER.error("Could not complete remote write operation, please check the error details");
-				e.printStackTrace();
-			}
-		}
+		CompletableFuture.supplyAsync(() -> remoteStorageWriter.write(pageReadOnlyTrx, pageReference, bufferedBytes));
 		return writer;
 	}
 
 	@Override
 	public Writer writeUberPageReference(PageReadOnlyTrx pageReadOnlyTrx, PageReference pageReference,
 			Bytes<ByteBuffer> bufferedBytes) {
 		Writer writer = localStorageWriter.writeUberPageReference(pageReadOnlyTrx, pageReference, bufferedBytes);
-		CompletableFuture<Writer> remoteWriterTask = CompletableFuture.supplyAsync(() -> remoteStorageWriter.writeUberPageReference(pageReadOnlyTrx, pageReference, bufferedBytes));
-		if (writer == null) {
-			try {
-				writer = remoteWriterTask.get();
-			} catch (InterruptedException | ExecutionException e) {
-				LOGGER.error("Could not complete remote write operation, please check the error details");
-				e.printStackTrace();
-			}
-		}
+		CompletableFuture.supplyAsync(() -> remoteStorageWriter.writeUberPageReference(pageReadOnlyTrx, pageReference, bufferedBytes));
 		return writer;
 	}
 
 	@Override
 	public Writer truncateTo(PageReadOnlyTrx pageReadOnlyTrx, int revision) {
 		Writer writer = localStorageWriter.truncateTo(pageReadOnlyTrx, revision);
-		CompletableFuture<Writer> remoteWriterTask = CompletableFuture.supplyAsync(() -> remoteStorageWriter.truncateTo(pageReadOnlyTrx, revision));
-		if (writer == null) {
-			try {
-				writer = remoteWriterTask.get();
-			} catch (InterruptedException | ExecutionException e) {
-				LOGGER.error("Could not complete remote write operation, please check the error details");
-				e.printStackTrace();
-			}
-		}
+		CompletableFuture.supplyAsync(() -> remoteStorageWriter.truncateTo(pageReadOnlyTrx, revision));
 		return writer;
 	}
 
 	@Override
 	public Writer truncate() {
 		Writer writer = localStorageWriter.truncate();
 		CompletableFuture<Writer> remoteWriterTask = CompletableFuture.supplyAsync(() -> remoteStorageWriter.truncate());
-		if (writer == null) {
-			try {
-				writer = remoteWriterTask.get();
-			} catch (InterruptedException | ExecutionException e) {
-				LOGGER.error("Could not complete remote write operation, please check the error details");
-				e.printStackTrace();
-			}
-		}
 		return writer;
 	}