Revert "Added most recent equivalent unique functions (#2339)"

This reverts commit bb8d353.

microservices/configcheck/src/test/resources/input/microservice/QueryLogicFactory.xml

@@ -233,23 +233,7 @@
         <bean class="datawave.query.language.functions.jexl.TimeFunction"/>
         <bean class="datawave.query.language.functions.jexl.Jexl"/>
         <bean class="datawave.query.language.functions.jexl.Options"/>
-        <bean class="datawave.query.language.functions.jexl.GroupBy"/>
         <bean class="datawave.query.language.functions.jexl.Unique"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByDay"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByHour"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByMinute"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByMonth"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueBySecond"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByTenthOfHour"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByYear"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUnique"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByDay"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByHour"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByMinute"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByMonth"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueBySecond"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByTenthOfHour"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByYear"/>
         <bean class="datawave.query.language.functions.jexl.Geowave.Contains"/>
         <bean class="datawave.query.language.functions.jexl.Geowave.CoveredBy"/>
         <bean class="datawave.query.language.functions.jexl.Geowave.Covers"/>

microservices/configcheck/src/test/resources/input/webservice/QueryLogicFactory.xml

@@ -38,23 +38,15 @@
         <bean class="datawave.query.language.functions.jexl.AtomValuesMatchFunction"/>
         <bean class="datawave.query.language.functions.jexl.Options"/>
         <bean class="datawave.query.language.functions.jexl.Rename"/>
-        <bean class="datawave.query.language.functions.jexl.GroupBy"/>
         <bean class="datawave.query.language.functions.jexl.Unique"/>
+        <bean class="datawave.query.language.functions.jexl.GroupBy"/>
         <bean class="datawave.query.language.functions.jexl.UniqueByDay"/>
         <bean class="datawave.query.language.functions.jexl.UniqueByHour"/>
         <bean class="datawave.query.language.functions.jexl.UniqueByMinute"/>
         <bean class="datawave.query.language.functions.jexl.UniqueByMonth"/>
+        <bean class="datawave.query.language.functions.jexl.UniqueByYear"/>
         <bean class="datawave.query.language.functions.jexl.UniqueBySecond"/>
         <bean class="datawave.query.language.functions.jexl.UniqueByTenthOfHour"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByYear"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUnique"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByDay"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByHour"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByMinute"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByMonth"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueBySecond"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByTenthOfHour"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByYear"/>
         <bean class="datawave.query.language.functions.jexl.NoExpansion"/>
         <bean class="datawave.query.language.functions.jexl.Compare"/>
         <bean class="datawave.query.language.functions.jexl.Geowave.Contains"/>

microservices/configcheck/src/test/resources/rendered/microservice/QueryLogicFactory.xml

@@ -233,23 +233,7 @@
         <bean class="datawave.query.language.functions.jexl.TimeFunction"/>
         <bean class="datawave.query.language.functions.jexl.Jexl"/>
         <bean class="datawave.query.language.functions.jexl.Options"/>
-        <bean class="datawave.query.language.functions.jexl.GroupBy"/>
         <bean class="datawave.query.language.functions.jexl.Unique"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByDay"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByHour"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByMinute"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByMonth"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueBySecond"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByTenthOfHour"/>
-        <bean class="datawave.query.language.functions.jexl.UniqueByYear"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUnique"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByDay"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByHour"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByMinute"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByMonth"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueBySecond"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByTenthOfHour"/>
-        <bean class="datawave.query.language.functions.jexl.MostRecentUniqueByYear"/>
         <bean class="datawave.query.language.functions.jexl.Geowave.Contains"/>
         <bean class="datawave.query.language.functions.jexl.Geowave.CoveredBy"/>
         <bean class="datawave.query.language.functions.jexl.Geowave.Covers"/>

warehouse/query-core/src/main/java/datawave/query/jexl/functions/QueryFunctions.java

