Skip to content

Migrate publisher tests #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 22, 2024
Merged

Migrate publisher tests #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb2b40c
Inline BatchPublisher tests into DataLoaderTest
AlexandreCarlton May 20, 2024
651e561
Fix MappedBatchPublisher loaders to work without cache
AlexandreCarlton May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/main/java/org/dataloader/DataLoaderHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ private class DataLoaderMapEntrySubscriber implements Subscriber<Map.Entry<K, V>
private final List<Object> callContexts;
private final List<CompletableFuture<V>> queuedFutures;
private final Map<K, Object> callContextByKey;
private final Map<K, CompletableFuture<V>> queuedFutureByKey;
private final Map<K, List<CompletableFuture<V>>> queuedFuturesByKey;

private final List<K> clearCacheKeys = new ArrayList<>();
private final Map<K, V> completedValuesByKey = new HashMap<>();
Expand All @@ -733,13 +733,13 @@ private DataLoaderMapEntrySubscriber(
this.queuedFutures = queuedFutures;

this.callContextByKey = new HashMap<>();
this.queuedFutureByKey = new HashMap<>();
this.queuedFuturesByKey = new HashMap<>();
for (int idx = 0; idx < queuedFutures.size(); idx++) {
K key = keys.get(idx);
Object callContext = callContexts.get(idx);
CompletableFuture<V> queuedFuture = queuedFutures.get(idx);
callContextByKey.put(key, callContext);
queuedFutureByKey.put(key, queuedFuture);
queuedFuturesByKey.computeIfAbsent(key, k -> new ArrayList<>()).add(queuedFuture);
}
}

Expand All @@ -756,20 +756,20 @@ public void onNext(Map.Entry<K, V> entry) {
V value = entry.getValue();

Object callContext = callContextByKey.get(key);
CompletableFuture<V> future = queuedFutureByKey.get(key);
List<CompletableFuture<V>> futures = queuedFuturesByKey.get(key);
if (value instanceof Try) {
// we allow the batch loader to return a Try so we can better represent a computation
// that might have worked or not.
Try<V> tryValue = (Try<V>) value;
if (tryValue.isSuccess()) {
future.complete(tryValue.get());
futures.forEach(f -> f.complete(tryValue.get()));
} else {
stats.incrementLoadErrorCount(new IncrementLoadErrorCountStatisticsContext<>(key, callContext));
future.completeExceptionally(tryValue.getThrowable());
futures.forEach(f -> f.completeExceptionally(tryValue.getThrowable()));
clearCacheKeys.add(key);
}
} else {
future.complete(value);
futures.forEach(f -> f.complete(value));
}

completedValuesByKey.put(key, value);
Expand Down Expand Up @@ -801,9 +801,11 @@ public void onError(Throwable ex) {
// Complete the futures for the remaining keys with the exception.
for (int idx = 0; idx < queuedFutures.size(); idx++) {
K key = keys.get(idx);
CompletableFuture<V> future = queuedFutureByKey.get(key);
List<CompletableFuture<V>> futures = queuedFuturesByKey.get(key);
if (!completedValuesByKey.containsKey(key)) {
future.completeExceptionally(ex);
for (CompletableFuture<V> future : futures) {
future.completeExceptionally(ex);
}
// clear any cached view of this key because they all failed
dataLoader.clear(key);
}
Expand Down
Loading