diff --git a/src/main/java/net/spy/memcached/v2/AsyncArcusCommands.java b/src/main/java/net/spy/memcached/v2/AsyncArcusCommands.java index 61948ec83..cd089262a 100644 --- a/src/main/java/net/spy/memcached/v2/AsyncArcusCommands.java +++ b/src/main/java/net/spy/memcached/v2/AsyncArcusCommands.java @@ -105,13 +105,13 @@ import net.spy.memcached.transcoders.TranscoderUtils; import net.spy.memcached.v2.vo.BKey; import net.spy.memcached.v2.vo.BTreeElement; -import net.spy.memcached.v2.vo.BTreeElements; +import net.spy.memcached.v2.vo.BTreeGetResult; 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.GetOption; -import net.spy.memcached.v2.vo.SMGetElements; public class AsyncArcusCommands implements AsyncArcusCommandsIF { @@ -1353,12 +1353,12 @@ public void gotData(String bKey, int flags, byte[] data, byte[] eFlag) { } @Override - public ArcusFuture> bopGet(String key, BKey from, BKey to, BopGetArgs args) { + public ArcusFuture> bopGet(String key, BKey from, BKey to, BopGetArgs args) { verifyBKeyTypesMatch(from, to); - AbstractArcusResult> result = - new AbstractArcusResult<>(new AtomicReference<>(new BTreeElements<>(new ArrayList<>()))); - ArcusFutureImpl> future = new ArcusFutureImpl<>(result); + AbstractArcusResult> result = + new AbstractArcusResult<>(new AtomicReference<>(new BTreeGetResult<>(new ArrayList<>()))); + ArcusFutureImpl> future = new ArcusFutureImpl<>(result); BTreeGet get = createBTreeGet(from, to, args); ArcusClient client = arcusClientSupplier.get(); @@ -1426,9 +1426,9 @@ private static BTreeGet createBTreeGet(BKey from, BKey to, BopGetArgs args) { } @Override - public ArcusFuture>> bopMultiGet(List keys, - BKey from, BKey to, - BopGetArgs args) { + public ArcusFuture>> bopMultiGet(List keys, + BKey from, BKey to, + BopGetArgs args) { keyValidator.validateKey(keys); keyValidator.checkDupKey(keys); verifyBKeyTypesMatch(from, to); @@ -1439,28 +1439,28 @@ public ArcusFuture>> bopMultiGet(List keys, client.groupingKeys(keys, ArcusClient.BOPGET_BULK_CHUNK_SIZE, APIType.BOP_GET); Collection> futures = new ArrayList<>(); - Map>>, List> futureToKeys = + Map>>, List> futureToKeys = new HashMap<>(); for (Map.Entry> entry : arrangedKeys) { BTreeGetBulk getBulk = createBTreeGetBulk(entry.getKey(), entry.getValue(), from, to, args); - CompletableFuture>> future = + CompletableFuture>> future = bopMultiGetPerNode(client, getBulk).toCompletableFuture(); futureToKeys.put(future, entry.getValue()); futures.add(future); } return new ArcusMultiFuture<>(futures, () -> { - Map> results = new HashMap<>(); - for (Map.Entry>>, List> entry + Map> results = new HashMap<>(); + for (Map.Entry>>, List> entry : futureToKeys.entrySet()) { if (entry.getKey().isCompletedExceptionally()) { for (String key : entry.getValue()) { results.put(key, null); } } else { - Map> result = entry.getKey().join(); + Map> result = entry.getKey().join(); if (result != null) { results.putAll(result); } @@ -1470,11 +1470,11 @@ public ArcusFuture>> bopMultiGet(List keys, }); } - private ArcusFuture>> bopMultiGetPerNode(ArcusClient client, - BTreeGetBulk getBulk) { - AbstractArcusResult>> result = + private ArcusFuture>> bopMultiGetPerNode(ArcusClient client, + BTreeGetBulk getBulk) { + AbstractArcusResult>> result = new AbstractArcusResult<>(new AtomicReference<>(new HashMap<>())); - ArcusFutureImpl>> future = new ArcusFutureImpl<>(result); + ArcusFutureImpl>> future = new ArcusFutureImpl<>(result); BTreeGetBulkOperation.Callback cb = new BTreeGetBulkOperation.Callback() { @Override @@ -1504,10 +1504,10 @@ public void complete() { public void gotKey(String key, int elementCount, OperationStatus status) { switch (status.getStatusCode()) { case SUCCESS: - result.get().put(key, new BTreeElements<>(new ArrayList<>())); + result.get().put(key, new BTreeGetResult<>(new ArrayList<>())); break; case TRIMMED: - BTreeElements elements = new BTreeElements<>(new ArrayList<>()); + BTreeGetResult elements = new BTreeGetResult<>(new ArrayList<>()); elements.trimmed(); result.get().put(key, elements); break; @@ -1515,7 +1515,7 @@ public void gotKey(String key, int elementCount, OperationStatus status) { break; case ERR_NOT_FOUND_ELEMENT: // Put empty BTreeElements for the BTree item key - result.get().put(key, new BTreeElements<>(new ArrayList<>())); + result.get().put(key, new BTreeGetResult<>(new ArrayList<>())); break; default: /* @@ -1529,7 +1529,7 @@ public void gotKey(String key, int elementCount, OperationStatus status) { @Override public void gotElement(String key, int flags, Object bKey, byte[] eFlag, byte[] data) { CachedData cachedData = new CachedData(flags, data, tcForCollection.getMaxSize()); - BTreeElements elements = result.get().get(key); + BTreeGetResult elements = result.get().get(key); elements.addElement(new BTreeElement<>( BKey.of(bKey), tcForCollection.decode(cachedData), eFlag)); } @@ -1555,8 +1555,8 @@ private BTreeGetBulk createBTreeGetBulk(MemcachedNode node, List keys } @Override - public ArcusFuture> bopSortMergeGet(List keys, BKey from, BKey to, - boolean unique, BopGetArgs args) { + public ArcusFuture> bopSortMergeGet(List keys, BKey from, BKey to, + boolean unique, BopGetArgs args) { keyValidator.validateKey(keys); keyValidator.checkDupKey(keys); verifyBKeyTypesMatch(from, to); @@ -1566,11 +1566,11 @@ public ArcusFuture> bopSortMergeGet(List keys, BKey fro Collection>> arrangedKeys = client.groupingKeys(keys, ArcusClient.SMGET_CHUNK_SIZE, APIType.BOP_SMGET); - List>> smGetFutures = new ArrayList<>(); + List>> smGetFutures = new ArrayList<>(); for (Map.Entry> entry : arrangedKeys) { BTreeSMGet smGet = createBTreeSMGet(from, to, args, unique, entry); - CompletableFuture> future = + CompletableFuture> future = bopSortMergeGetPerNode(client, smGet).toCompletableFuture(); smGetFutures.add(future); } @@ -1579,29 +1579,30 @@ public ArcusFuture> bopSortMergeGet(List keys, BKey fro Collection> futures = (Collection>) (Collection) smGetFutures; return new ArcusMultiFuture<>(futures, () -> { - List> results = new ArrayList<>(); - for (CompletableFuture> future : smGetFutures) { + List> results = new ArrayList<>(); + for (CompletableFuture> future : smGetFutures) { if (!future.isCompletedExceptionally()) { results.add(future.join()); } } - return SMGetElements.mergeSMGetElements(results, from.compareTo(to) <= 0, unique, + return BTreeSMGetResult.mergeSMGetElements(results, from.compareTo(to) <= 0, unique, args.getCount()); }); } - private ArcusFuture> bopSortMergeGetPerNode(ArcusClient client, - BTreeSMGet smGet) { - List> elementList = new ArrayList<>(); - List missedKeys = new ArrayList<>(); - List trimmedKeys = new ArrayList<>(); - SMGetElements smGetElements = new SMGetElements<>(elementList, missedKeys, trimmedKeys); + private ArcusFuture> bopSortMergeGetPerNode(ArcusClient client, + BTreeSMGet smGet) { + List> elementList = new ArrayList<>(); + List missedKeys = new ArrayList<>(); + List trimmedKeys = new ArrayList<>(); + BTreeSMGetResult smGetElements = new BTreeSMGetResult<>( + elementList, missedKeys, trimmedKeys); - AtomicReference> atomicReference = new AtomicReference<>(smGetElements); - AbstractArcusResult> result = + AtomicReference> atomicReference = new AtomicReference<>(smGetElements); + AbstractArcusResult> result = new AbstractArcusResult<>(atomicReference); - ArcusFutureImpl> future = new ArcusFutureImpl<>(result); + ArcusFutureImpl> future = new ArcusFutureImpl<>(result); BTreeSortMergeGetOperation.Callback cb = new BTreeSortMergeGetOperation.Callback() { @Override @@ -1635,17 +1636,17 @@ public void gotData(String key, int flags, Object bKey, byte[] eFlag, byte[] dat CachedData cachedData = new CachedData(flags, data, tcForCollection.getMaxSize()); BTreeElement btreeElement = new BTreeElement<>( BKey.of(bKey), tcForCollection.decode(cachedData), eFlag); - elementList.add(new SMGetElements.Element<>(key, btreeElement)); + elementList.add(new BTreeSMGetResult.Element<>(key, btreeElement)); } @Override public void gotMissedKey(String key, OperationStatus cause) { - missedKeys.add(new SMGetElements.MissedKey(key, cause.getStatusCode())); + missedKeys.add(new BTreeSMGetResult.MissedKey(key, cause.getStatusCode())); } @Override public void gotTrimmedKey(String key, Object bKey) { - trimmedKeys.add(new SMGetElements.TrimmedKey(key, BKey.of(bKey))); + trimmedKeys.add(new BTreeSMGetResult.TrimmedKey(key, BKey.of(bKey))); } }; Operation op = client.getOpFact().bopsmget(smGet, cb); diff --git a/src/main/java/net/spy/memcached/v2/AsyncArcusCommandsIF.java b/src/main/java/net/spy/memcached/v2/AsyncArcusCommandsIF.java index 67f8463aa..b196a7e15 100644 --- a/src/main/java/net/spy/memcached/v2/AsyncArcusCommandsIF.java +++ b/src/main/java/net/spy/memcached/v2/AsyncArcusCommandsIF.java @@ -29,13 +29,13 @@ import net.spy.memcached.collection.ElementValueType; import net.spy.memcached.v2.vo.BKey; import net.spy.memcached.v2.vo.BTreeElement; -import net.spy.memcached.v2.vo.BTreeElements; +import net.spy.memcached.v2.vo.BTreeGetResult; 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.GetOption; -import net.spy.memcached.v2.vo.SMGetElements; public interface AsyncArcusCommandsIF { @@ -690,11 +690,11 @@ ArcusFuture>> bopUpsertAndGetTrimmed( * @param from BKey range start * @param to BKey range end * @param args arguments for get operation - * @return {@code BTreeElements} with found elements, - * empty {@code BTreeElements} if no elements are found in the range but key exists, + * @return {@code BTreeGetResult} with found elements, + * empty {@code BTreeGetResult} if no elements are found in the range but key exists, * {@code null} if key is not found */ - ArcusFuture> bopGet(String key, BKey from, BKey to, BopGetArgs args); + ArcusFuture> bopGet(String key, BKey from, BKey to, BopGetArgs args); /** * Get elements from multiple btree items. @@ -703,11 +703,11 @@ ArcusFuture>> bopUpsertAndGetTrimmed( * @param from BKey range start * @param to BKey range end * @param args arguments for get operation - * @return map of key to {@code BTreeElements} with found elements, - * empty {@code BTreeElements} if no elements are found in the range but key exists, + * @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 */ - ArcusFuture>> bopMultiGet( + ArcusFuture>> bopMultiGet( List keys, BKey from, BKey to, BopGetArgs args); /** @@ -718,10 +718,10 @@ ArcusFuture>> bopMultiGet( * @param to BKey range end * @param unique whether to return unique elements only * @param args arguments for get operation - * @return {@code SMGetElements} containing sort-merged elements, - * empty {@code SMGetElements} if no matching elements exist + * @return {@code BTreeSMGetResult} containing sort-merged elements, + * empty {@code BTreeSMGetResult} if no matching elements exist */ - ArcusFuture> bopSortMergeGet( + ArcusFuture> bopSortMergeGet( List keys, BKey from, BKey to, boolean unique, BopGetArgs args); /** diff --git a/src/main/java/net/spy/memcached/v2/vo/BTreeElements.java b/src/main/java/net/spy/memcached/v2/vo/BTreeGetResult.java similarity index 86% rename from src/main/java/net/spy/memcached/v2/vo/BTreeElements.java rename to src/main/java/net/spy/memcached/v2/vo/BTreeGetResult.java index ae23d771e..06d7edd3a 100644 --- a/src/main/java/net/spy/memcached/v2/vo/BTreeElements.java +++ b/src/main/java/net/spy/memcached/v2/vo/BTreeGetResult.java @@ -3,11 +3,11 @@ import java.util.Collections; import java.util.List; -public final class BTreeElements { +public final class BTreeGetResult { private boolean isTrimmed; private final List> elements; - public BTreeElements(List> elements) { + public BTreeGetResult(List> elements) { if (elements == null) { throw new IllegalArgumentException("Elements map cannot be null"); } diff --git a/src/main/java/net/spy/memcached/v2/vo/SMGetElements.java b/src/main/java/net/spy/memcached/v2/vo/BTreeSMGetResult.java similarity index 92% rename from src/main/java/net/spy/memcached/v2/vo/SMGetElements.java rename to src/main/java/net/spy/memcached/v2/vo/BTreeSMGetResult.java index a5b126248..a71478d1b 100644 --- a/src/main/java/net/spy/memcached/v2/vo/SMGetElements.java +++ b/src/main/java/net/spy/memcached/v2/vo/BTreeSMGetResult.java @@ -9,14 +9,14 @@ import net.spy.memcached.ops.StatusCode; -public final class SMGetElements { +public final class BTreeSMGetResult { private final List> elements; private final List missedKeys; private final List trimmedKeys; - public SMGetElements(List> elements, - List missedKeys, - List trimmedKeys) { + public BTreeSMGetResult(List> elements, + List missedKeys, + List trimmedKeys) { if (elements == null || missedKeys == null || trimmedKeys == null) { throw new IllegalArgumentException("Arguments cannot be null"); } @@ -25,9 +25,9 @@ public SMGetElements(List> elements, this.trimmedKeys = trimmedKeys; } - public static SMGetElements mergeSMGetElements(List> smGetElementsList, - boolean ascending, - boolean unique, int count) { + public static BTreeSMGetResult mergeSMGetElements( + List> smGetElementsList, + boolean ascending, boolean unique, int count) { List> elements = new ArrayList<>(); List missedKeys = new ArrayList<>(); List trimmedKeys = new ArrayList<>(); @@ -49,11 +49,11 @@ public static SMGetElements mergeSMGetElements(List> smG }); } - return new SMGetElements<>(elements, missedKeys, trimmedKeys); + return new BTreeSMGetResult<>(elements, missedKeys, trimmedKeys); } private static void mergeSMGetElements( - List> smGetElementsList, + List> smGetElementsList, List> elements, List missedKeys, List trimmedKeys, @@ -67,7 +67,7 @@ private static void mergeSMGetElements( // 2) Initialize the priority queue with the first element from each list // and collect missed keys and trimmed keys for (int i = 0; i < smGetElementsList.size(); i++) { - SMGetElements smGetElements = smGetElementsList.get(i); + BTreeSMGetResult smGetElements = smGetElementsList.get(i); List> eachElements = smGetElements.getElements(); if (!eachElements.isEmpty()) { pq.offer(new ElementWithIndex<>(eachElements.get(0), i, 0)); diff --git a/src/test/java/net/spy/memcached/v2/BTreeAsyncArcusCommandsTest.java b/src/test/java/net/spy/memcached/v2/BTreeAsyncArcusCommandsTest.java index 211cf3e3d..c2de00aaf 100644 --- a/src/test/java/net/spy/memcached/v2/BTreeAsyncArcusCommandsTest.java +++ b/src/test/java/net/spy/memcached/v2/BTreeAsyncArcusCommandsTest.java @@ -17,11 +17,11 @@ import net.spy.memcached.ops.StatusCode; import net.spy.memcached.v2.vo.BKey; import net.spy.memcached.v2.vo.BTreeElement; -import net.spy.memcached.v2.vo.BTreeElements; +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.SMGetElements; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -387,17 +387,17 @@ void bopMultiGet() throws Exception { .thenAccept(map -> { assertEquals(3, map.size()); - BTreeElements elements0 = map.get(testKeys.get(0)); + BTreeGetResult elements0 = map.get(testKeys.get(0)); assertEquals(2, elements0.getElements().size()); assertEquals(ELEMENTS.get(0), elements0.getElements().get(0)); assertEquals(ELEMENTS.get(1), elements0.getElements().get(1)); - BTreeElements elements1 = map.get(testKeys.get(1)); + BTreeGetResult elements1 = map.get(testKeys.get(1)); assertEquals(2, elements1.getElements().size()); assertEquals(ELEMENTS.get(2), elements1.getElements().get(0)); assertEquals(ELEMENTS.get(3), elements1.getElements().get(1)); - BTreeElements elements2 = map.get(testKeys.get(2)); + BTreeGetResult elements2 = map.get(testKeys.get(2)); assertEquals(1, elements2.getElements().size()); assertEquals(ELEMENTS.get(4), elements2.getElements().get(0)); }) @@ -423,11 +423,11 @@ void bopMultiGetDescending() throws Exception { .thenAccept(map -> { assertEquals(3, map.size()); - BTreeElements elements0 = map.get(testKeys.get(0)); + BTreeGetResult elements0 = map.get(testKeys.get(0)); assertEquals(2, elements0.getElements().size()); - BTreeElements elements1 = map.get(testKeys.get(1)); + BTreeGetResult elements1 = map.get(testKeys.get(1)); assertEquals(2, elements1.getElements().size()); - BTreeElements elements2 = map.get(testKeys.get(2)); + BTreeGetResult elements2 = map.get(testKeys.get(2)); assertEquals(1, elements2.getElements().size()); // Make sure that the order is descending @@ -461,7 +461,7 @@ void bopMultiGetNotFoundElement() throws Exception { assertEquals(1, map.size()); // NOT FOUND ELEMENT - BTreeElements elements = map.get(testKeys.get(0)); + BTreeGetResult elements = map.get(testKeys.get(0)); assertNotNull(elements); assertEquals(0, elements.getElements().size()); @@ -492,7 +492,7 @@ void bopSortMergeGetAscendingUnique() throws Exception { assertNotNull(smGetElements); assertEquals(4, smGetElements.getElements().size()); - List> elements = smGetElements.getElements(); + List> elements = smGetElements.getElements(); assertEquals(testKeys.get(0), elements.get(0).getKey()); assertEquals(ELEMENTS.get(0), elements.get(0).getbTreeElement()); assertEquals(testKeys.get(1), elements.get(1).getKey()); @@ -526,7 +526,7 @@ void bopSortMergeGetDescendingUnique() throws Exception { assertNotNull(smGetElements); assertEquals(4, smGetElements.getElements().size()); - List> elements = smGetElements.getElements(); + List> elements = smGetElements.getElements(); assertEquals(testKeys.get(2), elements.get(0).getKey()); assertEquals(ELEMENTS.get(3), elements.get(0).getbTreeElement()); assertEquals(testKeys.get(0), elements.get(1).getKey()); @@ -558,19 +558,19 @@ void bopSortMergeGetAscendingDuplicated() throws Exception { assertNotNull(smGetElements); assertEquals(4, smGetElements.getElements().size()); - SMGetElements.Element element1 = smGetElements.getElements().get(0); + BTreeSMGetResult.Element element1 = smGetElements.getElements().get(0); assertEquals(ELEMENTS.get(0), element1.getbTreeElement()); assertEquals(testKeys.get(0), element1.getKey()); - SMGetElements.Element element2 = smGetElements.getElements().get(1); + BTreeSMGetResult.Element element2 = smGetElements.getElements().get(1); assertEquals(ELEMENTS.get(0), element2.getbTreeElement()); assertEquals(testKeys.get(1), element2.getKey()); - SMGetElements.Element element3 = smGetElements.getElements().get(2); + BTreeSMGetResult.Element element3 = smGetElements.getElements().get(2); assertEquals(ELEMENTS.get(1), element3.getbTreeElement()); assertEquals(testKeys.get(0), element3.getKey()); - SMGetElements.Element element4 = smGetElements.getElements().get(3); + BTreeSMGetResult.Element element4 = smGetElements.getElements().get(3); assertEquals(ELEMENTS.get(1), element4.getbTreeElement()); assertEquals(testKeys.get(1), element4.getKey()); }) @@ -596,19 +596,19 @@ void bopSortMergeGetDescendingDuplicated() throws Exception { assertNotNull(smGetElements); assertEquals(4, smGetElements.getElements().size()); - SMGetElements.Element element1 = smGetElements.getElements().get(0); + BTreeSMGetResult.Element element1 = smGetElements.getElements().get(0); assertEquals(ELEMENTS.get(1), element1.getbTreeElement()); assertEquals(testKeys.get(1), element1.getKey()); - SMGetElements.Element element2 = smGetElements.getElements().get(1); + BTreeSMGetResult.Element element2 = smGetElements.getElements().get(1); assertEquals(ELEMENTS.get(1), element2.getbTreeElement()); assertEquals(testKeys.get(0), element2.getKey()); - SMGetElements.Element element3 = smGetElements.getElements().get(2); + BTreeSMGetResult.Element element3 = smGetElements.getElements().get(2); assertEquals(ELEMENTS.get(0), element3.getbTreeElement()); assertEquals(testKeys.get(1), element3.getKey()); - SMGetElements.Element element4 = smGetElements.getElements().get(3); + BTreeSMGetResult.Element element4 = smGetElements.getElements().get(3); assertEquals(ELEMENTS.get(0), element4.getbTreeElement()); assertEquals(testKeys.get(0), element4.getKey()); }) @@ -633,7 +633,7 @@ void bopSortMergeGetUnique() throws Exception { assertNotNull(smGetElements); assertEquals(1, smGetElements.getElements().size()); - SMGetElements.Element element = smGetElements.getElements().get(0); + BTreeSMGetResult.Element element = smGetElements.getElements().get(0); assertEquals(ELEMENTS.get(0), element.getbTreeElement()); assertEquals(keys.get(0), element.getKey()); }) @@ -656,12 +656,12 @@ void bopSortMergeGetWithMissedKeys() throws Exception { assertNotNull(smGetElements); assertEquals(1, smGetElements.getElements().size()); - List> elements = smGetElements.getElements(); + List> elements = smGetElements.getElements(); assertEquals(ELEMENTS.get(0), elements.get(0).getbTreeElement()); assertEquals(testKeys.get(0), elements.get(0).getKey()); assertEquals(1, smGetElements.getMissedKeys().size()); - SMGetElements.MissedKey missedKey = smGetElements.getMissedKeys().get(0); + BTreeSMGetResult.MissedKey missedKey = smGetElements.getMissedKeys().get(0); assertEquals(testKeys.get(1), missedKey.getKey()); assertEquals(StatusCode.ERR_NOT_FOUND, missedKey.getStatusCode()); }) @@ -684,7 +684,7 @@ void bopSortMergeGetNotFound() throws Exception { assertEquals(3, smGetElements.getMissedKeys().size()); assertEquals(0, smGetElements.getTrimmedKeys().size()); assertIterableEquals(testKeys, smGetElements.getMissedKeys().stream() - .map(SMGetElements.MissedKey::getKey).collect(Collectors.toList())); + .map(BTreeSMGetResult.MissedKey::getKey).collect(Collectors.toList())); }) .toCompletableFuture() .get(300, TimeUnit.MILLISECONDS); @@ -709,7 +709,7 @@ void bopSortMergeGetNotFoundElement() throws Exception { assertEquals(1, smGetElements.getMissedKeys().size()); assertEquals(0, smGetElements.getTrimmedKeys().size()); - SMGetElements.MissedKey missedKey = smGetElements.getMissedKeys().get(0); + BTreeSMGetResult.MissedKey missedKey = smGetElements.getMissedKeys().get(0); assertEquals(testKeys.get(2), missedKey.getKey()); assertEquals(StatusCode.ERR_NOT_FOUND, missedKey.getStatusCode()); }) @@ -740,11 +740,11 @@ void bopSortMergeGetWithTrimmedKeys() throws Exception { assertEquals(1, smGetElements.getMissedKeys().size()); assertEquals(1, smGetElements.getTrimmedKeys().size()); - SMGetElements.TrimmedKey trimmedKey = smGetElements.getTrimmedKeys().get(0); + BTreeSMGetResult.TrimmedKey trimmedKey = smGetElements.getTrimmedKeys().get(0); assertEquals(keys.get(0), trimmedKey.getKey()); assertEquals(ELEMENTS.get(2).getBKey(), trimmedKey.getBKey()); - List> elements = smGetElements.getElements(); + List> elements = smGetElements.getElements(); assertEquals(testKeys.get(0), elements.get(0).getKey()); assertEquals(ELEMENTS.get(3), elements.get(0).getbTreeElement()); assertEquals(testKeys.get(1), elements.get(1).getKey()); @@ -782,7 +782,7 @@ void bopSortMergeGetNotHaveTrimmedKeysOutOfElementsRangeDescending() throws Exce assertTrue(smGetElements.getMissedKeys().isEmpty()); assertTrue(smGetElements.getTrimmedKeys().isEmpty()); - List> elements = smGetElements.getElements(); + List> elements = smGetElements.getElements(); assertEquals(testKeys.get(1), elements.get(0).getKey()); assertEquals(ELEMENTS.get(3), elements.get(0).getbTreeElement()); assertEquals(testKeys.get(0), elements.get(1).getKey()); @@ -821,7 +821,7 @@ void bopSortMergeGetNotHaveTrimmedKeysOutOfElementsRangeAscending() throws Excep assertTrue(smGetElements.getMissedKeys().isEmpty()); assertTrue(smGetElements.getTrimmedKeys().isEmpty()); - List> elements = smGetElements.getElements(); + List> elements = smGetElements.getElements(); assertEquals(testKeys.get(0), elements.get(0).getKey()); assertEquals(ELEMENTS.get(0), elements.get(0).getbTreeElement()); assertEquals(testKeys.get(1), elements.get(1).getKey());