Skip to content

TEZ-4365: Use Regex Pattern to Parse DAG ID String #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
belugabehr wants to merge 2 commits into
base: master
Choose a base branch
from
+36 −49
Open

TEZ-4365: Use Regex Pattern to Parse DAG ID String #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae379cd
TEZ-4365: Use Regex Pattern to Parse DAG ID String
belugabehr Dec 28, 2021
033761c
Fix whitespace
belugabehr Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions tez-common/src/main/java/org/apache/tez/dag/records/TezDAGID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.apache.hadoop.yarn.api.records.ApplicationId;

Expand Down Expand Up @@ -133,6 +135,7 @@ public void write(DataOutput out) throws IOException {
super.write(out);
}

public static final Pattern DAG_ID_PATTERN = Pattern.compile("dag_(.+)_(\\d+)_(\\d+)");
// DO NOT CHANGE THIS. DAGClient replicates this code to create DAG id string
public static final String DAG = "dag";
static final ThreadLocal<FastNumberFormat> tezAppIdFormat = new ThreadLocal<FastNumberFormat>() {
Expand Down Expand Up @@ -175,25 +178,15 @@ public String getGroupId(int numDagsPerGroup) {
}

public static TezDAGID fromString(String dagId) {
int id = 0;
int appId = 0;
String[] split = dagId.split("_");
if (split.length != 4 || !dagId.startsWith(DAG + "_")) {
final Matcher match = DAG_ID_PATTERN.matcher(dagId);
if (!match.find()) {
throw new IllegalArgumentException("Invalid DAG Id format : " + dagId);
}
String rmId = split[1];
try {
appId = Integer.parseInt(split[2]);
} catch (NumberFormatException e) {
throw new IllegalArgumentException("Error while parsing App Id '"
+ split[2] + "' of DAG Id : " + dagId);
}
try {
id = Integer.parseInt(split[3]);
} catch (NumberFormatException e) {
throw new IllegalArgumentException("Error while parsing Id '" + split[3]
+ "' of DAG Id : " + dagId);
}

final String rmId = match.group(1);
final int appId = Integer.parseInt(match.group(2));
final int id = Integer.parseInt(match.group(3));

return TezDAGID.getInstance(rmId, appId, id);
}

Expand Down
58 changes: 26 additions & 32 deletions tez-common/src/test/java/org/apache/tez/dag/records/TestTezIds.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,43 +108,37 @@ public void testIdStringify() {
verifyAttemptId(taIdStr, taId);
}

@Test(timeout=5000)
public void testInvalidDagIds() {
String dagIdStr = "aaa_111_1_1";
TezDAGID dagId;
try {
dagId = TezDAGID.fromString(dagIdStr);
Assert.fail("Expected failure for invalid dagId=" + dagIdStr);
} catch (IllegalArgumentException e) {
Assert.assertTrue(e.getMessage().contains("Invalid DAG Id format"));
}

dagIdStr = "dag_111_11";
try {
dagId = TezDAGID.fromString(dagIdStr);
Assert.fail("Expected failure for invalid dagId=" + dagIdStr);
} catch (IllegalArgumentException e) {
Assert.assertTrue(e.getMessage().contains("Invalid DAG Id format"));
}
@Test
public void testFromStringValid() {
final TezDAGID dagId = TezDAGID.fromString("dag_111_2_3");
Assert.assertEquals(3, dagId.getId());
Assert.assertEquals(111, dagId.getApplicationId().getClusterTimestamp());
Assert.assertEquals(2, dagId.getApplicationId().getId());
}

dagIdStr = "dag_111_11_aa";
try {
dagId = TezDAGID.fromString(dagIdStr);
Assert.fail("Expected failure for invalid dagId=" + dagIdStr);
} catch (IllegalArgumentException e) {
Assert.assertTrue(e.getMessage().contains("Error while parsing"));
}
@Test(expected = IllegalArgumentException.class)
public void testFromStringInvalidPrefix() {
// Case sensitive
TezDAGID.fromString("DAG_111_1_1");
}

dagIdStr = "dag_111_aa_1";
try {
dagId = TezDAGID.fromString(dagIdStr);
Assert.fail("Expected failure for invalid dagId=" + dagIdStr);
} catch (IllegalArgumentException e) {
Assert.assertTrue(e.getMessage().contains("Error while parsing"));
}
@Test(expected = IllegalArgumentException.class)
public void testFromStringInvalidFormat() {
// Missing last field
TezDAGID.fromString("dag_111_11");
}

@Test(expected = IllegalArgumentException.class)
public void testFromStringInvalidID() {
// ID field must be numeric
TezDAGID.fromString("dag_111_11_aa");
}

@Test(expected = IllegalArgumentException.class)
public void testFromStringInvalidAppID() {
// App ID field must be numeric
TezDAGID.fromString("dag_111_aa_11");
}

public void testGetGroupIds() {
ApplicationId appId = ApplicationId.newInstance(0, 1);
Expand Down