Different method of waiting for the table cache load, using a separat…

…e future with a timeout.
dqops · Jun 26, 2024 · a21c3a2 · a21c3a2
1 parent 49e8599
commit a21c3a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/dqops/src/main/java/com/dqops/data/checkresults/statuscache/TableStatusCacheImpl.java b/dqops/src/main/java/com/dqops/data/checkresults/statuscache/TableStatusCacheImpl.java
@@ -181,11 +181,8 @@ public CompletableFuture<Boolean> getQueueEmptyFuture(Long waitTimeoutMillisecon
                     .thenApply(result -> true);
 
             if (waitTimeoutMilliseconds != null) {
-                booleanCompletableFuture = booleanCompletableFuture.completeOnTimeout(false, waitTimeoutMilliseconds, TimeUnit.MILLISECONDS);
-
-//                CompletableFuture<Boolean> timeoutFuture = new CompletableFuture<Boolean>().completeOnTimeout(false, waitTimeoutMilliseconds, TimeUnit.MILLISECONDS);
-//                booleanCompletableFuture = (CompletableFuture<Boolean>)(CompletableFuture<?>)CompletableFuture.anyOf(booleanCompletableFuture, timeoutFuture);
-
+                CompletableFuture<Boolean> timeoutFuture = new CompletableFuture<Boolean>().completeOnTimeout(false, waitTimeoutMilliseconds, TimeUnit.MILLISECONDS);
+                booleanCompletableFuture = (CompletableFuture<Boolean>)(CompletableFuture<?>)CompletableFuture.anyOf(booleanCompletableFuture, timeoutFuture);
             }
 
             return booleanCompletableFuture;

diff --git a/dqops/src/main/java/com/dqops/metadata/labels/labelloader/LabelsIndexerImpl.java b/dqops/src/main/java/com/dqops/metadata/labels/labelloader/LabelsIndexerImpl.java
@@ -152,11 +152,8 @@ public CompletableFuture<Boolean> getQueueEmptyFuture(Long waitTimeoutMillisecon
                     .thenApply(result -> true);
 
             if (waitTimeoutMilliseconds != null) {
-                booleanCompletableFuture = booleanCompletableFuture.completeOnTimeout(false, waitTimeoutMilliseconds, TimeUnit.MILLISECONDS);
-
-//                CompletableFuture<Boolean> timeoutFuture = new CompletableFuture<Boolean>().completeOnTimeout(false, waitTimeoutMilliseconds, TimeUnit.MILLISECONDS);
-//                booleanCompletableFuture = (CompletableFuture<Boolean>)(CompletableFuture<?>)CompletableFuture.anyOf(booleanCompletableFuture, timeoutFuture);
-
+                CompletableFuture<Boolean> timeoutFuture = new CompletableFuture<Boolean>().completeOnTimeout(false, waitTimeoutMilliseconds, TimeUnit.MILLISECONDS);
+                booleanCompletableFuture = (CompletableFuture<Boolean>)(CompletableFuture<?>)CompletableFuture.anyOf(booleanCompletableFuture, timeoutFuture);
             }
 
             return booleanCompletableFuture;