http://git-wip-us.apache.org/repos/asf/hadoop/blob/89b4101f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunRowKey.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunRowKey.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunRowKey.java index a14d2bc..2cd9625 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunRowKey.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunRowKey.java @@ -27,14 +27,14 @@ import org.apache.hadoop.yarn.server.timelineservice.storage.common.TimelineStor public class FlowRunRowKey { private final String clusterId; private final String userId; - private final String flowId; + private final String flowName; private final long flowRunId; - public FlowRunRowKey(String clusterId, String userId, String flowId, + public FlowRunRowKey(String clusterId, String userId, String flowName, long flowRunId) { this.clusterId = clusterId; this.userId = userId; - this.flowId = flowId; + this.flowName = flowName; this.flowRunId = flowRunId; } @@ -46,8 +46,8 @@ public class FlowRunRowKey { return userId; } - public String getFlowId() { - return flowId; + public String getFlowName() { + return flowName; } public long getFlowRunId() { @@ -56,33 +56,33 @@ public class FlowRunRowKey { /** * Constructs a row key prefix for the flow run table as follows: { - * clusterId!userI!flowId!} + * clusterId!userI!flowName!} * * @param clusterId * @param userId - * @param flowId + * @param flowName * @return byte array with the row key prefix */ public static byte[] getRowKeyPrefix(String clusterId, String userId, - String flowId) { + String flowName) { return Bytes.toBytes(Separator.QUALIFIERS.joinEncoded(clusterId, userId, - flowId, "")); + flowName, "")); } /** * Constructs a row key for the entity table as follows: { - * clusterId!userI!flowId!Inverted Flow Run Id} + * clusterId!userI!flowName!Inverted Flow Run Id} * * @param clusterId * @param userId - * @param flowId + * @param flowName * @param flowRunId * @return byte array with the row key */ public static byte[] getRowKey(String clusterId, String userId, - String flowId, Long flowRunId) { + String flowName, Long flowRunId) { byte[] first = Bytes.toBytes(Separator.QUALIFIERS.joinEncoded(clusterId, - userId, flowId)); + userId, flowName)); // Note that flowRunId is a long, so we can't encode them all at the same // time. byte[] second = Bytes.toBytes(TimelineStorageUtils.invertLong(flowRunId)); @@ -104,10 +104,10 @@ public class FlowRunRowKey { Separator.QUALIFIERS.decode(Bytes.toString(rowKeyComponents[0])); String userId = Separator.QUALIFIERS.decode(Bytes.toString(rowKeyComponents[1])); - String flowId = + String flowName = Separator.QUALIFIERS.decode(Bytes.toString(rowKeyComponents[2])); long flowRunId = TimelineStorageUtils.invertLong(Bytes.toLong(rowKeyComponents[3])); - return new FlowRunRowKey(clusterId, userId, flowId, flowRunId); + return new FlowRunRowKey(clusterId, userId, flowName, flowRunId); } }
http://git-wip-us.apache.org/repos/asf/hadoop/blob/89b4101f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunTable.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunTable.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunTable.java index b1b93c1..2682fea 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunTable.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunTable.java @@ -47,7 +47,7 @@ import org.apache.hadoop.yarn.server.timelineservice.storage.common.BaseTable; * |-------------------------------------------| * | clusterId! | flow_version:version7 | * | userName! | | - * | flowId! | running_apps:1 | + * | flowName! | running_apps:1 | * | flowRunId | | * | | min_start_time:1392995080000 | * | | #0:"" | http://git-wip-us.apache.org/repos/asf/hadoop/blob/89b4101f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServices.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServices.java index 91f6ee5..9c74e2d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServices.java @@ -190,7 +190,7 @@ public class TestTimelineReaderWebServices { try { URI uri = URI.create("http://localhost:" + serverPort + "/ws/v2/" + "timeline/entity/cluster1/app1/app/id_1?userid=user1&" + - "flowid=flow1&flowrunid=1"); + "flowname=flow1&flowrunid=1"); ClientResponse resp = getResponse(client, uri); TimelineEntity entity = resp.getEntity(TimelineEntity.class); assertEquals(MediaType.APPLICATION_JSON_TYPE, resp.getType()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/89b4101f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java index 818cd89..0918d40 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java @@ -595,7 +595,7 @@ public class TestTimelineReaderWebServicesHBaseStorage { try { URI uri = URI.create("http://localhost:" + serverPort + "/ws/v2/" + "timeline/app/cluster1/application_1111111111_1111?" + - "userid=user1&fields=ALL&flowid=flow_name&flowrunid=1002345678919"); + "userid=user1&fields=ALL&flowname=flow_name&flowrunid=1002345678919"); ClientResponse resp = getResponse(client, uri); TimelineEntity entity = resp.getEntity(TimelineEntity.class); assertNotNull(entity); @@ -613,7 +613,7 @@ public class TestTimelineReaderWebServicesHBaseStorage { uri = URI.create("http://localhost:" + serverPort + "/ws/v2/" + "timeline/app/application_1111111111_2222?userid=user1" + - "&fields=metrics&flowid=flow_name&flowrunid=1002345678919"); + "&fields=metrics&flowname=flow_name&flowrunid=1002345678919"); resp = getResponse(client, uri); entity = resp.getEntity(TimelineEntity.class); assertNotNull(entity); http://git-wip-us.apache.org/repos/asf/hadoop/blob/89b4101f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorage.java index bc7b3a4..3198307 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorage.java @@ -841,7 +841,7 @@ public class TestHBaseTimelineStorage { assertEquals(user, key.getUserId()); assertEquals(cluster, key.getClusterId()); - assertEquals(flow, key.getFlowId()); + assertEquals(flow, key.getFlowName()); assertEquals(runid, key.getFlowRunId()); assertEquals(appName, key.getAppId()); assertEquals(te.getType(), key.getEntityType()); @@ -856,7 +856,7 @@ public class TestHBaseTimelineStorage { assertEquals(cluster, key.getClusterId()); assertEquals(user, key.getUserId()); - assertEquals(flow, key.getFlowId()); + assertEquals(flow, key.getFlowName()); assertEquals(runid, key.getFlowRunId()); assertEquals(appName, key.getAppId()); return true; http://git-wip-us.apache.org/repos/asf/hadoop/blob/89b4101f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowActivity.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowActivity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowActivity.java index 434adac..eda1e21 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowActivity.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowActivity.java @@ -165,7 +165,7 @@ public class TestHBaseStorageFlowActivity { assertNotNull(flowActivityRowKey); assertEquals(cluster, flowActivityRowKey.getClusterId()); assertEquals(user, flowActivityRowKey.getUserId()); - assertEquals(flow, flowActivityRowKey.getFlowId()); + assertEquals(flow, flowActivityRowKey.getFlowName()); long dayTs = TimelineStorageUtils.getTopOfTheDayTimestamp(System .currentTimeMillis()); assertEquals(dayTs, flowActivityRowKey.getDayTimestamp()); @@ -280,7 +280,7 @@ public class TestHBaseStorageFlowActivity { assertNotNull(flowActivityRowKey); assertEquals(cluster, flowActivityRowKey.getClusterId()); assertEquals(user, flowActivityRowKey.getUserId()); - assertEquals(flow, flowActivityRowKey.getFlowId()); + assertEquals(flow, flowActivityRowKey.getFlowName()); long dayTs = TimelineStorageUtils.getTopOfTheDayTimestamp(System .currentTimeMillis()); assertEquals(dayTs, flowActivityRowKey.getDayTimestamp()); @@ -409,7 +409,7 @@ public class TestHBaseStorageFlowActivity { assertNotNull(flowActivityRowKey); assertEquals(cluster, flowActivityRowKey.getClusterId()); assertEquals(user, flowActivityRowKey.getUserId()); - assertEquals(flow, flowActivityRowKey.getFlowId()); + assertEquals(flow, flowActivityRowKey.getFlowName()); long dayTs = TimelineStorageUtils.getTopOfTheDayTimestamp(System .currentTimeMillis()); assertEquals(dayTs, flowActivityRowKey.getDayTimestamp()); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org