@@ -25,8 +25,6 @@ public class QueryFunctions {
 
     public static final String QUERY_FUNCTION_NAMESPACE = "f";
     public static final String OPTIONS_FUNCTION = "options";
-
-    public static final String MOST_RECENT_PREFIX = "most_recent_";
     public static final String UNIQUE_FUNCTION = "unique";
     public static final String GROUPBY_FUNCTION = "groupby";
     public static final String EXCERPT_FIELDS_FUNCTION = "excerpt_fields";

warehouse/query-core/src/main/java/datawave/query/jexl/visitors/QueryOptionsFromQueryVisitor.java

@@ -48,8 +48,6 @@
  * {@code unique_by_minute('field1','field2')}</li>
  * <li>{@code f:unique_by_second()}: Expects a comma-delimited list of fields to be unique with a granularity level of by SECOND, e.g.
  * {@code unique_by_second('field1','field2')}</li>
- * <li>{@code f:most_recent_unique...} Adding most_recent_ before any unique function will set the most.recent.unique flag to true, e.g.
- * {@code most_recent_unique_by_day('field1','field2')}</li>
  * <li>{@code f:rename}: Expects a comma-delimited list field/field mappings e.g. {@code f:rename('field1=field2','field3=field4')}</li>
  * </ul>
  */
@@ -61,18 +59,9 @@ public class QueryOptionsFromQueryVisitor extends RebuildingVisitor {
                     QueryFunctions.UNIQUE_FUNCTION, UniqueFunction.UNIQUE_BY_DAY_FUNCTION, UniqueFunction.UNIQUE_BY_HOUR_FUNCTION,
                     UniqueFunction.UNIQUE_BY_MINUTE_FUNCTION, UniqueFunction.UNIQUE_BY_TENTH_OF_HOUR_FUNCTION, UniqueFunction.UNIQUE_BY_MONTH_FUNCTION,
                     UniqueFunction.UNIQUE_BY_SECOND_FUNCTION, UniqueFunction.UNIQUE_BY_MILLISECOND_FUNCTION, UniqueFunction.UNIQUE_BY_YEAR_FUNCTION,
-                    QueryFunctions.MOST_RECENT_PREFIX + QueryFunctions.UNIQUE_FUNCTION,
-                    QueryFunctions.MOST_RECENT_PREFIX + UniqueFunction.UNIQUE_BY_DAY_FUNCTION,
-                    QueryFunctions.MOST_RECENT_PREFIX + UniqueFunction.UNIQUE_BY_HOUR_FUNCTION,
-                    QueryFunctions.MOST_RECENT_PREFIX + UniqueFunction.UNIQUE_BY_MINUTE_FUNCTION,
-                    QueryFunctions.MOST_RECENT_PREFIX + UniqueFunction.UNIQUE_BY_TENTH_OF_HOUR_FUNCTION,
-                    QueryFunctions.MOST_RECENT_PREFIX + UniqueFunction.UNIQUE_BY_MONTH_FUNCTION,
-                    QueryFunctions.MOST_RECENT_PREFIX + UniqueFunction.UNIQUE_BY_SECOND_FUNCTION,
-                    QueryFunctions.MOST_RECENT_PREFIX + UniqueFunction.UNIQUE_BY_MILLISECOND_FUNCTION,
-                    QueryFunctions.MOST_RECENT_PREFIX + UniqueFunction.UNIQUE_BY_YEAR_FUNCTION, QueryFunctions.GROUPBY_FUNCTION,
-                    QueryFunctions.EXCERPT_FIELDS_FUNCTION, QueryFunctions.NO_EXPANSION, QueryFunctions.LENIENT_FIELDS_FUNCTION,
-                    QueryFunctions.STRICT_FIELDS_FUNCTION, QueryFunctions.SUM, QueryFunctions.MIN, QueryFunctions.MAX, QueryFunctions.AVERAGE,
-                    QueryFunctions.COUNT, QueryFunctions.RENAME_FUNCTION);
+                    QueryFunctions.GROUPBY_FUNCTION, QueryFunctions.EXCERPT_FIELDS_FUNCTION, QueryFunctions.NO_EXPANSION,
+                    QueryFunctions.LENIENT_FIELDS_FUNCTION, QueryFunctions.STRICT_FIELDS_FUNCTION, QueryFunctions.SUM, QueryFunctions.MIN, QueryFunctions.MAX,
+                    QueryFunctions.AVERAGE, QueryFunctions.COUNT, QueryFunctions.RENAME_FUNCTION);
 
     @SuppressWarnings("unchecked")
     public static <T extends JexlNode> T collect(T node, Object data) {
@@ -199,16 +188,7 @@ private Object visit(ASTFunctionNode node, Map<String,String> optionsMap) {
         ASTNamespaceIdentifier nsIdentifier = (ASTNamespaceIdentifier) node.jjtGetChild(0);
         // if this is the f:options function, create a List for the userData to be passed to the child nodes
         if (nsIdentifier.getNamespace().equals(QueryFunctions.QUERY_FUNCTION_NAMESPACE)) {
-            String function = String.valueOf(nsIdentifier.getName());
-
-            // check for the most recent flag for the unique functions only
-            boolean mostRecent = function.startsWith(QueryFunctions.MOST_RECENT_PREFIX + QueryFunctions.UNIQUE_FUNCTION);
-            if (mostRecent) {
-                function = function.substring(QueryFunctions.MOST_RECENT_PREFIX.length());
-                optionsMap.put(QueryParameters.MOST_RECENT_UNIQUE, "true");
-            }
-
-            switch (function) {
+            switch (String.valueOf(nsIdentifier.getName())) {
                 case QueryFunctions.OPTIONS_FUNCTION: {
                     List<String> optionsList = new ArrayList<>();
                     this.visit(node, optionsList);
@@ -254,7 +234,7 @@ private Object visit(ASTFunctionNode node, Map<String,String> optionsMap) {
                 case UniqueFunction.UNIQUE_BY_SECOND_FUNCTION:
                 case UniqueFunction.UNIQUE_BY_TENTH_OF_HOUR_FUNCTION: {
                     UniqueFields uniqueFields = new UniqueFields();
-                    updateUniqueFields(node, uniqueFields, optionsMap, UniqueFunction.findByName(function));
+                    updateUniqueFields(node, uniqueFields, optionsMap, UniqueFunction.findByName(nsIdentifier.getName()));
                     return null;
                 }
                 case QueryFunctions.GROUPBY_FUNCTION: {

warehouse/query-core/src/main/java/datawave/query/language/functions/jexl/UniqueByDay.java

@@ -1,9 +1,13 @@
 package datawave.query.language.functions.jexl;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 
+import datawave.query.jexl.functions.QueryFunctions;
 import datawave.query.jexl.visitors.QueryOptionsFromQueryVisitor;
 import datawave.query.language.functions.QueryFunction;
+import datawave.webservice.query.exception.BadRequestQueryException;
+import datawave.webservice.query.exception.DatawaveErrorCode;
 
 /**
  * Function to return a unique result for every day for a given list of fields. This function is equivalent to {@code #unique(field[DAY])}.