From ae3ae0303897b07040cd52f2ebb6e38e64fc6f67 Mon Sep 17 00:00:00 2001 From: Christopher Gross cogross Date: Fri, 12 Jul 2024 19:54:55 +0000 Subject: [PATCH] cleanup from merge --- .../main/java/datawave/query/attributes/UniqueFields.java | 2 -- .../main/java/datawave/query/index/lookup/TupleToRange.java | 5 ++++- .../java/datawave/query/jexl/visitors/PrintingVisitor.java | 5 ++++- .../src/main/java/datawave/query/tables/ShardQueryLogic.java | 3 --- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/UniqueFields.java b/warehouse/query-core/src/main/java/datawave/query/attributes/UniqueFields.java index c9b136e954a..5657a329964 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/UniqueFields.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/UniqueFields.java @@ -165,7 +165,6 @@ public UniqueFields(SortedSetMultimap fieldMap) { * the field * @param uniqueGranularity * the granularity - * @return the field map */ public void put(String field, UniqueGranularity uniqueGranularity) { fieldMap.put(field, uniqueGranularity); @@ -176,7 +175,6 @@ public void put(String field, UniqueGranularity uniqueGranularity) { * * @param fieldMap * the field map to add entries from - * @return the field map */ public void putAll(Multimap fieldMap) { if (fieldMap != null) { diff --git a/warehouse/query-core/src/main/java/datawave/query/index/lookup/TupleToRange.java b/warehouse/query-core/src/main/java/datawave/query/index/lookup/TupleToRange.java index 623533860e1..b830642ef6b 100644 --- a/warehouse/query-core/src/main/java/datawave/query/index/lookup/TupleToRange.java +++ b/warehouse/query-core/src/main/java/datawave/query/index/lookup/TupleToRange.java @@ -87,6 +87,7 @@ public static boolean isDocumentRange(IndexInfo indexInfo) { } /** + * Determine if this is a shard range * * @param shard * a shard string @@ -97,8 +98,10 @@ public static boolean isShardRange(String shard) { } /** + * Create Document ranges * - * + * @param tableName + * the name of the table * @param queryNode * a query node * @param shard diff --git a/warehouse/query-core/src/main/java/datawave/query/jexl/visitors/PrintingVisitor.java b/warehouse/query-core/src/main/java/datawave/query/jexl/visitors/PrintingVisitor.java index 3232cdd6b65..83295f00415 100644 --- a/warehouse/query-core/src/main/java/datawave/query/jexl/visitors/PrintingVisitor.java +++ b/warehouse/query-core/src/main/java/datawave/query/jexl/visitors/PrintingVisitor.java @@ -92,7 +92,6 @@ import org.apache.commons.jexl3.parser.ASTUnaryPlusNode; import org.apache.commons.jexl3.parser.ASTVar; import org.apache.commons.jexl3.parser.ASTWhileStatement; -import org.apache.commons.jexl3.parser.JexlLexicalNode; import org.apache.commons.jexl3.parser.JexlNode; import org.apache.commons.jexl3.parser.JexlNodes; import org.apache.commons.jexl3.parser.ParseException; @@ -291,6 +290,8 @@ public static String formattedQueryString(JexlNode query) { * a query node * @param maxChildNodes * maximum number of child nodes + * @param maxTermsToPrint + * maximum number of terms to print * @return a formatted string */ public static String formattedQueryString(JexlNode query, int maxChildNodes, int maxTermsToPrint) { @@ -325,6 +326,8 @@ public static List formattedQueryStringList(JexlNode query) { * a query node * @param maxChildNodes * maximum number of child nodes + * @param maxTermsToPrint + * maximum number of terms to print * @return list of the formatted strings */ public static List formattedQueryStringList(JexlNode query, int maxChildNodes, int maxTermsToPrint) { diff --git a/warehouse/query-core/src/main/java/datawave/query/tables/ShardQueryLogic.java b/warehouse/query-core/src/main/java/datawave/query/tables/ShardQueryLogic.java index d9dfdb5d801..5fea5b54985 100644 --- a/warehouse/query-core/src/main/java/datawave/query/tables/ShardQueryLogic.java +++ b/warehouse/query-core/src/main/java/datawave/query/tables/ShardQueryLogic.java @@ -690,9 +690,6 @@ public boolean isLongRunningQuery() { /** * If the configuration didn't exist, OR IT CHANGED, we need to create or update the transformers that have been added. - * - * @throws QueryException - * if error happens adding transformers */ private void addConfigBasedTransformers() { if (getConfig() != null) {