From 180f27f754bee2d65b5354f487f23df4f5e38cdd Mon Sep 17 00:00:00 2001 From: Ivan Bella Date: Mon, 1 Jul 2024 12:30:13 +0000 Subject: [PATCH 1/5] 4.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 807b2ac..c245d7d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ ../../../microservices/microservice-parent/pom.xml metadata-utils - 4.0.4-SNAPSHOT + 4.0.4 https://code.nsa.gov/datawave-metadata-utils From 50670a0ae3298021912c84e8796bc2d9b095c99f Mon Sep 17 00:00:00 2001 From: Ivan Bella Date: Mon, 1 Jul 2024 12:31:14 +0000 Subject: [PATCH 2/5] 4.0.5-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c245d7d..713047b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ ../../../microservices/microservice-parent/pom.xml metadata-utils - 4.0.4 + 4.0.5-SNAPSHOT https://code.nsa.gov/datawave-metadata-utils From e6dd2cb6581fc85e4f13d34d656f5db49a8acede Mon Sep 17 00:00:00 2001 From: Ivan Bella Date: Tue, 2 Jul 2024 18:08:28 +0000 Subject: [PATCH 3/5] fixed #2444: Updated to appropriatly return no index holes when there are no indexed fields --- .../query/util/AllFieldMetadataHelper.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/datawave/query/util/AllFieldMetadataHelper.java b/src/main/java/datawave/query/util/AllFieldMetadataHelper.java index af91ef7..ff47676 100644 --- a/src/main/java/datawave/query/util/AllFieldMetadataHelper.java +++ b/src/main/java/datawave/query/util/AllFieldMetadataHelper.java @@ -33,6 +33,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.user.RegExFilter; import org.apache.accumulo.core.security.Authorizations; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.tuple.Pair; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.WritableUtils; @@ -1270,9 +1271,9 @@ public Map> getReversedFieldIndexHoles(Set> getFieldIndexHoles(Text targetCol indexedFields.addAll(indexedFieldMap.get(datatype)); } } + + // if the initial fields list is empty, then we want all possible holes if (fields.isEmpty()) { fields = indexedFields; } else { fields.retainAll(indexedFields); + + // if we have removed all fields, then there are no fields for which we can generate holes + if (fields.isEmpty()) { + return new HashMap<>(); + } } // Ensure the minThreshold is a percentage in the range 0%-100%. @@ -1378,6 +1386,11 @@ public boolean getBoundaryValue() { public long getCount() { return this.count; } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this); + } } /** From db1d530461bbdf0628a62d9b1dd79895ff4ac3eb Mon Sep 17 00:00:00 2001 From: Ivan Bella Date: Tue, 2 Jul 2024 18:09:06 +0000 Subject: [PATCH 4/5] 4.0.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 713047b..3f1e074 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ ../../../microservices/microservice-parent/pom.xml metadata-utils - 4.0.5-SNAPSHOT + 4.0.5 https://code.nsa.gov/datawave-metadata-utils From 02b63fdb6f631e9ce4153e795fca968316ad8b6e Mon Sep 17 00:00:00 2001 From: Ivan Bella Date: Tue, 2 Jul 2024 18:10:17 +0000 Subject: [PATCH 5/5] 4.0.6-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3f1e074..43a9ffa 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ ../../../microservices/microservice-parent/pom.xml metadata-utils - 4.0.5 + 4.0.6-SNAPSHOT https://code.nsa.gov/datawave-metadata-utils