honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-09 14:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

better names

Browse Source
This commit is contained in:
kimchy 2010-03-20 01:25:51 +02:00
parent d2bf446d9c
commit 049ce4ffcd
3 changed files with 19 additions and 19 deletions
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search
SingleInstanceEmbeddedSearchTests.javaTransportTwoServersSearchTests.javaTwoInstanceEmbeddedSearchTests.java

6
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/SingleInstanceEmbeddedSearchTests.java

@ -104,7 +104,7 @@ public class SingleInstanceEmbeddedSearchTests extends AbstractServersTests {
assertThat(queryFetchResult.fetchResult().hits().hits()[0].type(), equalTo("type1")); assertThat(queryFetchResult.fetchResult().hits().hits()[0].type(), equalTo("type1"));
} }
@Test public void testQueryFetch() throws Exception { @Test public void testQueryThenFetch() throws Exception {
QuerySearchResult queryResult = searchService.executeQueryPhase(searchRequest(searchSource().query(termQuery("name", "test1")))); QuerySearchResult queryResult = searchService.executeQueryPhase(searchRequest(searchSource().query(termQuery("name", "test1"))));
assertThat(queryResult.topDocs().totalHits, equalTo(1)); assertThat(queryResult.topDocs().totalHits, equalTo(1));
@ -119,7 +119,7 @@ public class SingleInstanceEmbeddedSearchTests extends AbstractServersTests {
assertThat(fetchResult.hits().hits()[0].type(), equalTo("type1")); assertThat(fetchResult.hits().hits()[0].type(), equalTo("type1"));
} }
@Test public void testQueryFetchInOneGo() throws Exception { @Test public void testQueryAndFetch() throws Exception {
QueryFetchSearchResult result = searchService.executeFetchPhase(searchRequest(searchSource().query(termQuery("name", "test1")))); QueryFetchSearchResult result = searchService.executeFetchPhase(searchRequest(searchSource().query(termQuery("name", "test1"))));
FetchSearchResult fetchResult = result.fetchResult(); FetchSearchResult fetchResult = result.fetchResult();
assertThat(fetchResult.hits().hits()[0].sourceAsString(), equalTo(source("1", "test1", 1))); assertThat(fetchResult.hits().hits()[0].sourceAsString(), equalTo(source("1", "test1", 1)));
@ -127,7 +127,7 @@ public class SingleInstanceEmbeddedSearchTests extends AbstractServersTests {
assertThat(fetchResult.hits().hits()[0].type(), equalTo("type1")); assertThat(fetchResult.hits().hits()[0].type(), equalTo("type1"));
} }
@Test public void testDfsQueryFetch() throws Exception { @Test public void testDfsQueryThenFetch() throws Exception {
DfsSearchResult dfsResult = searchService.executeDfsPhase(searchRequest(searchSource().query(termQuery("name", "test1")))); DfsSearchResult dfsResult = searchService.executeDfsPhase(searchRequest(searchSource().query(termQuery("name", "test1"))));
AggregatedDfs dfs = searchPhaseController.aggregateDfs(newArrayList(dfsResult)); AggregatedDfs dfs = searchPhaseController.aggregateDfs(newArrayList(dfsResult));

8
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TransportTwoServersSearchTests.java

@ -198,13 +198,13 @@ public class TransportTwoServersSearchTests extends AbstractServersTests {
} }
// TODO support scrolling // TODO support scrolling
// searchResponse = searchScrollAction.submit(new SearchScrollRequest(searchResponse.scrollId())).actionGet(); // searchResponse = client.searchScroll(searchScrollRequest(searchResponse.scrollId())).actionGet();
// //
// assertEquals(100, searchResponse.hits().totalHits()); // assertThat(searchResponse.hits().totalHits(), equalTo(100l));
// assertEquals(40, searchResponse.hits().hits().length); // assertThat(searchResponse.hits().hits().length, equalTo(40));
// for (int i = 0; i < 40; i++) { // for (int i = 0; i < 40; i++) {
// SearchHit hit = searchResponse.hits().hits()[i]; // SearchHit hit = searchResponse.hits().hits()[i];
// assertEquals("id[" + hit.id() + "]", Integer.toString(100 - 60 - 1 - i), hit.id()); // assertThat("id[" + hit.id() + "]", hit.id(), equalTo(Integer.toString(100 - 60 - 1 - i)));
// } // }
} }

24
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceEmbeddedSearchTests.java

@ -103,7 +103,7 @@ public class TwoInstanceEmbeddedSearchTests extends AbstractServersTests {
closeAllServers(); closeAllServers();
} }
@Test public void testDfsQueryFetch() throws Exception { @Test public void testDfsQueryThenFetch() throws Exception {
SearchSourceBuilder sourceBuilder = searchSource() SearchSourceBuilder sourceBuilder = searchSource()
.query(termQuery("multi", "test")) .query(termQuery("multi", "test"))
.from(0).size(60).explain(true).indexBoost("test", 1.0f).indexBoost("test2", 2.0f); .from(0).size(60).explain(true).indexBoost("test", 1.0f).indexBoost("test2", 2.0f);
@ -145,11 +145,11 @@ public class TwoInstanceEmbeddedSearchTests extends AbstractServersTests {
} }
// now try and scroll to the next batch of results // now try and scroll to the next batch of results
Map<SearchShardTarget, QuerySearchResultProvider> scollQueryResults = newHashMap(); Map<SearchShardTarget, QuerySearchResultProvider> scrollQueryResults = newHashMap();
for (QuerySearchResultProvider queryResult : queryResults.values()) { for (QuerySearchResultProvider queryResult : queryResults.values()) {
scollQueryResults.put(queryResult.queryResult().shardTarget(), nodeToSearchService.get(queryResult.shardTarget().nodeId()).executeQueryPhase(new InternalScrollSearchRequest(queryResult.id()))); scrollQueryResults.put(queryResult.queryResult().shardTarget(), nodeToSearchService.get(queryResult.shardTarget().nodeId()).executeQueryPhase(new InternalScrollSearchRequest(queryResult.id())));
} }
queryResults = scollQueryResults; queryResults = scrollQueryResults;
sortedShardList = searchPhaseController.sortDocs(queryResults.values()); sortedShardList = searchPhaseController.sortDocs(queryResults.values());
docIdsToLoad = searchPhaseController.docIdsToLoad(sortedShardList); docIdsToLoad = searchPhaseController.docIdsToLoad(sortedShardList);
@ -171,7 +171,7 @@ public class TwoInstanceEmbeddedSearchTests extends AbstractServersTests {
} }
} }
@Test public void testDfsQueryFetchWithSort() throws Exception { @Test public void testDfsQueryThenFetchWithSort() throws Exception {
SearchSourceBuilder sourceBuilder = searchSource() SearchSourceBuilder sourceBuilder = searchSource()
.query(termQuery("multi", "test")) .query(termQuery("multi", "test"))
.from(0).size(60).explain(true).sort("age", false); .from(0).size(60).explain(true).sort("age", false);
@ -212,11 +212,11 @@ public class TwoInstanceEmbeddedSearchTests extends AbstractServersTests {
} }
// now try and scroll to the next batch of results // now try and scroll to the next batch of results
Map<SearchShardTarget, QuerySearchResultProvider> scollQueryResults = newHashMap(); Map<SearchShardTarget, QuerySearchResultProvider> scrollQueryResults = newHashMap();
for (QuerySearchResultProvider queryResult : queryResults.values()) { for (QuerySearchResultProvider queryResult : queryResults.values()) {
scollQueryResults.put(queryResult.queryResult().shardTarget(), nodeToSearchService.get(queryResult.shardTarget().nodeId()).executeQueryPhase(new InternalScrollSearchRequest(queryResult.id()).scroll(new Scroll(timeValueMinutes(10))))); scrollQueryResults.put(queryResult.queryResult().shardTarget(), nodeToSearchService.get(queryResult.shardTarget().nodeId()).executeQueryPhase(new InternalScrollSearchRequest(queryResult.id()).scroll(new Scroll(timeValueMinutes(10)))));
} }
queryResults = scollQueryResults; queryResults = scrollQueryResults;
sortedShardList = searchPhaseController.sortDocs(queryResults.values()); sortedShardList = searchPhaseController.sortDocs(queryResults.values());
docIdsToLoad = searchPhaseController.docIdsToLoad(sortedShardList); docIdsToLoad = searchPhaseController.docIdsToLoad(sortedShardList);
@ -238,11 +238,11 @@ public class TwoInstanceEmbeddedSearchTests extends AbstractServersTests {
} }
// now try and scroll to the next next batch of results // now try and scroll to the next next batch of results
scollQueryResults = newHashMap(); scrollQueryResults = newHashMap();
for (QuerySearchResultProvider queryResult : queryResults.values()) { for (QuerySearchResultProvider queryResult : queryResults.values()) {
scollQueryResults.put(queryResult.queryResult().shardTarget(), nodeToSearchService.get(queryResult.shardTarget().nodeId()).executeQueryPhase(new InternalScrollSearchRequest(queryResult.id()))); scrollQueryResults.put(queryResult.queryResult().shardTarget(), nodeToSearchService.get(queryResult.shardTarget().nodeId()).executeQueryPhase(new InternalScrollSearchRequest(queryResult.id())));
} }
queryResults = scollQueryResults; queryResults = scrollQueryResults;
sortedShardList = searchPhaseController.sortDocs(queryResults.values()); sortedShardList = searchPhaseController.sortDocs(queryResults.values());
docIdsToLoad = searchPhaseController.docIdsToLoad(sortedShardList); docIdsToLoad = searchPhaseController.docIdsToLoad(sortedShardList);
@ -260,7 +260,7 @@ public class TwoInstanceEmbeddedSearchTests extends AbstractServersTests {
assertThat(hits.hits().length, equalTo(0)); assertThat(hits.hits().length, equalTo(0));
} }
@Test public void testQueryFetchInOneGo() { @Test public void testQueryAndFetch() {
SearchSourceBuilder sourceBuilder = searchSource() SearchSourceBuilder sourceBuilder = searchSource()
.query(termQuery("multi", "test")) .query(termQuery("multi", "test"))
.from(0).size(20).explain(true); .from(0).size(20).explain(true);