Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make :server:check pass successfully #471

Merged
merged 3 commits into from
Mar 29, 2021
Merged

Make :server:check pass successfully #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c04df34
Fix package names in classes of the dummy plugin jars.
adnapibar Mar 27, 2021
00a3460
Fix the failing server tests as a result of renaming metadata prefix.
adnapibar Mar 27, 2021
1f135e9
Properly rename the data examples to fix test failure.
adnapibar Mar 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions server/src/internalClusterTest/java/org/opensearch/search/nested/SimpleNestedIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public void testMultiNested() throws Exception {
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));

searchResponse = client().prepareSearch("test").setQuery(nestedQuery("nested1.nested2",
termQuery("nested1.nested2.field2", "2"), ScoreMode.Avg)).get();
termQuery("nested1.nested2.field2", "2"), ScoreMode.Avg)).get();
assertNoFailures(searchResponse);
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));

Expand Down Expand Up @@ -552,16 +552,16 @@ public void testNestedSortWithMultiLevelFiltering() throws Exception {
+ " {\n"
+ " \"name\": \"read\",\n"
+ " \"user\": [\n"
+ " {\"username\": \"matt\", \"id\": 1},\n"
+ " {\"username\": \"fred\", \"id\": 2},\n"
+ " {\"username\": \"adrien\", \"id\": 3}\n"
+ " {\"username\": \"grault\", \"id\": 1},\n"
+ " {\"username\": \"quxx\", \"id\": 2},\n"
+ " {\"username\": \"bar\", \"id\": 3}\n"
+ " ]\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"write\",\n"
+ " \"user\": [\n"
+ " {\"username\": \"fred\", \"id\": 2},\n"
+ " {\"username\": \"adrien\", \"id\": 3}\n"
+ " {\"username\": \"quxx\", \"id\": 2},\n"
+ " {\"username\": \"bar\", \"id\": 3}\n"
+ " ]\n"
+ " }\n"
+ " ]\n"
Expand All @@ -572,20 +572,20 @@ public void testNestedSortWithMultiLevelFiltering() throws Exception {
+ " {\n"
+ " \"name\": \"read\",\n"
+ " \"user\": [\n"
+ " {\"username\": \"jim\", \"id\": 4},\n"
+ " {\"username\": \"fred\", \"id\": 2}\n"
+ " {\"username\": \"baz\", \"id\": 4},\n"
+ " {\"username\": \"quxx\", \"id\": 2}\n"
+ " ]\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"write\",\n"
+ " \"user\": [\n"
+ " {\"username\": \"fred\", \"id\": 2}\n"
+ " {\"username\": \"quxx\", \"id\": 2}\n"
+ " ]\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"execute\",\n"
+ " \"user\": [\n"
+ " {\"username\": \"fred\", \"id\": 2}\n"
+ " {\"username\": \"quxx\", \"id\": 2}\n"
+ " ]\n"
+ " }\n"
+ " ]\n"
Expand All @@ -601,14 +601,14 @@ public void testNestedSortWithMultiLevelFiltering() throws Exception {
+ " {\n"
+ " \"name\": \"read\",\n"
+ " \"user\": [\n"
+ " {\"username\": \"matt\", \"id\": 1},\n"
+ " {\"username\": \"quxx\", \"id\": 5}\n"
+ " {\"username\": \"grault\", \"id\": 1},\n"
+ " {\"username\": \"foo\", \"id\": 5}\n"
+ " ]\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"execute\",\n"
+ " \"user\": [\n"
+ " {\"username\": \"quxx\", \"id\": 5}\n"
+ " {\"username\": \"foo\", \"id\": 5}\n"
+ " ]\n"
+ " }\n"
+ " ]\n"
Expand All @@ -619,19 +619,19 @@ public void testNestedSortWithMultiLevelFiltering() throws Exception {
+ " {\n"
+ " \"name\": \"read\",\n"
+ " \"user\": [\n"
+ " {\"username\": \"matt\", \"id\": 1}\n"
+ " {\"username\": \"grault\", \"id\": 1}\n"
+ " ]\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"write\",\n"
+ " \"user\": [\n"
+ " {\"username\": \"matt\", \"id\": 1}\n"
+ " {\"username\": \"grault\", \"id\": 1}\n"
+ " ]\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"execute\",\n"
+ " \"user\": [\n"
+ " {\"username\": \"matt\", \"id\": 1}\n"
+ " {\"username\": \"grault\", \"id\": 1}\n"
+ " ]\n"
+ " }\n"
+ " ]\n"
Expand All @@ -640,7 +640,7 @@ public void testNestedSortWithMultiLevelFiltering() throws Exception {
+ "}", XContentType.JSON).get();
refresh();

// access id = 1, read, max value, asc, should use matt and fred
// access id = 1, read, max value, asc, should use grault and quxx
SearchResponse searchResponse = client().prepareSearch()
.setQuery(matchAllQuery())
.addSort(
Expand All @@ -658,12 +658,12 @@ public void testNestedSortWithMultiLevelFiltering() throws Exception {
assertHitCount(searchResponse, 2);
assertThat(searchResponse.getHits().getHits().length, equalTo(2));
assertThat(searchResponse.getHits().getHits()[0].getId(), equalTo("2"));
assertThat(searchResponse.getHits().getHits()[0].getSortValues()[0].toString(), equalTo("matt"));
assertThat(searchResponse.getHits().getHits()[0].getSortValues()[0].toString(), equalTo("grault"));
assertThat(searchResponse.getHits().getHits()[1].getId(), equalTo("1"));
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("fred"));
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("quxx"));


// access id = 1, read, min value, asc, should now use adrien and quxx
// access id = 1, read, min value, asc, should now use bar and foo
searchResponse = client().prepareSearch()
.setQuery(matchAllQuery())
.addSort(
Expand All @@ -681,11 +681,11 @@ public void testNestedSortWithMultiLevelFiltering() throws Exception {
assertHitCount(searchResponse, 2);
assertThat(searchResponse.getHits().getHits().length, equalTo(2));
assertThat(searchResponse.getHits().getHits()[0].getId(), equalTo("1"));
assertThat(searchResponse.getHits().getHits()[0].getSortValues()[0].toString(), equalTo("adrien"));
assertThat(searchResponse.getHits().getHits()[0].getSortValues()[0].toString(), equalTo("bar"));
assertThat(searchResponse.getHits().getHits()[1].getId(), equalTo("2"));
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("quxx"));
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("foo"));

// execute, by matt or quxx, by user id, sort missing first
// execute, by grault or foo, by user id, sort missing first
searchResponse = client().prepareSearch()
.setQuery(matchAllQuery())
.addSort(
Expand All @@ -694,7 +694,7 @@ public void testNestedSortWithMultiLevelFiltering() throws Exception {
.setNestedSort(new NestedSortBuilder("acl.operation")
.setFilter(QueryBuilders.termQuery("acl.operation.name", "execute"))
.setNestedSort(new NestedSortBuilder("acl.operation.user")
.setFilter(QueryBuilders.termsQuery("acl.operation.user.username", "matt", "quxx")))))
.setFilter(QueryBuilders.termsQuery("acl.operation.user.username", "grault", "foo")))))
.missing("_first")
.sortMode(SortMode.MIN)
.order(SortOrder.DESC)
Expand All @@ -707,7 +707,7 @@ public void testNestedSortWithMultiLevelFiltering() throws Exception {
assertThat(searchResponse.getHits().getHits()[1].getId(), equalTo("2"));
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("1"));

// execute, by matt or luca, by username, sort missing last (default)
// execute, by grault or foo, by username, sort missing last (default)
searchResponse = client().prepareSearch()
.setQuery(matchAllQuery())
.addSort(
Expand All @@ -716,7 +716,7 @@ public void testNestedSortWithMultiLevelFiltering() throws Exception {
.setNestedSort(new NestedSortBuilder("acl.operation")
.setFilter(QueryBuilders.termQuery("acl.operation.name", "execute"))
.setNestedSort(new NestedSortBuilder("acl.operation.user")
.setFilter(QueryBuilders.termsQuery("acl.operation.user.username", "matt", "quxx")))))
.setFilter(QueryBuilders.termsQuery("acl.operation.user.username", "grault", "foo")))))
.sortMode(SortMode.MIN)
.order(SortOrder.DESC)
)
Expand All @@ -725,7 +725,7 @@ public void testNestedSortWithMultiLevelFiltering() throws Exception {
assertHitCount(searchResponse, 2);
assertThat(searchResponse.getHits().getHits().length, equalTo(2));
assertThat(searchResponse.getHits().getHits()[0].getId(), equalTo("2"));
assertThat(searchResponse.getHits().getHits()[0].getSortValues()[0].toString(), equalTo("quxx"));
assertThat(searchResponse.getHits().getHits()[0].getSortValues()[0].toString(), equalTo("foo"));
assertThat(searchResponse.getHits().getHits()[1].getId(), equalTo("1")); // missing last
}

