mirror of
https://github.com/elastic/elasticsearch.git
synced 2025-04-24 15:17:30 -04:00
Removing explicit SearchResponse usages in tests - v2 (#102021)
This commit is contained in:
Panagiotis Bailis
GitHub
parent
57ae1509c5
commit
25b80acb38
9 changed files with 244 additions and 193 deletions
|
|
@ -1050,53 +1050,65 @@ public class CCSDuelIT extends ESRestTestCase {
|
|||
throw new AssertionError("one of the two requests returned an exception", exception2.get());
|
||||
}
|
||||
SearchResponse minimizeRoundtripsSearchResponse = minimizeRoundtripsResponse.get();
|
||||
SearchResponse fanOutSearchResponse = null;
|
||||
try {
|
||||
responseChecker.accept(minimizeRoundtripsSearchResponse);
|
||||
|
||||
responseChecker.accept(minimizeRoundtripsSearchResponse);
|
||||
// if only the remote cluster was searched, then only one reduce phase is expected
|
||||
int expectedReducePhasesMinRoundTrip = 1;
|
||||
if (searchRequest.indices().length > 1) {
|
||||
expectedReducePhasesMinRoundTrip = searchRequest.indices().length + 1;
|
||||
}
|
||||
|
||||
// if only the remote cluster was searched, then only one reduce phase is expected
|
||||
int expectedReducePhasesMinRoundTrip = 1;
|
||||
if (searchRequest.indices().length > 1) {
|
||||
expectedReducePhasesMinRoundTrip = searchRequest.indices().length + 1;
|
||||
assertEquals(expectedReducePhasesMinRoundTrip, minimizeRoundtripsSearchResponse.getNumReducePhases());
|
||||
fanOutSearchResponse = fanOutResponse.get();
|
||||
responseChecker.accept(fanOutSearchResponse);
|
||||
assertEquals(1, fanOutSearchResponse.getNumReducePhases());
|
||||
|
||||
// compare Clusters objects
|
||||
SearchResponse.Clusters clustersMRT = minimizeRoundtripsSearchResponse.getClusters();
|
||||
SearchResponse.Clusters clustersMRTFalse = fanOutSearchResponse.getClusters();
|
||||
|
||||
assertEquals(clustersMRT.getTotal(), clustersMRTFalse.getTotal());
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.SUCCESSFUL),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.SUCCESSFUL)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.SKIPPED),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.SKIPPED)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.RUNNING),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.RUNNING)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.PARTIAL),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.PARTIAL)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.FAILED),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.FAILED)
|
||||
);
|
||||
|
||||
Map<String, Object> minimizeRoundtripsResponseMap = responseToMap(minimizeRoundtripsSearchResponse);
|
||||
if (clustersMRT.hasClusterObjects() && clustersMRTFalse.hasClusterObjects()) {
|
||||
Map<String, Object> fanOutResponseMap = responseToMap(fanOutSearchResponse);
|
||||
compareResponseMaps(
|
||||
minimizeRoundtripsResponseMap,
|
||||
fanOutResponseMap,
|
||||
"Comparing sync_search minimizeRoundTrip vs. fanOut"
|
||||
);
|
||||
assertThat(
|
||||
minimizeRoundtripsSearchResponse.getSkippedShards(),
|
||||
lessThanOrEqualTo(fanOutSearchResponse.getSkippedShards())
|
||||
);
|
||||
}
|
||||
return minimizeRoundtripsResponseMap;
|
||||
} finally {
|
||||
if (fanOutSearchResponse != null) fanOutSearchResponse.decRef();
|
||||
if (minimizeRoundtripsSearchResponse != null) minimizeRoundtripsSearchResponse.decRef();
|
||||
}
|
||||
|
||||
assertEquals(expectedReducePhasesMinRoundTrip, minimizeRoundtripsSearchResponse.getNumReducePhases());
|
||||
SearchResponse fanOutSearchResponse = fanOutResponse.get();
|
||||
responseChecker.accept(fanOutSearchResponse);
|
||||
assertEquals(1, fanOutSearchResponse.getNumReducePhases());
|
||||
|
||||
// compare Clusters objects
|
||||
SearchResponse.Clusters clustersMRT = minimizeRoundtripsSearchResponse.getClusters();
|
||||
SearchResponse.Clusters clustersMRTFalse = fanOutSearchResponse.getClusters();
|
||||
|
||||
assertEquals(clustersMRT.getTotal(), clustersMRTFalse.getTotal());
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.SUCCESSFUL),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.SUCCESSFUL)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.SKIPPED),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.SKIPPED)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.RUNNING),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.RUNNING)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.PARTIAL),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.PARTIAL)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.FAILED),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.FAILED)
|
||||
);
|
||||
|
||||
Map<String, Object> minimizeRoundtripsResponseMap = responseToMap(minimizeRoundtripsSearchResponse);
|
||||
if (clustersMRT.hasClusterObjects() && clustersMRTFalse.hasClusterObjects()) {
|
||||
Map<String, Object> fanOutResponseMap = responseToMap(fanOutSearchResponse);
|
||||
compareResponseMaps(minimizeRoundtripsResponseMap, fanOutResponseMap, "Comparing sync_search minimizeRoundTrip vs. fanOut");
|
||||
assertThat(minimizeRoundtripsSearchResponse.getSkippedShards(), lessThanOrEqualTo(fanOutSearchResponse.getSkippedShards()));
|
||||
}
|
||||
return minimizeRoundtripsResponseMap;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1139,54 +1151,65 @@ public class CCSDuelIT extends ESRestTestCase {
|
|||
} finally {
|
||||
deleteAsyncSearch(fanOutResponse.getId());
|
||||
}
|
||||
SearchResponse minimizeRoundtripsSearchResponse = minimizeRoundtripsResponse.getSearchResponse();
|
||||
SearchResponse fanOutSearchResponse = fanOutResponse.getSearchResponse();
|
||||
SearchResponse minimizeRoundtripsSearchResponse = null;
|
||||
SearchResponse fanOutSearchResponse = null;
|
||||
try {
|
||||
fanOutSearchResponse = fanOutResponse.getSearchResponse();
|
||||
minimizeRoundtripsSearchResponse = minimizeRoundtripsResponse.getSearchResponse();
|
||||
|
||||
responseChecker.accept(minimizeRoundtripsSearchResponse);
|
||||
responseChecker.accept(minimizeRoundtripsSearchResponse);
|
||||
|
||||
// if only the remote cluster was searched, then only one reduce phase is expected
|
||||
int expectedReducePhasesMinRoundTrip = 1;
|
||||
if (searchRequest.indices().length > 1) {
|
||||
expectedReducePhasesMinRoundTrip = searchRequest.indices().length + 1;
|
||||
// if only the remote cluster was searched, then only one reduce phase is expected
|
||||
int expectedReducePhasesMinRoundTrip = 1;
|
||||
if (searchRequest.indices().length > 1) {
|
||||
expectedReducePhasesMinRoundTrip = searchRequest.indices().length + 1;
|
||||
}
|
||||
assertEquals(expectedReducePhasesMinRoundTrip, minimizeRoundtripsSearchResponse.getNumReducePhases());
|
||||
|
||||
responseChecker.accept(fanOutSearchResponse);
|
||||
assertEquals(1, fanOutSearchResponse.getNumReducePhases());
|
||||
|
||||
// compare Clusters objects
|
||||
SearchResponse.Clusters clustersMRT = minimizeRoundtripsSearchResponse.getClusters();
|
||||
SearchResponse.Clusters clustersMRTFalse = fanOutSearchResponse.getClusters();
|
||||
|
||||
assertEquals(clustersMRT.getTotal(), clustersMRTFalse.getTotal());
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.SUCCESSFUL),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.SUCCESSFUL)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.SKIPPED),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.SKIPPED)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.RUNNING),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.RUNNING)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.PARTIAL),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.PARTIAL)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.FAILED),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.FAILED)
|
||||
);
|
||||
|
||||
Map<String, Object> minimizeRoundtripsResponseMap = responseToMap(minimizeRoundtripsSearchResponse);
|
||||
if (clustersMRT.hasClusterObjects() && clustersMRTFalse.hasClusterObjects()) {
|
||||
Map<String, Object> fanOutResponseMap = responseToMap(fanOutSearchResponse);
|
||||
compareResponseMaps(
|
||||
minimizeRoundtripsResponseMap,
|
||||
fanOutResponseMap,
|
||||
"Comparing async_search minimizeRoundTrip vs. fanOut"
|
||||
);
|
||||
assertThat(minimizeRoundtripsSearchResponse.getSkippedShards(), lessThanOrEqualTo(fanOutSearchResponse.getSkippedShards()));
|
||||
}
|
||||
return minimizeRoundtripsResponseMap;
|
||||
} finally {
|
||||
if (minimizeRoundtripsSearchResponse != null) minimizeRoundtripsSearchResponse.decRef();
|
||||
if (fanOutSearchResponse != null) fanOutSearchResponse.decRef();
|
||||
}
|
||||
assertEquals(expectedReducePhasesMinRoundTrip, minimizeRoundtripsSearchResponse.getNumReducePhases());
|
||||
|
||||
responseChecker.accept(fanOutSearchResponse);
|
||||
assertEquals(1, fanOutSearchResponse.getNumReducePhases());
|
||||
|
||||
// compare Clusters objects
|
||||
SearchResponse.Clusters clustersMRT = minimizeRoundtripsSearchResponse.getClusters();
|
||||
SearchResponse.Clusters clustersMRTFalse = fanOutSearchResponse.getClusters();
|
||||
|
||||
assertEquals(clustersMRT.getTotal(), clustersMRTFalse.getTotal());
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.SUCCESSFUL),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.SUCCESSFUL)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.SKIPPED),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.SKIPPED)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.RUNNING),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.RUNNING)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.PARTIAL),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.PARTIAL)
|
||||
);
|
||||
assertEquals(
|
||||
clustersMRT.getClusterStateCount(SearchResponse.Cluster.Status.FAILED),
|
||||
clustersMRTFalse.getClusterStateCount(SearchResponse.Cluster.Status.FAILED)
|
||||
);
|
||||
|
||||
Map<String, Object> minimizeRoundtripsResponseMap = responseToMap(minimizeRoundtripsSearchResponse);
|
||||
if (clustersMRT.hasClusterObjects() && clustersMRTFalse.hasClusterObjects()) {
|
||||
Map<String, Object> fanOutResponseMap = responseToMap(fanOutSearchResponse);
|
||||
compareResponseMaps(minimizeRoundtripsResponseMap, fanOutResponseMap, "Comparing async_search minimizeRoundTrip vs. fanOut");
|
||||
assertThat(minimizeRoundtripsSearchResponse.getSkippedShards(), lessThanOrEqualTo(fanOutSearchResponse.getSkippedShards()));
|
||||
}
|
||||
return minimizeRoundtripsResponseMap;
|
||||
}
|
||||
|
||||
private static void compareResponseMaps(Map<String, Object> responseMap1, Map<String, Object> responseMap2, String info) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue