Finally rebased

NationalSecurityAgency · Jul 12, 2024 · 1ddbcbe · 1ddbcbe
1 parent 6d54643
commit 1ddbcbe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/warehouse/query-core/src/main/java/datawave/query/iterator/QueryOptions.java b/warehouse/query-core/src/main/java/datawave/query/iterator/QueryOptions.java
@@ -1114,7 +1114,7 @@ public UniqueFields getUniqueFields() {
     }
 
     public void setUniqueFields(UniqueFields uniqueFields) {
-        this.uniqueFields = uniqueFields.clone();
+        this.uniqueFields = uniqueFields;
     }
 
     public Set<String> getHitsOnlySet() {
@@ -2334,7 +2334,7 @@ protected DefaultOptions createDefaultOptions() {
         defaultOptions.putDefaultValue(QueryOptions.GROUP_FIELDS, queryOptions.getGroupFields());
         defaultOptions.putDefaultValue(QueryOptions.GROUP_FIELDS_BATCH_SIZE, queryOptions.getGroupFieldsBatchSize());
         defaultOptions.putDefaultValue(QueryOptions.UNIQUE_FIELDS, queryOptions.getUniqueFields());
-        defaultOptions.putDefaultValue(QueryOptions.MOST_RECENT_UNIQUE, queryOptions.getUniqueFields().isMostRecent());
+        defaultOptions.putDefaultValue(QueryOptions.MOST_RECENT_UNIQUE, queryOptions.getUniqueFields());
         defaultOptions.putDefaultValue(QueryOptions.UNIQUE_CACHE_BUFFER_SIZE, queryOptions.getUniqueCacheBufferSize());
         defaultOptions.putDefaultValue(QueryOptions.HIT_LIST, getArithmetic());
         defaultOptions.putDefaultValue(QueryOptions.DATE_INDEX_TIME_TRAVEL, queryOptions.isDateIndexTimeTravel());

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
@@ -532,11 +532,6 @@ private void configureIterator(ShardQueryConfiguration config, IteratorSetting c
         addOption(cfg, QueryOptions.GROUP_FIELDS, config.getGroupFields().toString(), true);
         addOption(cfg, QueryOptions.GROUP_FIELDS_BATCH_SIZE, config.getGroupFieldsBatchSizeAsString(), true);
         addOption(cfg, QueryOptions.UNIQUE_FIELDS, config.getUniqueFields().toString(), true);
-        if (config.getUniqueFields().isMostRecent()) {
-            // this may be redundant with the uniqueFields.toString(), but other code relies on this explicitly being set
-            addOption(cfg, QueryOptions.MOST_RECENT_UNIQUE, (true));
-            addOption(cfg, QueryOptions.UNIQUE_CACHE_BUFFER_SIZE, Integer.toString(config.getUniqueCacheBufferSize()), false);
-        }
         addOption(cfg, QueryOptions.HIT_LIST, config.isHitList());
         addOption(cfg, QueryOptions.HIT_LIST, Boolean.toString(config.isHitList()), false);
         addOption(cfg, QueryOptions.TERM_FREQUENCY_FIELDS, Joiner.on(',').join(config.getQueryTermFrequencyFields()), false);