From f8480491646a1d99d123579015f1eae797f6571f Mon Sep 17 00:00:00 2001 From: Christopher Gross cogross Date: Mon, 10 Jun 2024 15:52:51 +0000 Subject: [PATCH] MR notes --- .../core/src/main/java/datawave/edge/util/EdgeKey.java | 10 +++++----- .../main/java/datawave/mr/bulk/BulkInputFormat.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/warehouse/core/src/main/java/datawave/edge/util/EdgeKey.java b/warehouse/core/src/main/java/datawave/edge/util/EdgeKey.java index 79536ef233..1fa74354c6 100644 --- a/warehouse/core/src/main/java/datawave/edge/util/EdgeKey.java +++ b/warehouse/core/src/main/java/datawave/edge/util/EdgeKey.java @@ -44,7 +44,7 @@ public class EdgeKey { private static final Logger log = Logger.getLogger(EdgeKey.class); - private static final String CANT_ENCODE_UNKNOWN_ERROR_MSG = "Can't encode unknown edge key format."; + private static final String UNKNOWN_EDGE_KEY_FORMAT_MSG = "Can't encode unknown edge key format."; // use the builder, not this nightmare constructor private EdgeKey(EDGE_FORMAT format, STATS_TYPE statsType, String sourceData, String sinkData, String family, String sourceRelationship, @@ -927,7 +927,7 @@ public Key encode() { return encode(EDGE_VERSION.DATE_PROTOBUF); } else { // EDGE_FORMAT.UNKNOWN - throw new IllegalStateException(CANT_ENCODE_UNKNOWN_ERROR_MSG + this); + throw new IllegalStateException(UNKNOWN_EDGE_KEY_FORMAT_MSG + this); } } @@ -940,7 +940,7 @@ public Key encodeLegacyProtobufKey() { return encode(EDGE_VERSION.PROTOBUF); } else { // EDGE_FORMAT.UNKNOWN - throw new IllegalStateException(CANT_ENCODE_UNKNOWN_ERROR_MSG + this); + throw new IllegalStateException(UNKNOWN_EDGE_KEY_FORMAT_MSG + this); } } @@ -951,7 +951,7 @@ public Key encodeLegacyAttribute2Key() { return encode(EDGE_VERSION.BASE_ATTRIBUTE2); } else { // EDGE_FORMAT.UNKNOWN - throw new IllegalStateException(CANT_ENCODE_UNKNOWN_ERROR_MSG + this); + throw new IllegalStateException(UNKNOWN_EDGE_KEY_FORMAT_MSG + this); } } @@ -962,7 +962,7 @@ public Key encodeLegacyKey() { return encode(EDGE_VERSION.BASE); } else { // EDGE_FORMAT.UNKNOWN - throw new IllegalStateException(CANT_ENCODE_UNKNOWN_ERROR_MSG + this); + throw new IllegalStateException(UNKNOWN_EDGE_KEY_FORMAT_MSG + this); } } diff --git a/warehouse/core/src/main/java/datawave/mr/bulk/BulkInputFormat.java b/warehouse/core/src/main/java/datawave/mr/bulk/BulkInputFormat.java index 49083043cd..e714b7b94e 100644 --- a/warehouse/core/src/main/java/datawave/mr/bulk/BulkInputFormat.java +++ b/warehouse/core/src/main/java/datawave/mr/bulk/BulkInputFormat.java @@ -1292,7 +1292,7 @@ public AccumuloIteratorOption(String iteratorOption) { this.iteratorName = tokenizer.nextToken(); try { this.key = URLDecoder.decode(tokenizer.nextToken(), UTF8); - this.value = URLDecoder.decode(tokenizer.nextToken(), "UTF8"); + this.value = URLDecoder.decode(tokenizer.nextToken(), UTF8); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); }