Skip to content

Commit

Permalink
edgetypeprefix reverted to fix hs
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Gross cogross committed Sep 9, 2024
1 parent 63ad856 commit 7525e30
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions warehouse/core/src/main/java/datawave/edge/util/EdgeKeyUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> normalizeSource(String source, List<? extends Type<?>> dataTypes, boolean protobuffEdgeFormat) {
Expand Down Expand Up @@ -183,7 +183,7 @@ public static Map<FieldKey,String> 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) {
Expand All @@ -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();
Expand Down

0 comments on commit 7525e30

Please sign in to comment.