Merge remote-tracking branch 'origin/integration' into integration

NationalSecurityAgency · Feb 8, 2024 · 45623c7 · 45623c7
2 parents fa7e503 + a95abde
commit 45623c7
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/warehouse/query-core/src/main/java/datawave/query/planner/DefaultQueryPlanner.java b/warehouse/query-core/src/main/java/datawave/query/planner/DefaultQueryPlanner.java
@@ -2105,7 +2105,7 @@ protected Future<IteratorSetting> loadQueryIterator(final MetadataHelper metadat
 
             addOption(cfg, QueryOptions.SORTED_UIDS, Boolean.toString(config.isSortedUIDs()), false);
 
-            configureTypeMappings(config, cfg, metadataHelper, getCompressOptionMappings());
+            configureTypeMappings(config, cfg, metadataHelper, getCompressOptionMappings(), isPreload);
             configureAdditionalOptions(config, cfg);
 
             loadFields(cfg, config, isPreload);
@@ -2273,6 +2273,11 @@ protected IteratorSetting getQueryIterator(MetadataHelper metadataHelper, ShardQ
 
     public static void configureTypeMappings(ShardQueryConfiguration config, IteratorSetting cfg, MetadataHelper metadataHelper, boolean compressMappings)
                     throws DatawaveQueryException {
+        configureTypeMappings(config, cfg, metadataHelper, compressMappings, false);
+    }
+
+    public static void configureTypeMappings(ShardQueryConfiguration config, IteratorSetting cfg, MetadataHelper metadataHelper, boolean compressMappings,
+                    boolean isPreload) throws DatawaveQueryException {
         try {
             addOption(cfg, QueryOptions.QUERY_MAPPING_COMPRESS, Boolean.toString(compressMappings), false);
 
@@ -2286,7 +2291,7 @@ public static void configureTypeMappings(ShardQueryConfiguration config, Iterato
 
             TypeMetadata typeMetadata = metadataHelper.getTypeMetadata(config.getDatatypeFilter());
 
-            if (config.getReduceTypeMetadata()) {
+            if (config.getReduceTypeMetadata() && !isPreload) {
                 Set<String> fieldsToRetain = ReduceFields.getQueryFields(config.getQueryTree());
                 typeMetadata = typeMetadata.reduce(fieldsToRetain);
             }