+2 −2

InnerHitBuilder.java

...a/org/elasticsearch/index/query/InnerHitBuilder.java

+54 −4

DocValueFormat.java

...in/java/org/elasticsearch/search/DocValueFormat.java

+2 −1

SearchService.java

...ain/java/org/elasticsearch/search/SearchService.java

+8 −8

TopHitsAggregator.java

.../aggregations/metrics/tophits/TopHitsAggregator.java

+2 −2

TopHitsAggregatorFactory.java

...ations/metrics/tophits/TopHitsAggregatorFactory.java

+1 −1

SearchPhaseController.java

...csearch/search/controller/SearchPhaseController.java

+2 −2

InnerHitsContext.java

...csearch/search/fetch/innerhits/InnerHitsContext.java

+2 −2

InnerHitsFetchSubPhase.java

...h/search/fetch/innerhits/InnerHitsFetchSubPhase.java

+4 −4

DefaultSearchContext.java

...sticsearch/search/internal/DefaultSearchContext.java

+3 −3

FilteredSearchContext.java

...ticsearch/search/internal/FilteredSearchContext.java

+7 −19

InternalSearchHit.java

...elasticsearch/search/internal/InternalSearchHit.java

+3 −2

SearchContext.java

...org/elasticsearch/search/internal/SearchContext.java

+4 −5

SubSearchContext.java

.../elasticsearch/search/internal/SubSearchContext.java

+13 −6

QueryPhase.java

.../java/org/elasticsearch/search/query/QueryPhase.java

+33 −1

QuerySearchResult.java

...rg/elasticsearch/search/query/QuerySearchResult.java

+1 −1

RescorePhase.java

...a/org/elasticsearch/search/rescore/RescorePhase.java

+14 −12

SearchAfterBuilder.java

...ticsearch/search/searchafter/SearchAfterBuilder.java

+8 −4

FieldSortBuilder.java

.../org/elasticsearch/search/sort/FieldSortBuilder.java

+3 −2

GeoDistanceSortBuilder.java

...lasticsearch/search/sort/GeoDistanceSortBuilder.java

+6 −3

ScoreSortBuilder.java

.../org/elasticsearch/search/sort/ScoreSortBuilder.java

+3 −2

ScriptSortBuilder.java

...org/elasticsearch/search/sort/ScriptSortBuilder.java

+38 −0

SortAndFormats.java

...va/org/elasticsearch/search/sort/SortAndFormats.java

+11 −5

SortBuilder.java

.../java/org/elasticsearch/search/sort/SortBuilder.java

+36 −0

SortFieldAndFormat.java

...rg/elasticsearch/search/sort/SortFieldAndFormat.java

+1 −0

NetworkAddressTests.java

...lasticsearch/common/network/NetworkAddressTests.java

+2 −2

HasChildQueryBuilderTests.java

...ticsearch/index/query/HasChildQueryBuilderTests.java

+2 −2

HasParentQueryBuilderTests.java

...icsearch/index/query/HasParentQueryBuilderTests.java

+2 −2

NestedQueryBuilderTests.java

...asticsearch/index/query/NestedQueryBuilderTests.java

+64 −0

DocValueFormatTests.java

...va/org/elasticsearch/search/DocValueFormatTests.java

+3 −4

SearchAfterIT.java

.../elasticsearch/search/searchafter/SearchAfterIT.java

+4 −3

AbstractSortTestCase.java

.../elasticsearch/search/sort/AbstractSortTestCase.java

+3 −1

FieldSortBuilderTests.java

...elasticsearch/search/sort/FieldSortBuilderTests.java

+47 −25

FieldSortIT.java

.../java/org/elasticsearch/search/sort/FieldSortIT.java

+1 −1

GeoDistanceSortBuilderIT.java

...sticsearch/search/sort/GeoDistanceSortBuilderIT.java

+2 −1

GeoDistanceSortBuilderTests.java

...csearch/search/sort/GeoDistanceSortBuilderTests.java

+2 −1

ScoreSortBuilderTests.java

...elasticsearch/search/sort/ScoreSortBuilderTests.java

+2 −1

ScriptSortBuilderTests.java

...lasticsearch/search/sort/ScriptSortBuilderTests.java

+4 −0

java.asciidoc

docs/reference/migration/migrate_5_0/java.asciidoc

+3 −9

TestSearchContext.java

...n/java/org/elasticsearch/test/TestSearchContext.java