DonalEvans commented on a change in pull request #6232:
URL: https://github.com/apache/geode/pull/6232#discussion_r605289511
##########
File path:
geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java
##########
@@ -271,51 +272,148 @@ public void
verifyPrimaryBucketNodesAreRetrievedForCqQuery() throws Exception {
@Test
public void verifyPrimaryBucketNodesAreRetrievedForCqQueryWithRetry() throws
Exception {
List<Integer> bucketList = createBucketList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
- Set bucketSet = new HashSet<>(bucketList);
+ int bucket1 = 1;
+ Set<Integer> bucketSet = new HashSet<>(bucketList);
when(query.isCqQuery()).thenReturn(true);
PartitionedRegionQueryEvaluator prqe =
spy(new PartitionedRegionQueryEvaluator(system, pr, query,
mock(ExecutionContext.class),
null, new LinkedResultSet(), bucketSet));
for (Integer bid : bucketList) {
- if (bid == 1) {
-
when(prqe.getPrimaryBucketOwner(bid)).thenReturn(null).thenReturn(remoteNodeA);
+ if (bid == bucket1) {
+
doReturn(null).doReturn(remoteNodeA).when(prqe).getPrimaryBucketOwner(bid);
} else {
- when(prqe.getPrimaryBucketOwner(bid)).thenReturn(remoteNodeA);
+ doReturn(remoteNodeA).when(prqe).getPrimaryBucketOwner(bid);
}
}
Map<InternalDistributedMember, List<Integer>> bnMap =
prqe.buildNodeToBucketMap();
- assertThat(bnMap.size()).isEqualTo(1);
+ assertThat(bnMap.size()).isEqualTo(bucket1);
assertThat(bnMap.get(remoteNodeA).size()).isEqualTo(10);
- // Called 3 times : 2 times in retry and once for setting the return value
- verify(prqe, times(3)).getPrimaryBucketOwner(1);
+ verify(prqe, times(2)).getPrimaryBucketOwner(1);
}
@Test
- public void exceptionIsThrownWhenPrimaryBucketNodeIsNotFoundForCqQuery()
throws Exception {
+ public void exceptionIsThrownWhenPrimaryBucketNodeIsNotFoundForCqQuery() {
List<Integer> bucketList = createBucketList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
- Set bucketSet = new HashSet<>(bucketList);
+ int bucket1 = 1;
+ Set<Integer> bucketSet = new HashSet<>(bucketList);
when(query.isCqQuery()).thenReturn(true);
PartitionedRegionQueryEvaluator prqe =
spy(new PartitionedRegionQueryEvaluator(system, pr, query,
mock(ExecutionContext.class),
null, new LinkedResultSet(), bucketSet));
for (Integer bid : bucketList) {
- if (bid == 1) {
- when(prqe.getPrimaryBucketOwner(bid)).thenReturn(null);
+ if (bid == bucket1) {
+ doReturn(null).when(prqe).getPrimaryBucketOwner(bid);
} else {
- when(prqe.getPrimaryBucketOwner(bid)).thenReturn(remoteNodeA);
+ doReturn(remoteNodeA).when(prqe).getPrimaryBucketOwner(bid);
}
}
- assertThatThrownBy(() ->
prqe.buildNodeToBucketMap()).isInstanceOf(QueryException.class)
+
assertThatThrownBy(prqe::buildNodeToBucketMap).isInstanceOf(QueryException.class)
.hasMessageContaining(
"Data loss detected, unable to find the hosting node for some of
the dataset.");
- // Called 3 times : 2 times in retry and once for setting the return value
- verify(prqe, times(4)).getPrimaryBucketOwner(1);
+ verify(prqe, times(3)).getPrimaryBucketOwner(bucket1);
+ }
+
+ @Test
+ public void verifyLocalBucketNodesAreRetrievedForQuery() throws Exception {
+ List<Integer> bucketList = createBucketList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+ PartitionedRegionDataStore dataStore =
mock(PartitionedRegionDataStore.class);
+ Set<Integer> bucketSet = new HashSet<>(bucketList);
+ for (Integer bid : bucketList) {
+ when(dataStore.isManagingBucket(bid)).thenReturn(true);
+ }
+ when(pr.getDataStore()).thenReturn(dataStore);
+ PartitionedRegionQueryEvaluator prqe =
+ new PartitionedRegionQueryEvaluator(system, pr, query,
mock(ExecutionContext.class),
+ null, new LinkedResultSet(), bucketSet);
+
+ Map<InternalDistributedMember, List<Integer>> bnMap =
prqe.buildNodeToBucketMap();
+
+ assertThat(bnMap.size()).isEqualTo(1);
+ assertThat(bnMap.get(localNode).size()).isEqualTo(10);
+ }
+
+ @Test
+ public void verifyAllBucketsAreRetrievedFromSingleRemoteNode() throws
Exception {
+ List<Integer> bucketList = createBucketList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+ Set<Integer> bucketSet = new HashSet<>(bucketList);
+ when(pr.getDataStore()).thenReturn(null);
+ RegionAdvisor regionAdvisor = mock(RegionAdvisor.class);
+ Set<InternalDistributedMember> nodes = new HashSet<>(allNodes);
+ when(regionAdvisor.adviseDataStore()).thenReturn(nodes);
+ for (Integer bid : bucketList) {
+ when(regionAdvisor.getBucketOwners(bid)).thenReturn(nodes);
+ }
+ when(pr.getRegionAdvisor()).thenReturn(regionAdvisor);
+ PartitionedRegionQueryEvaluator prqe =
+ new PartitionedRegionQueryEvaluator(system, pr, query,
mock(ExecutionContext.class),
+ null, new LinkedResultSet(), bucketSet);
+
+ Map<InternalDistributedMember, List<Integer>> bnMap =
prqe.buildNodeToBucketMap();
+
+ assertThat(bnMap.size()).isEqualTo(1);
+ bnMap.keySet().forEach(x -> assertThat(bnMap.get(x).size()).isEqualTo(10));
+ }
+
+ @Test
+ public void verifyAllBucketsAreRetrievedFromMultipleRemoteNodes() throws
Exception {
+ List<Integer> bucketList = createBucketList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+ Set<Integer> bucketSet = new HashSet<>(bucketList);
+ when(pr.getDataStore()).thenReturn(null);
+ RegionAdvisor regionAdvisor = mock(RegionAdvisor.class);
+ Set<InternalDistributedMember> nodes = new HashSet<>(allNodes);
+ when(regionAdvisor.adviseDataStore()).thenReturn(nodes);
+ Set<InternalDistributedMember> nodesA = new HashSet<>();
+ nodesA.add(remoteNodeA);
+ Set<InternalDistributedMember> nodesB = new HashSet<>();
+ nodesB.add(remoteNodeB);
+ for (Integer bid : bucketList) {
+ if (bid % 2 == 0) {
+ when(regionAdvisor.getBucketOwners(bid)).thenReturn(nodesA);
+ } else {
+ when(regionAdvisor.getBucketOwners(bid)).thenReturn(nodesB);
+ }
+ }
+ when(pr.getRegionAdvisor()).thenReturn(regionAdvisor);
+ PartitionedRegionQueryEvaluator prqe =
+ new PartitionedRegionQueryEvaluator(system, pr, query,
mock(ExecutionContext.class),
+ null, new LinkedResultSet(), bucketSet);
+
+ Map<InternalDistributedMember, List<Integer>> bnMap =
prqe.buildNodeToBucketMap();
+
+ assertThat(bnMap.size()).isEqualTo(2);
+ bnMap.keySet().forEach(x -> {
+ assertThat(x.equals(remoteNodeA) || x.equals(remoteNodeB)).isTrue();
Review comment:
Sure, I can add something to the wiki.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
