abdullah alamoudi has submitted this change and it was merged. Change subject: [NO ISSUE][TEST] Fix Component Lifecycle Test ......................................................................
[NO ISSUE][TEST] Fix Component Lifecycle Test Change-Id: Idb5156db0fb0e060d998851756ee3925c02b5791 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2827 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Contrib: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> --- M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeComponentLifecycleTest.java 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Anon. E. Moose #1000171: Jenkins: Verified; No violations found; ; Verified Murtadha Hubail: Looks good to me, approved diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeComponentLifecycleTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeComponentLifecycleTest.java index 21f3877..251f57a 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeComponentLifecycleTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeComponentLifecycleTest.java @@ -37,6 +37,7 @@ import org.apache.hyracks.storage.am.lsm.btree.impl.NoOpTestCallback; import org.apache.hyracks.storage.am.lsm.btree.util.LSMBTreeTestContext; import org.apache.hyracks.storage.am.lsm.btree.util.LSMBTreeTestHarness; +import org.apache.hyracks.storage.am.lsm.common.api.IIoOperationFailedCallback; import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent; import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.LSMComponentType; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation; @@ -47,7 +48,6 @@ import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexOperationContext; import org.apache.hyracks.storage.am.lsm.common.api.ILSMMemoryComponent; -import org.apache.hyracks.storage.am.lsm.common.api.IIoOperationFailedCallback; import org.apache.hyracks.storage.am.lsm.common.impls.AsynchronousScheduler; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -292,7 +292,7 @@ ILSMIndexOperationContext opCtx = accessor.getOpContext(); assertCorrectSearchComponents(opCtx, index, 0); // Allow one flush at a time and ensure that inserter didn't succeed - for (int i = 0; i < numFlushes - 1; i++) { + for (int i = 0; i < numFlushes - index.getNumberOfAllMemoryComponents(); i++) { flushSemaphore.release(); firstUser.step(); flushRequest.await(2 + i); @@ -300,21 +300,21 @@ // also ensure that you get the correct components when searching assertCorrectSearchComponents(opCtx, index, i + 1); } - // Allow last flush to proceed flushSemaphore.release(); + firstUser.step(); // wait for the insert to complete insertRequest.await(); + // Allow last flush to proceed + flushSemaphore.release(); firstUser.step(); firstUser.step(); flushRequest.await(); firstUser.stop(); secondUser.stop(); - int expectedMemoryComponent = numFlushes % numMemoryComponents; Assert.assertEquals(getExpectedMemoryComponentIndex(expectedMemoryComponent), index.getCurrentMemoryComponentIndex()); Assert.assertEquals(0, index.getDiskComponents().size()); - EncapsulatingIoCallback encapsulating = (EncapsulatingIoCallback) index.getIOOperationCallback(); CountingIoOperationCallback ioCallback = (CountingIoOperationCallback) encapsulating.getEncapsulated(); // assert equal before, after, finalize were called -- To view, visit https://asterix-gerrit.ics.uci.edu/2827 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idb5156db0fb0e060d998851756ee3925c02b5791 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudi <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Luo Chen <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]> Gerrit-Reviewer: Wail Alkowaileet <[email protected]> Gerrit-Reviewer: abdullah alamoudi <[email protected]>
