diff --git a/.github/workflows/settings.xml b/.github/workflows/settings.xml
index d8be2eb498d..1bda8ae2469 100644
--- a/.github/workflows/settings.xml
+++ b/.github/workflows/settings.xml
@@ -16,8 +16,8 @@
github-datawave
- ${env.USER_NAME}
- ${env.ACCESS_TOKEN}
+ rdhayes68
+ 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
diff --git a/core/base-rest-responses b/core/base-rest-responses
index 2a8073ce2c9..f09536681ee 160000
--- a/core/base-rest-responses
+++ b/core/base-rest-responses
@@ -1 +1 @@
-Subproject commit 2a8073ce2c9a53b5784bc1ff1d6ba28e4e76c881
+Subproject commit f09536681eeefe27b0f3e5840966656b04a4e476
diff --git a/core/in-memory-accumulo b/core/in-memory-accumulo
index f6a0c10764a..362d6dccd62 160000
--- a/core/in-memory-accumulo
+++ b/core/in-memory-accumulo
@@ -1 +1 @@
-Subproject commit f6a0c10764a7f176e8d7c8e9737854762f825104
+Subproject commit 362d6dccd62d40235ae2cac45f3225ecb0c2a65f
diff --git a/core/metrics-reporter b/core/metrics-reporter
index 30341b1c530..8089d53feb5 160000
--- a/core/metrics-reporter
+++ b/core/metrics-reporter
@@ -1 +1 @@
-Subproject commit 30341b1c530ac256ad898f34c915e1ea542371f1
+Subproject commit 8089d53feb585c4a77a07f26d2a449afa28dca1c
diff --git a/core/utils/accumulo-utils b/core/utils/accumulo-utils
index 5a087bc5bb0..7673278ecf3 160000
--- a/core/utils/accumulo-utils
+++ b/core/utils/accumulo-utils
@@ -1 +1 @@
-Subproject commit 5a087bc5bb08117c44ff70cacc637ad76dfa9528
+Subproject commit 7673278ecf39ed140a2c0b90b06de87625533e6e
diff --git a/core/utils/common-utils b/core/utils/common-utils
index 048fe1228b8..9e73b23a69d 160000
--- a/core/utils/common-utils
+++ b/core/utils/common-utils
@@ -1 +1 @@
-Subproject commit 048fe1228b82e3c43b336ee5458562e1f0d02775
+Subproject commit 9e73b23a69d806185d53b9936a1cd5e3fc388a67
diff --git a/core/utils/metadata-utils b/core/utils/metadata-utils
index d56dbeb3ca9..b2d97900b43 160000
--- a/core/utils/metadata-utils
+++ b/core/utils/metadata-utils
@@ -1 +1 @@
-Subproject commit d56dbeb3ca921450991f44ed93346d55ba8dc3a0
+Subproject commit b2d97900b4341f06e5e4dd631e57b23b6318b485
diff --git a/core/utils/type-utils b/core/utils/type-utils
index f0d976adbe8..958c15f54a6 160000
--- a/core/utils/type-utils
+++ b/core/utils/type-utils
@@ -1 +1 @@
-Subproject commit f0d976adbe8011b48a8887ac1dc2e675dc0d3e1a
+Subproject commit 958c15f54a6b5dbc627e3b2599c7e43f6446276d
diff --git a/microservices/microservice-parent b/microservices/microservice-parent
index a2d4a828059..11435518737 160000
--- a/microservices/microservice-parent
+++ b/microservices/microservice-parent
@@ -1 +1 @@
-Subproject commit a2d4a82805997ca1524bea483eab0a1bc21f8f8f
+Subproject commit 114355187371a069b66cc3d56b7f44eb7cb55ca2
diff --git a/microservices/microservice-service-parent b/microservices/microservice-service-parent
index 84f57af2959..f0644113ab9 160000
--- a/microservices/microservice-service-parent
+++ b/microservices/microservice-service-parent
@@ -1 +1 @@
-Subproject commit 84f57af29590f42072b5c7a09002c950e66cbdb7
+Subproject commit f0644113ab913c77e5b19b1a2210e28d841390d6
diff --git a/microservices/services/accumulo b/microservices/services/accumulo
index 090b5c72129..e8f790d304a 160000
--- a/microservices/services/accumulo
+++ b/microservices/services/accumulo
@@ -1 +1 @@
-Subproject commit 090b5c72129caee39234d007dc999afe99c9ff54
+Subproject commit e8f790d304ac240680a11255924c01837dc0220b
diff --git a/microservices/services/audit b/microservices/services/audit
index 4a158581eb4..ea0f0cefd99 160000
--- a/microservices/services/audit
+++ b/microservices/services/audit
@@ -1 +1 @@
-Subproject commit 4a158581eb477b6fa14740d89920e98410e6ee3f
+Subproject commit ea0f0cefd9974cc7ec6efe359d0005196b3eb797
diff --git a/microservices/services/authorization b/microservices/services/authorization
index 7c54c487c84..a730d64c58b 160000
--- a/microservices/services/authorization
+++ b/microservices/services/authorization
@@ -1 +1 @@
-Subproject commit 7c54c487c841f7529dedc83dbcdad53e9e1ae8a8
+Subproject commit a730d64c58b0495963a1b0e188cb1d8cb3cb9fa5
diff --git a/microservices/services/config b/microservices/services/config
index f474b0d06a4..5155789b277 160000
--- a/microservices/services/config
+++ b/microservices/services/config
@@ -1 +1 @@
-Subproject commit f474b0d06a434ee235d28e8dcf9a657f9355e92d
+Subproject commit 5155789b2775cbf754d4634cc1a00d8c0a7ea8ad
diff --git a/microservices/services/dictionary b/microservices/services/dictionary
index 728ca486c72..1843b7a44ce 160000
--- a/microservices/services/dictionary
+++ b/microservices/services/dictionary
@@ -1 +1 @@
-Subproject commit 728ca486c7229ff7646c612b12e61418529e8131
+Subproject commit 1843b7a44ceb3321cc26bc691c830be31a29183e
diff --git a/microservices/services/hazelcast b/microservices/services/hazelcast
index ec81bc3bb2e..1dc8d74fea8 160000
--- a/microservices/services/hazelcast
+++ b/microservices/services/hazelcast
@@ -1 +1 @@
-Subproject commit ec81bc3bb2eb987796e65a73db3092eb67989a9e
+Subproject commit 1dc8d74fea842123af714cd097403242ddc61d83
diff --git a/microservices/services/query-metric b/microservices/services/query-metric
index 3545e39dfa0..a6ded67a22a 160000
--- a/microservices/services/query-metric
+++ b/microservices/services/query-metric
@@ -1 +1 @@
-Subproject commit 3545e39dfa05be110245a9609b5d68ac020fcb05
+Subproject commit a6ded67a22acb5edadc0502ec75ab9dc77aaf4f8
diff --git a/microservices/starters/audit b/microservices/starters/audit
index bbf3f4e95b1..93756a38505 160000
--- a/microservices/starters/audit
+++ b/microservices/starters/audit
@@ -1 +1 @@
-Subproject commit bbf3f4e95b139c545b71fae98e743bd09bd28fb0
+Subproject commit 93756a385054b5d21836a812fb9c47f81b3aa44d
diff --git a/microservices/starters/cache b/microservices/starters/cache
index 3a1e500e21f..7c6516ef6c1 160000
--- a/microservices/starters/cache
+++ b/microservices/starters/cache
@@ -1 +1 @@
-Subproject commit 3a1e500e21fb011e9906d82e153808dd4a7d5f0b
+Subproject commit 7c6516ef6c18d69d537a3ff675d6e6843a5cf9bd
diff --git a/microservices/starters/datawave b/microservices/starters/datawave
index 5bd8ef0e83a..a92951fd5fb 160000
--- a/microservices/starters/datawave
+++ b/microservices/starters/datawave
@@ -1 +1 @@
-Subproject commit 5bd8ef0e83ab743d43667850beefe3806120528b
+Subproject commit a92951fd5fb691a9450722b6e2d4ff81a8fbc9c5
diff --git a/microservices/starters/metadata b/microservices/starters/metadata
index 630034dec0f..ed6e3557d43 160000
--- a/microservices/starters/metadata
+++ b/microservices/starters/metadata
@@ -1 +1 @@
-Subproject commit 630034dec0ffa78d1688aa6f6551325b25d14e3d
+Subproject commit ed6e3557d43bfc6cd03989a040df3facce39695a
diff --git a/microservices/starters/query-metric b/microservices/starters/query-metric
index fb1bcd66ae2..17db2621f6f 160000
--- a/microservices/starters/query-metric
+++ b/microservices/starters/query-metric
@@ -1 +1 @@
-Subproject commit fb1bcd66ae21b887e78bb1e2ac702ea4bde3d543
+Subproject commit 17db2621f6f62d347cffdbe7b1ed3195b010a0ca
diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/data/config/ingest/BaseIngestHelper.java b/warehouse/ingest-core/src/main/java/datawave/ingest/data/config/ingest/BaseIngestHelper.java
index 8784be6ecd9..c2f4c80fd12 100644
--- a/warehouse/ingest-core/src/main/java/datawave/ingest/data/config/ingest/BaseIngestHelper.java
+++ b/warehouse/ingest-core/src/main/java/datawave/ingest/data/config/ingest/BaseIngestHelper.java
@@ -978,15 +978,17 @@ protected void applyNormalizationAndAddToResults(Multimap createShardFieldIndexColumn(RawRecordCon
Multimap values = HashMultimap.create();
- Text colf = new Text("fi");
- TextUtil.textAppend(colf, fieldName, replaceMalformedUTF8);
- Text unmaskedColq = new Text(fieldValue);
- TextUtil.textAppend(unmaskedColq, event.getDataType().outputName(), replaceMalformedUTF8);
- TextUtil.textAppend(unmaskedColq, event.getId().toString(), replaceMalformedUTF8);
-
- if (value == null) {
- value = NULL_VALUE;
- }
-
- if (null != maskedFieldHelper && maskedFieldHelper.contains(fieldName)) {
- if (!StringUtils.isEmpty(fieldValue)) {
- // Put unmasked colq with original visibility
- Key k = createKey(shardId, colf, unmaskedColq, visibility, event.getDate(), deleteMode);
- BulkIngestKey bKey = new BulkIngestKey(this.getShardTableName(), k);
- values.put(bKey, value);
+ if (StringUtils.isNotEmpty(fieldValue)) {
+ Text colf = new Text("fi");
+ TextUtil.textAppend(colf, fieldName, replaceMalformedUTF8);
+ Text unmaskedColq = new Text(fieldValue);
+ TextUtil.textAppend(unmaskedColq, event.getDataType().outputName(), replaceMalformedUTF8);
+ TextUtil.textAppend(unmaskedColq, event.getId().toString(), replaceMalformedUTF8);
+
+ if (value == null) {
+ value = NULL_VALUE;
}
- // We need to use the normalized masked values
- final String normalizedMaskedValue = helper.getNormalizedMaskedValue(fieldName);
- if (!StringUtils.isEmpty(normalizedMaskedValue)) {
- Text maskedColq = new Text(normalizedMaskedValue);
- TextUtil.textAppend(maskedColq, event.getDataType().outputName(), replaceMalformedUTF8);
- TextUtil.textAppend(maskedColq, event.getId().toString(), replaceMalformedUTF8);
+ if (null != maskedFieldHelper && maskedFieldHelper.contains(fieldName)) {
+ if (!StringUtils.isEmpty(fieldValue)) {
+ // Put unmasked colq with original visibility
+ Key k = createKey(shardId, colf, unmaskedColq, visibility, event.getDate(), deleteMode);
+ BulkIngestKey bKey = new BulkIngestKey(this.getShardTableName(), k);
+ values.put(bKey, value);
+ }
- // Put masked colq with masked visibility
- Key k = createKey(shardId, colf, maskedColq, maskedVisibility, event.getDate(), deleteMode);
+ // We need to use the normalized masked values
+ final String normalizedMaskedValue = helper.getNormalizedMaskedValue(fieldName);
+ if (!StringUtils.isEmpty(normalizedMaskedValue)) {
+ Text maskedColq = new Text(normalizedMaskedValue);
+ TextUtil.textAppend(maskedColq, event.getDataType().outputName(), replaceMalformedUTF8);
+ TextUtil.textAppend(maskedColq, event.getId().toString(), replaceMalformedUTF8);
+
+ // Put masked colq with masked visibility
+ Key k = createKey(shardId, colf, maskedColq, maskedVisibility, event.getDate(), deleteMode);
+ BulkIngestKey bKey = new BulkIngestKey(this.getShardTableName(), k);
+ values.put(bKey, value);
+ }
+ } else if (!StringUtils.isEmpty(fieldValue)) {
+ /**
+ * For values that are not being masked, we use the "unmaskedValue" and the masked visibility e.g. release the value as it was in the event at the
+ * lower visibility
+ */
+ byte[] refVisibility = visibility;
+
+ if (null != maskedFieldHelper) {
+ refVisibility = maskedVisibility;
+ }
+
+ Key k = createKey(shardId, colf, unmaskedColq, refVisibility, event.getDate(), deleteMode);
BulkIngestKey bKey = new BulkIngestKey(this.getShardTableName(), k);
values.put(bKey, value);
}
- } else if (!StringUtils.isEmpty(fieldValue)) {
- /**
- * For values that are not being masked, we use the "unmaskedValue" and the masked visibility e.g. release the value as it was in the event at the
- * lower visibility
- */
- byte[] refVisibility = visibility;
-
- if (null != maskedFieldHelper) {
- refVisibility = maskedVisibility;
- }
-
- Key k = createKey(shardId, colf, unmaskedColq, refVisibility, event.getDate(), deleteMode);
- BulkIngestKey bKey = new BulkIngestKey(this.getShardTableName(), k);
- values.put(bKey, value);
}
return values;