diff --git a/src/main/java/net/spy/memcached/v2/AsyncArcusCommands.java b/src/main/java/net/spy/memcached/v2/AsyncArcusCommands.java index 6f9c5ee4f..d4ed53b69 100644 --- a/src/main/java/net/spy/memcached/v2/AsyncArcusCommands.java +++ b/src/main/java/net/spy/memcached/v2/AsyncArcusCommands.java @@ -109,7 +109,6 @@ import net.spy.memcached.v2.vo.BTreePositionElement; import net.spy.memcached.v2.vo.BTreeSMGetResult; import net.spy.memcached.v2.vo.BTreeUpdateElement; -import net.spy.memcached.v2.vo.BopDeleteArgs; import net.spy.memcached.v2.vo.BopGetArgs; import net.spy.memcached.v2.vo.BopMultiGetArgs; import net.spy.memcached.v2.vo.BopRangeGetArgs; @@ -1914,17 +1913,20 @@ public void complete() { } @Override - public ArcusFuture bopDelete(String key, BKey bKey, BopDeleteArgs args) { - BTreeDelete delete = new BTreeDelete(bKey.toString(), - args.getEFlagFilter(), args.isDropIfEmpty(), false); + public ArcusFuture bopDelete(String key, BKey bKey, + ElementFlagFilter eFlagFilter, + boolean dropIfEmpty) { + BTreeDelete delete = new BTreeDelete(bKey.toString(), eFlagFilter, dropIfEmpty, false); return collectionDelete(key, delete); } @Override - public ArcusFuture bopDelete(String key, BKey from, BKey to, BopDeleteArgs args) { + public ArcusFuture bopDelete(String key, BKey from, BKey to, + ElementFlagFilter eFlagFilter, int count, + boolean dropIfEmpty) { verifyBKeyTypesMatch(from, to); BTreeDelete delete = new BTreeDelete(from.toString(), to.toString(), - args.getCount(), args.getEFlagFilter(), args.isDropIfEmpty(), false); + count, eFlagFilter, dropIfEmpty, false); return collectionDelete(key, delete); } diff --git a/src/main/java/net/spy/memcached/v2/AsyncArcusCommandsIF.java b/src/main/java/net/spy/memcached/v2/AsyncArcusCommandsIF.java index 7ec525bba..3c93c5314 100644 --- a/src/main/java/net/spy/memcached/v2/AsyncArcusCommandsIF.java +++ b/src/main/java/net/spy/memcached/v2/AsyncArcusCommandsIF.java @@ -33,7 +33,6 @@ import net.spy.memcached.v2.vo.BTreePositionElement; import net.spy.memcached.v2.vo.BTreeSMGetResult; import net.spy.memcached.v2.vo.BTreeUpdateElement; -import net.spy.memcached.v2.vo.BopDeleteArgs; import net.spy.memcached.v2.vo.BopGetArgs; import net.spy.memcached.v2.vo.BopMultiGetArgs; import net.spy.memcached.v2.vo.BopRangeGetArgs; @@ -238,6 +237,8 @@ ArcusFuture lopCreate(String key, ElementValueType type, /** * Insert an element at the given index into a list. + * Negative indexes are counted backward from the end of the list. + * * * @param key key of the list * @param index index at which to insert the element @@ -248,6 +249,7 @@ ArcusFuture lopCreate(String key, ElementValueType type, /** * Insert an element at the given index into a list. + * Negative indexes are counted backward from the end of the list. * If the list does not exist, it is created with the given attributes. * * @param key key of the list @@ -282,6 +284,7 @@ ArcusFuture lopCreate(String key, ElementValueType type, /** * Delete an element at the given index from a list. + * Negative indexes are counted backward from the end of the list. * * @param key key of the list * @param index index of the element to delete @@ -294,6 +297,7 @@ ArcusFuture lopCreate(String key, ElementValueType type, /** * Delete elements in an index range from a list. + * Negative indexes are counted backward from the end of the list. * * @param key key of the list * @param from index range start (inclusive) @@ -386,49 +390,49 @@ ArcusFuture mopCreate(String key, ElementValueType type, CollectionAttributes attributes); /** - * Insert an element with the given MKey into a map. + * Insert an element with the given mKey into a map. * * @param key key of the map - * @param mKey MKey of the element to insert + * @param mKey mKey of the element to insert * @param value the value to insert * @return {@code true} if the element was inserted, - * {@code false} if the MKey already exists, + * {@code false} if the mKey already exists, * {@code null} if the key is not found */ ArcusFuture mopInsert(String key, String mKey, T value); /** - * Insert an element with the given MKey into a map. + * Insert an element with the given mKey into a map. * If the map does not exist, it is created with the given attributes. * * @param key key of the map - * @param mKey MKey of the element to insert + * @param mKey mKey of the element to insert * @param value the value to insert * @param attributes attributes to use when creating the map * @return {@code true} if the element was inserted, - * {@code false} if the MKey already exists, + * {@code false} if the mKey already exists, * {@code null} if the key is not found */ ArcusFuture mopInsert(String key, String mKey, T value, CollectionAttributes attributes); /** - * Upsert an element with the given MKey in a map. - * If an element with the given MKey exists, it is replaced, otherwise a new element is inserted. + * Upsert an element with the given mKey in a map. + * If an element with the given mKey exists, it is replaced, otherwise a new element is inserted. * * @param key key of the map - * @param mKey MKey of the element to upsert + * @param mKey mKey of the element to upsert * @param value the value to insert or replace with * @return {@code true} if upserted, {@code null} if the key is not found */ ArcusFuture mopUpsert(String key, String mKey, T value); /** - * Upsert an element with the given MKey in a map. - * If an element with the given MKey exists, it is replaced, otherwise a new element is inserted. + * Upsert an element with the given mKey in a map. + * If an element with the given mKey exists, it is replaced, otherwise a new element is inserted. * If the map does not exist, it is created with the given attributes. * * @param key key of the map - * @param mKey MKey of the element to upsert + * @param mKey mKey of the element to upsert * @param value the value to insert or replace with * @param attributes attributes to use when creating the map * @return {@code true} if upserted, {@code null} if the key is not found @@ -436,13 +440,13 @@ ArcusFuture mopCreate(String key, ElementValueType type, ArcusFuture mopUpsert(String key, String mKey, T value, CollectionAttributes attributes); /** - * Update the value of an element with the given MKey in a map. + * Update the value of an element with the given mKey in a map. * * @param key key of the map - * @param mKey MKey of the element to update + * @param mKey mKey of the element to update * @param value the new value * @return {@code true} if the element was updated, - * {@code false} if the MKey is not found, + * {@code false} if the mKey is not found, * {@code null} if the key is not found */ ArcusFuture mopUpdate(String key, String mKey, T value); @@ -452,31 +456,31 @@ ArcusFuture mopCreate(String key, ElementValueType type, * * @param key key of the map * @param mode get mode - {@link net.spy.memcached.v2.vo.GetMode} - * @return map of MKey to value, + * @return mKey to value, * empty map if no elements exist, * {@code null} if the key is not found */ ArcusFuture> mopGet(String key, GetMode mode); /** - * Get an element with the given MKey from a map. + * Get an element with the given mKey from a map. * * @param key key of the map - * @param mKey MKey of the element to get + * @param mKey mKey of the element to get * @param mode get mode - {@link net.spy.memcached.v2.vo.GetMode} * @return the element value, - * {@code null} if the key or MKey is not found + * {@code null} if the key or mKey is not found */ ArcusFuture mopGet(String key, String mKey, GetMode mode); /** - * Get elements with the MKeys from a map. + * Get elements with the mKeys from a map. * * @param key key of the map - * @param mKeys list of MKeys to get + * @param mKeys list of mKeys to get * @param mode get mode - {@link net.spy.memcached.v2.vo.GetMode} - * @return map of MKey to value for found elements, - * empty map if no MKeys are found, + * @return map of mKey to value for found elements, + * empty map if no mKeys are found, * {@code null} if the key is not found */ ArcusFuture> mopGet(String key, List mKeys, GetMode mode); @@ -493,25 +497,25 @@ ArcusFuture mopCreate(String key, ElementValueType type, ArcusFuture mopDelete(String key, boolean dropIfEmpty); /** - * Delete an element with the given MKey from a map. + * Delete an element with the given mKey from a map. * * @param key key of the map - * @param mKey MKey of the element to delete + * @param mKey mKey of the element to delete * @param dropIfEmpty whether to drop the map if it becomes empty after deletion * @return {@code true} if the element was deleted, - * {@code false} if the MKey is not found, + * {@code false} if the mKey is not found, * {@code null} if the key is not found */ ArcusFuture mopDelete(String key, String mKey, boolean dropIfEmpty); /** - * Delete elements with the given MKeys from a map. + * Delete elements with the given mKeys from a map. * * @param key key of the map - * @param mKeys MKeys of the elements to delete + * @param mKeys mKeys of the elements to delete * @param dropIfEmpty whether to drop the map if it becomes empty after deletion * @return {@code true} if at least one element was deleted, - * {@code false} if no MKeys are found, + * {@code false} if no mKeys are found, * {@code null} if the key is not found */ ArcusFuture mopDelete(String key, List mKeys, boolean dropIfEmpty); @@ -628,7 +632,7 @@ ArcusFuture>> bopUpsertAndGetTrimmed( * Increments a numeric value of an element with the given bKey in a btree item by {@code delta} * * @param key key of the btree item - * @param bKey BKey of the element to increment + * @param bKey bKey of the element to increment * @param delta the amount to increment (> 0) * @return the new value after increment, or {@code null} if the key or element is not found */ @@ -639,7 +643,7 @@ ArcusFuture>> bopUpsertAndGetTrimmed( * If the element does not exist, it is created with {@code initial} value and {@code eFlag}. * * @param key key of the btree item - * @param bKey BKey of the element to increment + * @param bKey bKey of the element to increment * @param delta the amount to increment (> 0) * @param initial the value to store if the element does not exist * ({@code delta} is ignored) (≥ 0) @@ -653,7 +657,7 @@ ArcusFuture>> bopUpsertAndGetTrimmed( *

If the value is decremented below 0, it will be set to 0.

* * @param key key of the btree item - * @param bKey BKey of the element to decrement + * @param bKey bKey of the element to decrement * @param delta the amount to decrement (> 0) * @return the new value after decrement, or {@code null} if the key or element is not found */ @@ -665,7 +669,7 @@ ArcusFuture>> bopUpsertAndGetTrimmed( *

If the value is decremented below 0, it will be set to 0.

* * @param key key of the btree item - * @param bKey BKey of the element to decrement + * @param bKey bKey of the element to decrement * @param delta the amount to decrement (> 0) * @param initial the value to store if the element does not exist * ({@code delta} is ignored) (≥ 0) @@ -678,7 +682,7 @@ ArcusFuture>> bopUpsertAndGetTrimmed( * Get an element from a btree item. * * @param key key to get - * @param bKey BKey of the element to get + * @param bKey bKey of the element to get * @param args arguments for get operation * @return the {@code BTreeElement} if found, * {@code BTreeElement} with null value and null eFlag if element is not found but key exists, @@ -690,8 +694,8 @@ ArcusFuture>> bopUpsertAndGetTrimmed( * Get elements from a btree item. * * @param key key to get - * @param from BKey range start - * @param to BKey range end + * @param from bKey range start + * @param to bKey range end * @param args arguments for get operation * @return {@code BTreeGetResult} with found elements, * empty {@code BTreeGetResult} if no elements are found in the range but key exists, @@ -703,12 +707,12 @@ ArcusFuture>> bopUpsertAndGetTrimmed( * Get elements from multiple btree items. * * @param keys list of keys to get - * @param from BKey range start - * @param to BKey range end + * @param from bKey range start + * @param to bKey range end * @param args arguments for get operation - * @return map of key to {@code BTreeGetResult} with found elements, - * empty {@code BTreeGetResult} if no elements are found in the range but key exists, - * no {@code Map.Entry} in the map if the key is not found + * @return map of requested key to {@code BTreeGetResult} for existing keys, + * empty {@code BTreeGetResult} if no elements are found in the range but the key exists, + * no mapping for a requested key if the key is not found */ ArcusFuture>> bopMultiGet( List keys, BKey from, BKey to, BopMultiGetArgs args); @@ -717,8 +721,8 @@ ArcusFuture>> bopMultiGet( * Get sort-merged elements from multiple btree items. * * @param keys list of keys to get - * @param from BKey range start - * @param to BKey range end + * @param from bKey range start + * @param to bKey range end * @param args arguments for get operation {@link BopSMGetArgs} * @return {@code BTreeSMGetResult} containing sort-merged elements, * empty {@code BTreeSMGetResult} if no matching elements exist @@ -730,7 +734,7 @@ ArcusFuture> bopSortMergeGet( * Get the position of an element with the given bKey in a btree item. * * @param key key of the btree item - * @param bKey BKey of the element to find + * @param bKey bKey of the element to find * @param order the order of the btree to determine position * @return the 0-based position of the element, * {@code null} if the key or element is not found @@ -767,7 +771,7 @@ ArcusFuture>> bopGetByPosition( * Get an element by bKey and its neighboring elements with position information. * * @param key key of the btree item - * @param bKey BKey of the element to find + * @param bKey bKey of the element to find * @param count the number of neighboring elements to retrieve on each side * (0 ≤ count ≤ 100) * @param order the order of the btree to determine position @@ -782,8 +786,8 @@ ArcusFuture>> bopPositionWithGet( * Count elements in a bKey range from a btree item. * * @param key key of the btree item - * @param from BKey range start (inclusive) - * @param to BKey range end (inclusive) + * @param from bKey range start (inclusive) + * @param to bKey range end (inclusive) * @param eFlagFilter eFlag filter condition, or {@code null} to count all elements in the range * @return the number of elements in the range (0 if none exist), * {@code null} if the key is not found @@ -793,31 +797,38 @@ ArcusFuture>> bopPositionWithGet( /** * Delete an element with the given bKey from a btree item. * - * @param key key of the btree item - * @param bKey BKey of the element to delete - * @param args delete arguments (eFlagFilter, dropIfEmpty) + * @param key key of the btree item + * @param bKey bKey of the element to delete + * @param eFlagFilter eFlag filter condition, or {@code ElementFlagFilter.DO_NOT_FILTER} + * to delete the element without checking eFlag + * @param dropIfEmpty whether to delete the btree item if it becomes empty after deletion * @return {@code true} if the element was deleted, - * {@code false} if the element is not found, + * {@code false} if the element is not found or eFlag does not match, * {@code null} if the key is not found */ - ArcusFuture bopDelete(String key, BKey bKey, BopDeleteArgs args); + ArcusFuture bopDelete(String key, BKey bKey, + ElementFlagFilter eFlagFilter, boolean dropIfEmpty); /** * Delete elements in a bKey range from a btree item. * Elements are deleted in order from {@code from} to {@code to}. - *

If {@code args.count} is 0 (default), all elements in the range are deleted.

- * Otherwise, only the first {@code args.count} elements (in {@code from}-to-{@code to} order) - * are deleted. - * - * @param key key of the btree item - * @param from BKey range start (inclusive) - * @param to BKey range end (inclusive) - * @param args delete arguments (count, eFlagFilter, dropIfEmpty) + * If {@code count} is 0, all matching elements are deleted; otherwise, + * up to {@code count} matching elements are deleted. + * + * @param key key of the btree item + * @param from bKey range start (inclusive) + * @param to bKey range end (inclusive) + * @param eFlagFilter eFlag filter condition, or {@code ElementFlagFilter.DO_NOT_FILTER} + * to delete the element without checking eFlag + * @param count maximum number of matching elements to delete; {@code 0} means no limit + * @param dropIfEmpty whether to delete the btree item if it becomes empty after deletion * @return {@code true} if at least one element was deleted, * {@code false} if no elements are found in the range, * {@code null} if the key is not found */ - ArcusFuture bopDelete(String key, BKey from, BKey to, BopDeleteArgs args); + ArcusFuture bopDelete(String key, BKey from, BKey to, + ElementFlagFilter eFlagFilter, int count, + boolean dropIfEmpty); /** * Flush all items from all servers immediately. diff --git a/src/main/java/net/spy/memcached/v2/vo/BopDeleteArgs.java b/src/main/java/net/spy/memcached/v2/vo/BopDeleteArgs.java deleted file mode 100644 index a1318db19..000000000 --- a/src/main/java/net/spy/memcached/v2/vo/BopDeleteArgs.java +++ /dev/null @@ -1,58 +0,0 @@ -package net.spy.memcached.v2.vo; - -import net.spy.memcached.collection.ElementFlagFilter; - -public final class BopDeleteArgs { - - public static final BopDeleteArgs DEFAULT = new BopDeleteArgs.Builder().build(); - - private final ElementFlagFilter eFlagFilter; - private final int count; - private final boolean dropIfEmpty; - - private BopDeleteArgs(ElementFlagFilter eFlagFilter, int count, boolean dropIfEmpty) { - this.eFlagFilter = eFlagFilter; - this.count = count; - this.dropIfEmpty = dropIfEmpty; - } - - public ElementFlagFilter getEFlagFilter() { - return eFlagFilter; - } - - public int getCount() { - return count; - } - - public boolean isDropIfEmpty() { - return dropIfEmpty; - } - - public static class Builder { - private ElementFlagFilter eFlagFilter = ElementFlagFilter.DO_NOT_FILTER; - private int count = 0; - private boolean dropIfEmpty = false; - - public Builder eFlagFilter(ElementFlagFilter eFlagFilter) { - this.eFlagFilter = eFlagFilter; - return this; - } - - public Builder count(int count) { - if (count < 0) { - throw new IllegalArgumentException("Count must be non-negative."); - } - this.count = count; - return this; - } - - public Builder dropIfEmpty() { - this.dropIfEmpty = true; - return this; - } - - public BopDeleteArgs build() { - return new BopDeleteArgs(eFlagFilter, count, dropIfEmpty); - } - } -} diff --git a/src/test/java/net/spy/memcached/v2/BTreeAsyncArcusCommandsTest.java b/src/test/java/net/spy/memcached/v2/BTreeAsyncArcusCommandsTest.java index c4a5d9cf7..a356f70b6 100644 --- a/src/test/java/net/spy/memcached/v2/BTreeAsyncArcusCommandsTest.java +++ b/src/test/java/net/spy/memcached/v2/BTreeAsyncArcusCommandsTest.java @@ -20,7 +20,6 @@ import net.spy.memcached.v2.vo.BTreeGetResult; import net.spy.memcached.v2.vo.BTreeSMGetResult; import net.spy.memcached.v2.vo.BTreeUpdateElement; -import net.spy.memcached.v2.vo.BopDeleteArgs; import net.spy.memcached.v2.vo.BopGetArgs; import net.spy.memcached.v2.vo.BopMultiGetArgs; import net.spy.memcached.v2.vo.BopRangeGetArgs; @@ -1691,7 +1690,7 @@ void bopDeleteSuccess() throws ExecutionException, InterruptedException, Timeout .get(300L, TimeUnit.MILLISECONDS); // when - async.bopDelete(key, bKey, BopDeleteArgs.DEFAULT) + async.bopDelete(key, bKey, ElementFlagFilter.DO_NOT_FILTER, false) // then .thenCompose(result -> { assertTrue(result); @@ -1710,17 +1709,13 @@ void bopDeleteDropIfEmpty() throws ExecutionException, InterruptedException, Tim // given String key = keys.get(0); BKey bKey = ELEMENTS.get(0).getBKey(); - BopDeleteArgs args = new BopDeleteArgs.Builder() - .dropIfEmpty() - .build(); - async.bopInsert(key, ELEMENTS.get(0), new CollectionAttributes()) .thenAccept(Assertions::assertTrue) .toCompletableFuture() .get(300L, TimeUnit.MILLISECONDS); // when - async.bopDelete(key, bKey, args) + async.bopDelete(key, bKey, ElementFlagFilter.DO_NOT_FILTER, true) // then .thenCompose(result -> { assertTrue(result); @@ -1738,7 +1733,7 @@ void bopDeleteNotFound() throws ExecutionException, InterruptedException, Timeou BKey bKey = BKey.of(1L); // when - async.bopDelete(key, bKey, BopDeleteArgs.DEFAULT) + async.bopDelete(key, bKey, ElementFlagFilter.DO_NOT_FILTER, false) // then .thenAccept(Assertions::assertNull) .toCompletableFuture() @@ -1758,7 +1753,7 @@ void bopDeleteNotFoundElement() throws ExecutionException, InterruptedException, .get(300L, TimeUnit.MILLISECONDS); // when - async.bopDelete(key, bKey, BopDeleteArgs.DEFAULT) + async.bopDelete(key, bKey, ElementFlagFilter.DO_NOT_FILTER, false) // then .thenAccept(Assertions::assertFalse) .toCompletableFuture() @@ -1777,7 +1772,7 @@ void bopDeleteTypeMismatch() throws ExecutionException, InterruptedException, Ti .get(300L, TimeUnit.MILLISECONDS); // when - async.bopDelete(key, bKey, BopDeleteArgs.DEFAULT) + async.bopDelete(key, bKey, ElementFlagFilter.DO_NOT_FILTER, false) .handle((result, ex) -> { assertInstanceOf(OperationException.class, ex); assertTrue(ex.getMessage().contains("TYPE_MISMATCH")); @@ -1799,7 +1794,7 @@ void bopDeleteBKeyMismatch() throws ExecutionException, InterruptedException, Ti .get(300L, TimeUnit.MILLISECONDS); // when - async.bopDelete(key, bKey, BopDeleteArgs.DEFAULT) + async.bopDelete(key, bKey, ElementFlagFilter.DO_NOT_FILTER, false) .handle((result, ex) -> { assertInstanceOf(OperationException.class, ex); assertTrue(ex.getMessage().contains("BKEY_MISMATCH")); @@ -1815,10 +1810,6 @@ void bopDeleteByRangeSuccess() throws ExecutionException, InterruptedException, String key = keys.get(0); BKey from = ELEMENTS.get(0).getBKey(); BKey to = ELEMENTS.get(2).getBKey(); - BopDeleteArgs deleteArgs = new BopDeleteArgs.Builder() - .count(1) - .build(); - async.bopInsert(key, ELEMENTS.get(0), new CollectionAttributes()) .thenCompose(result -> { assertTrue(result); @@ -1832,7 +1823,7 @@ void bopDeleteByRangeSuccess() throws ExecutionException, InterruptedException, .get(300L, TimeUnit.MILLISECONDS); // when - async.bopDelete(key, from, to, deleteArgs) + async.bopDelete(key, from, to, ElementFlagFilter.DO_NOT_FILTER, 1, false) .thenCompose(result -> { assertTrue(result); return async.bopGet(key, from, to, BopRangeGetArgs.DEFAULT); @@ -1852,8 +1843,6 @@ void bopDeleteByRangeCountZero() throws ExecutionException, InterruptedException String key = keys.get(0); BKey from = BKey.of(0L); BKey to = BKey.of(10L); - BopDeleteArgs args = BopDeleteArgs.DEFAULT; - async.bopInsert(key, ELEMENTS.get(0), new CollectionAttributes()) .thenCompose(result -> { assertTrue(result); @@ -1871,7 +1860,7 @@ void bopDeleteByRangeCountZero() throws ExecutionException, InterruptedException .get(300L, TimeUnit.MILLISECONDS); // when - async.bopDelete(key, from, to, args) + async.bopDelete(key, from, to, ElementFlagFilter.DO_NOT_FILTER, 0, false) .thenCompose(result -> { assertTrue(result); return async.bopGet(key, from, to, BopRangeGetArgs.DEFAULT); @@ -1893,10 +1882,6 @@ void bopDeleteByRangeEFlag() throws ExecutionException, InterruptedException, Ti BTreeElement elementWithoutFlag = new BTreeElement<>(BKey.of(2L), "value2", null); ElementFlagFilter filter = new ElementFlagFilter(ElementFlagFilter.CompOperands.Equal, eFlag); - BopDeleteArgs args = new BopDeleteArgs.Builder() - .eFlagFilter(filter) - .build(); - BKey from = BKey.of(0L); BKey to = BKey.of(10L); @@ -1910,7 +1895,7 @@ void bopDeleteByRangeEFlag() throws ExecutionException, InterruptedException, Ti .get(300L, TimeUnit.MILLISECONDS); // when - async.bopDelete(key, from, to, args) + async.bopDelete(key, from, to, filter, 0, false) // then .thenCompose(result -> { assertTrue(result); @@ -1934,7 +1919,7 @@ void bopDeleteByRangeNotFound() throws ExecutionException, InterruptedException, BKey to = BKey.of(10L); // when - async.bopDelete(key, from, to, BopDeleteArgs.DEFAULT) + async.bopDelete(key, from, to, ElementFlagFilter.DO_NOT_FILTER, 0, false) // then .thenAccept(Assertions::assertNull) .toCompletableFuture() @@ -1955,7 +1940,7 @@ void bopDeleteByRangeNotFoundElement() throws ExecutionException, InterruptedExc .get(300L, TimeUnit.MILLISECONDS); // when - async.bopDelete(key, from, to, BopDeleteArgs.DEFAULT) + async.bopDelete(key, from, to, ElementFlagFilter.DO_NOT_FILTER, 0, false) // then .thenAccept(Assertions::assertFalse) .toCompletableFuture() @@ -1976,7 +1961,7 @@ void bopDeleteByRangeTypeMismatch() throws ExecutionException, InterruptedExcept .get(300L, TimeUnit.MILLISECONDS); // when - async.bopDelete(key, from, to, BopDeleteArgs.DEFAULT) + async.bopDelete(key, from, to, ElementFlagFilter.DO_NOT_FILTER, 0, false) .handle((result, ex) -> { assertInstanceOf(OperationException.class, ex); assertTrue(ex.getMessage().contains("TYPE_MISMATCH")); @@ -2000,7 +1985,7 @@ void bopDeleteByRangeBKeyMismatch() throws ExecutionException, InterruptedExcept .get(300L, TimeUnit.MILLISECONDS); // when - async.bopDelete(key, from, to, BopDeleteArgs.DEFAULT) + async.bopDelete(key, from, to, ElementFlagFilter.DO_NOT_FILTER, 0, false) .handle((result, ex) -> { assertInstanceOf(OperationException.class, ex); assertTrue(ex.getMessage().contains("BKEY_MISMATCH"));