@@ -578,6 +578,7 @@ final SearchContext createContext(ShardSearchRequest request, @Nullable Engine.S
578578 try (XContentParser parser = XContentFactory .xContent (run ).createParser (run )) {
579579 QueryParseContext queryParseContext = new QueryParseContext (indexService .queryParserService ().indicesQueriesRegistry ());
580580 queryParseContext .reset (parser );
581+ queryParseContext .parseFieldMatcher (parseFieldMatcher );
581582 parseSource (context , SearchSourceBuilder .parseSearchSource (parser , queryParseContext ));
582583 }
583584 }
@@ -673,8 +674,8 @@ private void processFailure(SearchContext context, Throwable t) {
673674 private void parseSource (SearchContext context , SearchSourceBuilder source ) throws SearchParseException {
674675 // nothing to parse...
675676 if (source == null ) {
676- return ;
677- }
677+ return ;
678+ }
678679
679680 context .from (source .from ());
680681 context .size (source .size ());
@@ -686,10 +687,10 @@ private void parseSource(SearchContext context, SearchSourceBuilder source) thro
686687 }
687688 }
688689 if (source .query () != null ) {
689- context .parsedQuery (context .queryParserService ().parse (source .query ()));
690+ context .parsedQuery (context .queryParserService ().toQuery (source .query ()));
690691 }
691692 if (source .postFilter () != null ) {
692- context .parsedPostFilter (context .queryParserService ().parse (source .postFilter ()));
693+ context .parsedPostFilter (context .queryParserService ().toQuery (source .postFilter ()));
693694 }
694695 if (source .sorts () != null ) {
695696 XContentParser completeSortParser = null ;
@@ -775,15 +776,15 @@ private void parseSource(SearchContext context, SearchSourceBuilder source) thro
775776 }
776777 if (source .rescores () != null ) {
777778 XContentParser completeRescoreParser = null ;
778- try {
779+ try {
779780 XContentBuilder completeRescoreBuilder = XContentFactory .jsonBuilder ();
780781 completeRescoreBuilder .startObject ();
781782 completeRescoreBuilder .startArray ("rescore" );
782783 for (BytesReference rescore : source .rescores ()) {
783784 XContentParser parser = XContentFactory .xContent (rescore ).createParser (rescore );
784785 parser .nextToken ();
785786 completeRescoreBuilder .copyCurrentStructure (parser );
786- }
787+ }
787788 completeRescoreBuilder .endArray ();
788789 completeRescoreBuilder .endObject ();
789790 BytesReference completeRescoreBytes = completeRescoreBuilder .bytes ();
@@ -794,31 +795,31 @@ private void parseSource(SearchContext context, SearchSourceBuilder source) thro
794795 this .elementParsers .get ("rescore" ).parse (completeRescoreParser , context );
795796 } catch (Exception e ) {
796797 String sSource = "_na_" ;
797- try {
798+ try {
798799 sSource = source .toString ();
799800 } catch (Throwable e1 ) {
800801 // ignore
801802 }
802803 XContentLocation location = completeRescoreParser != null ? completeRescoreParser .getTokenLocation () : null ;
803804 throw new SearchParseException (context , "failed to parse rescore source [" + sSource + "]" , location , e );
804805 }
805- }
806+ }
806807 if (source .fields () != null ) {
807808 context .fieldNames ().addAll (source .fields ());
808- }
809+ }
809810 if (source .explain () != null ) {
810811 context .explain (source .explain ());
811- }
812+ }
812813 if (source .fetchSource () != null ) {
813814 context .fetchSourceContext (source .fetchSource ());
814- }
815+ }
815816 if (source .fieldDataFields () != null ) {
816817 FieldDataFieldsContext fieldDataFieldsContext = context .getFetchSubPhaseContext (FieldDataFieldsFetchSubPhase .CONTEXT_FACTORY );
817818 for (String field : source .fieldDataFields ()) {
818819 fieldDataFieldsContext .add (new FieldDataField (field ));
819820 }
820821 fieldDataFieldsContext .setHitExecutionNeeded (true );
821- }
822+ }
822823 if (source .highlighter () != null ) {
823824 XContentParser highlighterParser = null ;
824825 try {
@@ -830,10 +831,10 @@ private void parseSource(SearchContext context, SearchSourceBuilder source) thro
830831 sSource = source .toString ();
831832 } catch (Throwable e1 ) {
832833 // ignore
833- }
834+ }
834835 XContentLocation location = highlighterParser != null ? highlighterParser .getTokenLocation () : null ;
835836 throw new SearchParseException (context , "failed to parse suggest source [" + sSource + "]" , location , e );
836- }
837+ }
837838 }
838839 if (source .innerHits () != null ) {
839840 XContentParser innerHitsParser = null ;
@@ -843,7 +844,7 @@ private void parseSource(SearchContext context, SearchSourceBuilder source) thro
843844 this .elementParsers .get ("inner_hits" ).parse (innerHitsParser , context );
844845 } catch (Exception e ) {
845846 String sSource = "_na_" ;
846- try {
847+ try {
847848 sSource = source .toString ();
848849 } catch (Throwable e1 ) {
849850 // ignore
@@ -857,40 +858,40 @@ private void parseSource(SearchContext context, SearchSourceBuilder source) thro
857858 SearchScript searchScript = context .scriptService ().search (context .lookup (), field .script (), ScriptContext .Standard .SEARCH );
858859 context .scriptFields ().add (new ScriptField (field .fieldName (), searchScript , field .ignoreFailure ()));
859860 }
860- }
861+ }
861862 if (source .ext () != null ) {
862863 XContentParser extParser = null ;
863864 try {
864865 extParser = XContentFactory .xContent (source .ext ()).createParser (source .ext ());
865866 XContentParser .Token token = extParser .nextToken ();
866867 String currentFieldName = null ;
867868 while ((token = extParser .nextToken ()) != XContentParser .Token .END_OBJECT ) {
868- if (token == XContentParser .Token .FIELD_NAME ) {
869+ if (token == XContentParser .Token .FIELD_NAME ) {
869870 currentFieldName = extParser .currentName ();
870- } else {
871+ } else {
871872 SearchParseElement parseElement = this .elementParsers .get (currentFieldName );
872873 if (parseElement == null ) {
873874 throw new SearchParseException (context , "Unknown element [" + currentFieldName + "] in [ext]" ,
874875 extParser .getTokenLocation ());
875- } else {
876+ } else {
876877 parseElement .parse (extParser , context );
878+ }
877879 }
878880 }
879- }
880881 } catch (Exception e ) {
881- String sSource = "_na_" ;
882- try {
882+ String sSource = "_na_" ;
883+ try {
883884 sSource = source .toString ();
884- } catch (Throwable e1 ) {
885- // ignore
886- }
885+ } catch (Throwable e1 ) {
886+ // ignore
887+ }
887888 XContentLocation location = extParser != null ? extParser .getTokenLocation () : null ;
888889 throw new SearchParseException (context , "failed to parse ext source [" + sSource + "]" , location , e );
889890 }
890891 }
891892 if (source .version () != null ) {
892893 context .version (source .version ());
893- }
894+ }
894895 if (source .stats () != null ) {
895896 context .groupStats (source .stats ());
896897 }
@@ -1187,9 +1188,12 @@ public void run() {
11871188 try {
11881189 long now = System .nanoTime ();
11891190 final IndexService indexService = indicesService .indexServiceSafe (indexShard .shardId ().index ().name ());
1191+ QueryParseContext queryParseContext = new QueryParseContext (indexService .queryParserService ().indicesQueriesRegistry ());
1192+ // NOCOMMIT get a parseFieldMatcher from somewhere and set it on the queryParseContext
1193+ queryParseContext .parseFieldMatcher (indexService .queryParserService ().parseFieldMatcher ());
11901194 ShardSearchRequest request = new ShardSearchLocalRequest (indexShard .shardId (), indexMetaData
11911195 .getNumberOfShards (),
1192- SearchType .QUERY_THEN_FETCH , entry .source ().build (new QueryParseContext ( indexService . queryParserService (). indicesQueriesRegistry ()) ), entry .types (), entry .requestCache ());
1196+ SearchType .QUERY_THEN_FETCH , entry .source ().build (queryParseContext ), entry .types (), entry .requestCache ());
11931197 context = createContext (request , warmerContext .searcher ());
11941198 // if we use sort, we need to do query to sort on
11951199 // it and load relevant field data
0 commit comments