This is an automated email from the ASF dual-hosted git repository.
rpuch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 1c9366450f IGNITE-22699 Fix anti-hijack protection of
containsAllAsync() (#4115)
1c9366450f is described below
commit 1c9366450f925657258bf8011c600e87770129e0
Author: Mikhail Efremov <[email protected]>
AuthorDate: Fri Jul 19 16:53:59 2024 +0600
IGNITE-22699 Fix anti-hijack protection of containsAllAsync() (#4115)
---
.../apache/ignite/internal/threading/ItKvRecordApiThreadingTest.java | 2 ++
.../apache/ignite/internal/table/PublicApiThreadingKeyValueView.java | 2 +-
.../org/apache/ignite/internal/table/PublicApiThreadingRecordView.java | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/threading/ItKvRecordApiThreadingTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/threading/ItKvRecordApiThreadingTest.java
index 08410419da..fc2cbad42b 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/threading/ItKvRecordApiThreadingTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/threading/ItKvRecordApiThreadingTest.java
@@ -320,6 +320,7 @@ class ItKvRecordApiThreadingTest extends
ClusterPerClassIntegrationTest {
GET_OR_DEFAULT_ASYNC((view, context) -> view.getOrDefaultAsync(null,
context.key, context.anotherValue)),
GET_ALL_ASYNC((view, context) -> view.getAllAsync(null,
List.of(context.key))),
CONTAINS_ASYNC((view, context) -> view.containsAsync(null,
context.key)),
+ CONTAINS_ALL_ASYNC((view, context) -> view.containsAllAsync(null,
List.of(context.key))),
PUT_ASYNC((view, context) -> view.putAsync(null, context.key,
context.usualValue)),
PUT_ALL_ASYNC((view, context) -> view.putAllAsync(null,
Map.of(context.key, context.usualValue))),
GET_AND_PUT_ASYNC((view, context) -> view.getAndPutAsync(null,
context.key, context.usualValue)),
@@ -424,6 +425,7 @@ class ItKvRecordApiThreadingTest extends
ClusterPerClassIntegrationTest {
GET_ASYNC((view, context) -> view.getAsync(null, context.keyRecord)),
GET_ALL_ASYNC((view, context) -> view.getAllAsync(null,
List.of(context.keyRecord))),
CONTAINS_ASYNC((view, context) -> view.containsAsync(null,
context.keyRecord)),
+ CONTAINS_ALL_ASYNC((view, context) -> view.containsAllAsync(null,
List.of(context.keyRecord))),
UPSERT_ASYNC((view, context) -> view.upsertAsync(null,
context.fullRecord)),
UPSERT_ALL_ASYNC((view, context) -> view.upsertAllAsync(null,
List.of(context.fullRecord))),
GET_AND_UPSERT_ASYNC((view, context) -> view.getAndUpsertAsync(null,
context.fullRecord)),
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/PublicApiThreadingKeyValueView.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/PublicApiThreadingKeyValueView.java
index f4e941a39c..e8df91c7ee 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/PublicApiThreadingKeyValueView.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/PublicApiThreadingKeyValueView.java
@@ -109,7 +109,7 @@ public class PublicApiThreadingKeyValueView<K, V> extends
PublicApiThreadingView
@Override
public CompletableFuture<Boolean> containsAllAsync(@Nullable Transaction
tx, Collection<K> keys) {
- return executeSyncOp(() -> view.containsAllAsync(tx, keys));
+ return executeAsyncOp(() -> view.containsAllAsync(tx, keys));
}
@Override
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/PublicApiThreadingRecordView.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/PublicApiThreadingRecordView.java
index dbab23bf99..1ffc88f379 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/PublicApiThreadingRecordView.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/PublicApiThreadingRecordView.java
@@ -88,7 +88,7 @@ public class PublicApiThreadingRecordView<R> extends
PublicApiThreadingViewBase<
@Override
public CompletableFuture<Boolean> containsAllAsync(@Nullable Transaction
tx, Collection<R> keys) {
- return executeSyncOp(() -> view.containsAllAsync(tx, keys));
+ return executeAsyncOp(() -> view.containsAllAsync(tx, keys));
}
@Override