From eb6f986688709b97d70b7227a45a1ec86c77ef17 Mon Sep 17 00:00:00 2001 From: Christopher Gross cogross Date: Mon, 26 Aug 2024 18:03:10 +0000 Subject: [PATCH] edgetypeprefix reverted to fix hs --- .../src/main/java/datawave/edge/util/EdgeKeyUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/warehouse/core/src/main/java/datawave/edge/util/EdgeKeyUtil.java b/warehouse/core/src/main/java/datawave/edge/util/EdgeKeyUtil.java index e778f364289..d5dce59a9cd 100644 --- a/warehouse/core/src/main/java/datawave/edge/util/EdgeKeyUtil.java +++ b/warehouse/core/src/main/java/datawave/edge/util/EdgeKeyUtil.java @@ -21,7 +21,7 @@ * Utility class for generating regular expressions to scan various formats of the edge table. */ public class EdgeKeyUtil { - protected static final String EDGE_TYPE_PREFIX = "(?:^|STATS/[^/]+/)"; + protected static final String edgeTypePrefix = "(?:^|STATS/[^/]+/)"; public static final String MAX_UNICODE_STRING = new String(Character.toChars(Character.MAX_CODE_POINT)); public static Set normalizeSource(String source, List> dataTypes, boolean protobuffEdgeFormat) { @@ -183,7 +183,7 @@ public static Map dissasembleKey(Key key, boolean protobuffEdge public static String getEdgeColumnFamilyRegex(String edgeType, String edgeRelationship, String edgeAttribute1) { StringBuilder cfsb = new StringBuilder(); if (edgeType != null) { - cfsb.append(EDGE_TYPE_PREFIX).append(edgeType).append("/"); + cfsb.append(edgeTypePrefix).append(edgeType).append("/"); if (edgeRelationship != null && edgeAttribute1 == null) { cfsb.append(edgeRelationship); } else if (edgeRelationship != null && edgeAttribute1 != null) { @@ -194,11 +194,11 @@ public static String getEdgeColumnFamilyRegex(String edgeType, String edgeRelati cfsb.append(".*"); } } else if (edgeRelationship != null && edgeAttribute1 == null) { - cfsb.append(EDGE_TYPE_PREFIX + "[^/]+/").append(edgeRelationship).append(".*"); + cfsb.append(edgeTypePrefix + "[^/]+/").append(edgeRelationship).append(".*"); } else if (edgeAttribute1 != null && edgeRelationship == null) { - cfsb.append(EDGE_TYPE_PREFIX + "[^/]+/[^/]+/").append(edgeAttribute1).append(".*"); + cfsb.append(edgeTypePrefix + "[^/]+/[^/]+/").append(edgeAttribute1).append(".*"); } else if (edgeAttribute1 != null && edgeRelationship != null) { - cfsb.append(EDGE_TYPE_PREFIX + "[^/]+/").append(edgeRelationship).append("/").append(edgeAttribute1).append(".*"); + cfsb.append(edgeTypePrefix + "[^/]+/").append(edgeRelationship).append("/").append(edgeAttribute1).append(".*"); } return cfsb.toString();