Expand Down
2 changes: 1 addition & 1 deletion server/src/internalClusterTest/java/org/opensearch/search/query/SearchQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ public void testFuzzyQueryString() {
client().prepareIndex("test", "type1", "2").setSource("str", "fred", "date", "2012-02-05", "num", 20).get();
refresh();

SearchResponse searchResponse = client().prepareSearch().setQuery(queryStringQuery("str:kimcy~1")).get();
SearchResponse searchResponse = client().prepareSearch().setQuery(queryStringQuery("str:foobaz~1")).get();
assertNoFailures(searchResponse);
assertHitCount(searchResponse, 1L);
assertFirstHit(searchResponse, hasId("1"));
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/opensearch/OpenSearchExceptionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public void testDeduplicate() throws IOException {
"\"phase\":\"search\",\"grouped\":true,\"failed_shards\":[{\"shard\":1,\"index\":\"foo\",\"node\":\"node_1\"," +
"\"reason\":{\"type\":\"parsing_exception\",\"reason\":\"foobar\",\"line\":1,\"col\":2}},{\"shard\":1," +
"\"index\":\"foo1\",\"node\":\"node_1\",\"reason\":{\"type\":\"query_shard_exception\",\"reason\":\"foobar\"," +
"\"index_uuid\":\"_na_\",\"index\":\"foo1\"}}]}";
"\"index\":\"foo1\",\"index_uuid\":\"_na_\"}}]}";
assertEquals(expected, Strings.toString(builder));
}
{
Expand Down
4 changes: 2 additions & 2 deletions server/src/test/java/org/opensearch/action/search/SearchPhaseExecutionExceptionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ public void testToXContent() throws IOException {
+ " \"reason\": {"
+ " \"type\": \"index_shard_closed_exception\","
+ " \"reason\": \"CurrentState[CLOSED] Closed\","
+ " \"index_uuid\": \"_na_\","
+ " \"index\": \"foo\","
+ " \"shard\": \"1\","
+ " \"index\": \"foo\""
+ " \"index_uuid\": \"_na_\""
+ " }"
+ " }"
+ " ]"
Expand Down
6 changes: 3 additions & 3 deletions server/src/test/java/org/opensearch/rest/action/RestActionsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ public void testBuildBroadcastShardsHeader() throws IOException {
" \"reason\" : {\n" +
" \"type\" : \"parsing_exception\",\n" +
" \"reason\" : \"error\",\n" +
" \"index_uuid\" : \"_na_\",\n" +
" \"index\" : \"index\",\n" +
" \"index_uuid\" : \"_na_\",\n" +
" \"line\" : 0,\n" +
" \"col\" : 0,\n" +
" \"caused_by\" : {\n" +
Expand All @@ -158,8 +158,8 @@ public void testBuildBroadcastShardsHeader() throws IOException {
" \"reason\" : {\n" +
" \"type\" : \"parsing_exception\",\n" +
" \"reason\" : \"error\",\n" +
" \"index_uuid\" : \"_na_\",\n" +
" \"index\" : \"index\",\n" +
" \"index_uuid\" : \"_na_\",\n" +
" \"line\" : 0,\n" +
" \"col\" : 0,\n" +
" \"caused_by\" : {\n" +
Expand All @@ -175,8 +175,8 @@ public void testBuildBroadcastShardsHeader() throws IOException {
" \"reason\" : {\n" +
" \"type\" : \"parsing_exception\",\n" +
" \"reason\" : \"error\",\n" +
" \"index_uuid\" : \"_na_\",\n" +
" \"index\" : \"index\",\n" +
" \"index_uuid\" : \"_na_\",\n" +
" \"line\" : 0,\n" +
" \"col\" : 0,\n" +
" \"caused_by\" : {\n" +
Expand Down
Binary file modified server/src/test/resources/org/opensearch/plugins/dummy-plugin.jar
View file
Open in desktop
Binary file not shown.
Binary file modified server/src/test/resources/org/opensearch/plugins/non-extensible-plugin.jar
View file
Open in desktop
Binary file not shown.