iter

Author: jimczi

server/src/main/java/org/elasticsearch/index/fieldvisitor/StoredFieldLoader.java

@@ -66,6 +66,9 @@ public static StoredFieldLoader create(boolean loadSource, Set<String> fields) {
      *                              otherwise, uses the heuristic defined in {@link StoredFieldLoader#reader(LeafReaderContext, int[])}.
      */
     public static StoredFieldLoader create(boolean loadSource, Set<String> fields, boolean forceSequentialReader) {
+        if (loadSource == false && fields.isEmpty()) {
+            return StoredFieldLoader.empty();
+        }
         List<String> fieldsToLoad = fieldsToLoad(loadSource, fields);
         return new StoredFieldLoader() {
             @Override

server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java

@@ -944,7 +944,7 @@ public ReaderContext readerContext() {
     }
 
     @Override
-    public SourceLoader newSourceLoader(SourceFilter filter) {
+    public SourceLoader newSourceLoader(@Nullable SourceFilter filter) {
         return searchExecutionContext.newSourceLoader(filter, request.isForceSyntheticSource());
     }