You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by gt...@apache.org on 2016/05/04 23:45:32 UTC
[19/50] [abbrv] hadoop git commit: YARN-4224. Support fetching
entities by UID and change the REST interface to conform to current REST
APIs' in YARN. (Varun Saxena via gtcarrera9)
YARN-4224. Support fetching entities by UID and change the REST
interface to conform to current REST APIs' in YARN. (Varun Saxena via
gtcarrera9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/97d5cf32
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/97d5cf32
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/97d5cf32
Branch: refs/heads/YARN-2928
Commit: 97d5cf323128e9d6e3f832de891b90e1434fee7d
Parents: fd369a5
Author: Li Lu <gt...@apache.org>
Authored: Wed Jan 27 14:04:09 2016 -0800
Committer: Li Lu <gt...@apache.org>
Committed: Wed May 4 16:24:15 2016 -0700
----------------------------------------------------------------------
.../records/timelineservice/TimelineEntity.java | 13 +
.../server/timelineservice/TimelineContext.java | 146 ++
.../collector/TimelineCollectorContext.java | 86 +-
.../server/timelineservice/package-info.java | 28 +
.../reader/TimelineReaderContext.java | 88 ++
.../reader/TimelineReaderManager.java | 82 +-
.../reader/TimelineReaderUtils.java | 171 ++
.../reader/TimelineReaderWebServices.java | 1469 +++++++++++++++---
.../reader/TimelineReaderWebServicesUtils.java | 222 +++
.../reader/TimelineUIDConverter.java | 245 +++
.../timelineservice/storage/TimelineReader.java | 16 +-
.../storage/reader/GenericEntityReader.java | 7 +-
.../reader/TestTimelineReaderUtils.java | 55 +
.../reader/TestTimelineReaderWebServices.java | 83 +-
...stTimelineReaderWebServicesHBaseStorage.java | 348 ++++-
.../reader/TestTimelineUIDConverter.java | 97 ++
...TestPhoenixOfflineAggregationWriterImpl.java | 2 +-
17 files changed, 2781 insertions(+), 377 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/97d5cf32/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEntity.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEntity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEntity.java
index dcf2473..a661f7a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEntity.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEntity.java
@@ -504,6 +504,19 @@ public class TimelineEntity implements Comparable<TimelineEntity> {
}
}
+ /**
+ * Set UID in info which will be then used for query by UI.
+ * @param uidKey key for UID in info.
+ * @param uId UID to be set for the key.
+ */
+ public void setUID(String uidKey, String uId) {
+ if (real == null) {
+ info.put(uidKey, uId);
+ } else {
+ real.addInfo(uidKey, uId);
+ }
+ }
+
public boolean isValid() {
return (getId() != null && getType() != null);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/97d5cf32/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/TimelineContext.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/TimelineContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/TimelineContext.java
new file mode 100644
index 0000000..694b709
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/TimelineContext.java
@@ -0,0 +1,146 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.timelineservice;
+
+/**
+ * Encapsulates timeline context information.
+ */
+public class TimelineContext {
+
+ private String clusterId;
+ private String userId;
+ private String flowName;
+ private Long flowRunId;
+ private String appId;
+
+ public TimelineContext() {
+ this(null, null, null, 0L, null);
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((appId == null) ? 0 : appId.hashCode());
+ result = prime * result + ((clusterId == null) ? 0 : clusterId.hashCode());
+ result = prime * result + ((flowName == null) ? 0 : flowName.hashCode());
+ result = prime * result + ((flowRunId == null) ? 0 : flowRunId.hashCode());
+ result = prime * result + ((userId == null) ? 0 : userId.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ TimelineContext other = (TimelineContext) obj;
+ if (appId == null) {
+ if (other.appId != null) {
+ return false;
+ }
+ } else if (!appId.equals(other.appId)) {
+ return false;
+ }
+ if (clusterId == null) {
+ if (other.clusterId != null) {
+ return false;
+ }
+ } else if (!clusterId.equals(other.clusterId)) {
+ return false;
+ }
+ if (flowName == null) {
+ if (other.flowName != null) {
+ return false;
+ }
+ } else if (!flowName.equals(other.flowName)) {
+ return false;
+ }
+ if (flowRunId == null) {
+ if (other.flowRunId != null) {
+ return false;
+ }
+ } else if (!flowRunId.equals(other.flowRunId)) {
+ return false;
+ }
+ if (userId == null) {
+ if (other.userId != null) {
+ return false;
+ }
+ } else if (!userId.equals(other.userId)) {
+ return false;
+ }
+ return true;
+ }
+
+ public TimelineContext(String clusterId, String userId, String flowName,
+ Long flowRunId, String appId) {
+ this.clusterId = clusterId;
+ this.userId = userId;
+ this.flowName = flowName;
+ this.flowRunId = flowRunId;
+ this.appId = appId;
+ }
+
+ public String getClusterId() {
+ return clusterId;
+ }
+
+ public void setClusterId(String cluster) {
+ this.clusterId = cluster;
+ }
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String user) {
+ this.userId = user;
+ }
+
+ public String getFlowName() {
+ return flowName;
+ }
+
+ public void setFlowName(String flow) {
+ this.flowName = flow;
+ }
+
+ public Long getFlowRunId() {
+ return flowRunId;
+ }
+
+ public void setFlowRunId(long runId) {
+ this.flowRunId = runId;
+ }
+
+ public String getAppId() {
+ return appId;
+ }
+
+ public void setAppId(String app) {
+ this.appId = app;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/97d5cf32/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorContext.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/collector/TimelineCollectorContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorContext.java
index 6cc477f..58d68df 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorContext.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/TimelineCollectorContext.java
@@ -18,74 +18,58 @@
package org.apache.hadoop.yarn.server.timelineservice.collector;
-public class TimelineCollectorContext {
+import org.apache.hadoop.yarn.server.timelineservice.TimelineContext;
+
+/**
+ * Encapsulates context information required by collector during a put.
+ */
+public class TimelineCollectorContext extends TimelineContext {
- private String clusterId;
- private String userId;
- private String flowName;
private String flowVersion;
- private long flowRunId;
- private String appId;
public TimelineCollectorContext() {
this(null, null, null, null, 0L, null);
}
public TimelineCollectorContext(String clusterId, String userId,
- String flowName, String flowVersion, long flowRunId, String appId) {
- this.clusterId = clusterId;
- this.userId = userId;
- this.flowName = flowName;
+ String flowName, String flowVersion, Long flowRunId, String appId) {
+ super(clusterId, userId, flowName, flowRunId, appId);
this.flowVersion = flowVersion;
- this.flowRunId = flowRunId;
- this.appId = appId;
- }
-
- public String getClusterId() {
- return clusterId;
- }
-
- public void setClusterId(String clusterId) {
- this.clusterId = clusterId;
- }
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
}
- public String getFlowName() {
- return flowName;
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = super.hashCode();
+ result =
+ prime * result + ((flowVersion == null) ? 0 : flowVersion.hashCode());
+ return result + super.hashCode();
}
- public void setFlowName(String flowName) {
- this.flowName = flowName;
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!super.equals(obj)) {
+ return false;
+ }
+ TimelineCollectorContext other = (TimelineCollectorContext) obj;
+ if (flowVersion == null) {
+ if (other.flowVersion != null) {
+ return false;
+ }
+ } else if (!flowVersion.equals(other.flowVersion)) {
+ return false;
+ }
+ return true;
}
public String getFlowVersion() {
return flowVersion;
}
- public void setFlowVersion(String flowVersion) {
- this.flowVersion = flowVersion;
- }
-
- public long getFlowRunId() {
- return flowRunId;
- }
-
- public void setFlowRunId(long flowRunId) {
- this.flowRunId = flowRunId;
- }
-
- public String getAppId() {
- return appId;
- }
-
- public void setAppId(String appId) {
- this.appId = appId;
+ public void setFlowVersion(String version) {
+ this.flowVersion = version;
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/97d5cf32/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/package-info.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/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/package-info.java
new file mode 100644
index 0000000..58e23f0
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/package-info.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Package org.apache.hadoop.server.timelineservice contains classes to be used
+ * across timeline reader and collector.
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
+package org.apache.hadoop.yarn.server.timelineservice;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/97d5cf32/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderContext.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/reader/TimelineReaderContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderContext.java
new file mode 100644
index 0000000..d0ad54a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderContext.java
@@ -0,0 +1,88 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.timelineservice.reader;
+
+import org.apache.hadoop.yarn.server.timelineservice.TimelineContext;
+
+/**
+ * Encapsulates fields necessary to make a query in timeline reader.
+ */
+public class TimelineReaderContext extends TimelineContext {
+
+ private String entityType;
+ private String entityId;
+ public TimelineReaderContext(String clusterId, String userId, String flowName,
+ Long flowRunId, String appId, String entityType, String entityId) {
+ super(clusterId, userId, flowName, flowRunId, appId);
+ this.entityType = entityType;
+ this.entityId = entityId;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = super.hashCode();
+ result = prime * result + ((entityId == null) ? 0 : entityId.hashCode());
+ result =
+ prime * result + ((entityType == null) ? 0 : entityType.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!super.equals(obj)) {
+ return false;
+ }
+ TimelineReaderContext other = (TimelineReaderContext) obj;
+ if (entityId == null) {
+ if (other.entityId != null) {
+ return false;
+ }
+ } else if (!entityId.equals(other.entityId)) {
+ return false;
+ }
+ if (entityType == null) {
+ if (other.entityType != null) {
+ return false;
+ }
+ } else if (!entityType.equals(other.entityType)) {
+ return false;
+ }
+ return true;
+ }
+
+ public String getEntityType() {
+ return entityType;
+ }
+
+ public void setEntityType(String type) {
+ this.entityType = type;
+ }
+
+ public String getEntityId() {
+ return entityId;
+ }
+
+ public void setEntityId(String id) {
+ this.entityId = id;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/97d5cf32/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderManager.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/reader/TimelineReaderManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderManager.java
index 65d251d..a7d864e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderManager.java
@@ -27,15 +27,22 @@ import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.classification.InterfaceStability.Unstable;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.service.AbstractService;
+import org.apache.hadoop.yarn.api.records.timelineservice.FlowActivityEntity;
+import org.apache.hadoop.yarn.api.records.timelineservice.FlowRunEntity;
import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity;
+import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntityType;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.server.timelineservice.storage.TimelineReader;
import org.apache.hadoop.yarn.server.timelineservice.storage.TimelineReader.Field;
+import com.google.common.annotations.VisibleForTesting;
+
@Private
@Unstable
public class TimelineReaderManager extends AbstractService {
+ @VisibleForTesting
+ public static final String UID_KEY = "UID";
private TimelineReader reader;
public TimelineReaderManager(TimelineReader timelineReader) {
@@ -59,13 +66,63 @@ public class TimelineReaderManager extends AbstractService {
return clusterId;
}
+ private static TimelineEntityType getTimelineEntityType(String entityType) {
+ if (entityType == null) {
+ return null;
+ }
+ try {
+ return TimelineEntityType.valueOf(entityType);
+ } catch (IllegalArgumentException e) {
+ return null;
+ }
+ }
+
+ /**
+ * Fill UID in the info field of entity based on the query(identified by
+ * entity type).
+ * @param entityType Entity type of query.
+ * @param entity Timeline Entity.
+ * @param context Context defining the query.
+ */
+ private static void fillUID(TimelineEntityType entityType,
+ TimelineEntity entity, TimelineReaderContext context) {
+ if (entityType != null) {
+ switch(entityType) {
+ case YARN_FLOW_ACTIVITY:
+ FlowActivityEntity activityEntity = (FlowActivityEntity)entity;
+ context.setUserId(activityEntity.getUser());
+ context.setFlowName(activityEntity.getFlowName());
+ entity.setUID(UID_KEY,
+ TimelineUIDConverter.FLOW_UID.encodeUID(context));
+ return;
+ case YARN_FLOW_RUN:
+ FlowRunEntity runEntity = (FlowRunEntity)entity;
+ context.setFlowRunId(runEntity.getRunId());
+ entity.setUID(UID_KEY,
+ TimelineUIDConverter.FLOWRUN_UID.encodeUID(context));
+ return;
+ case YARN_APPLICATION:
+ context.setAppId(entity.getId());
+ entity.setUID(UID_KEY,
+ TimelineUIDConverter.APPLICATION_UID.encodeUID(context));
+ return;
+ default:
+ break;
+ }
+ }
+ context.setEntityType(entity.getType());
+ context.setEntityId(entity.getId());
+ entity.setUID(UID_KEY,
+ TimelineUIDConverter.GENERIC_ENTITY_UID.encodeUID(context));
+ }
+
/**
* Get a set of entities matching given predicates. The meaning of each
* argument has been documented with {@link TimelineReader#getEntities}.
*
* @see TimelineReader#getEntities
*/
- Set<TimelineEntity> getEntities(String userId, String clusterId,
+ public Set<TimelineEntity> getEntities(String userId, String clusterId,
String flowName, Long flowRunId, String appId, String entityType,
Long limit, Long createdTimeBegin, Long createdTimeEnd,
Map<String, Set<String>> relatesTo, Map<String, Set<String>> isRelatedTo,
@@ -73,10 +130,20 @@ public class TimelineReaderManager extends AbstractService {
Set<String> metricFilters, Set<String> eventFilters,
EnumSet<Field> fieldsToRetrieve) throws IOException {
String cluster = getClusterID(clusterId, getConfig());
- return reader.getEntities(userId, cluster, flowName, flowRunId, appId,
+ Set<TimelineEntity> entities =
+ reader.getEntities(userId, cluster, flowName, flowRunId, appId,
entityType, limit, createdTimeBegin, createdTimeEnd, relatesTo,
isRelatedTo, infoFilters, configFilters, metricFilters, eventFilters,
null, null, fieldsToRetrieve);
+ if (entities != null) {
+ TimelineEntityType type = getTimelineEntityType(entityType);
+ TimelineReaderContext context = new TimelineReaderContext(cluster, userId,
+ flowName, flowRunId, appId, entityType, null);
+ for (TimelineEntity entity : entities) {
+ fillUID(type, entity, context);
+ }
+ }
+ return entities;
}
/**
@@ -89,7 +156,16 @@ public class TimelineReaderManager extends AbstractService {
String flowName, Long flowRunId, String appId, String entityType,
String entityId, EnumSet<Field> fields) throws IOException {
String cluster = getClusterID(clusterId, getConfig());
- return reader.getEntity(userId, cluster, flowName, flowRunId, appId,
+ TimelineEntity entity =
+ reader.getEntity(userId, cluster, flowName, flowRunId, appId,
entityType, entityId, null, null, fields);
+
+ if (entity != null) {
+ TimelineEntityType type = getTimelineEntityType(entityType);
+ TimelineReaderContext context = new TimelineReaderContext(cluster, userId,
+ flowName, flowRunId, appId, entityType, null);
+ fillUID(type, entity, context);
+ }
+ return entity;
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/97d5cf32/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderUtils.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/reader/TimelineReaderUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderUtils.java
new file mode 100644
index 0000000..66abbfc
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderUtils.java
@@ -0,0 +1,171 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.timelineservice.reader;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * Set of utility methods to be used across timeline reader.
+ */
+final class TimelineReaderUtils {
+ private TimelineReaderUtils() {
+ }
+
+ /**
+ * Split the passed string along the passed delimiter character while looking
+ * for escape char to interpret the splitted parts correctly. For delimiter or
+ * escape character to be interpreted as part of the string, they have to be
+ * escaped by putting an escape character in front.
+ * @param str string to be split.
+ * @param delimiterChar delimiter used for splitting.
+ * @param escapeChar delimiter and escape character will be escaped using this
+ * character.
+ * @return a list of strings after split.
+ * @throws IllegalArgumentException if string is not properly escaped.
+ */
+ static List<String> split(final String str, final char delimiterChar,
+ final char escapeChar) throws IllegalArgumentException {
+ if (str == null) {
+ return null;
+ }
+ int len = str.length();
+ if (len == 0) {
+ return Collections.emptyList();
+ }
+ List<String> list = new ArrayList<String>();
+ // Keeps track of offset of the passed string.
+ int offset = 0;
+ // Indicates start offset from which characters will be copied from original
+ // string to destination string. Resets when an escape or delimiter char is
+ // encountered.
+ int startOffset = 0;
+ StringBuilder builder = new StringBuilder(len);
+ // Iterate over the string till we reach the end.
+ while (offset < len) {
+ if (str.charAt(offset) == escapeChar) {
+ // An escape character must be followed by a delimiter or escape char
+ // but we have reached the end and have no further character to look at.
+ if (offset + 1 >= len) {
+ throw new IllegalArgumentException(
+ "Escape char not properly escaped.");
+ }
+ char nextChar = str.charAt(offset + 1);
+ // Next character must be a delimiter or an escape char.
+ if (nextChar != escapeChar && nextChar != delimiterChar) {
+ throw new IllegalArgumentException(
+ "Escape char or delimiter char not properly escaped.");
+ }
+ // Copy contents from the offset where last escape or delimiter char was
+ // encountered.
+ if (startOffset < offset) {
+ builder.append(str.substring(startOffset, offset));
+ }
+ builder.append(nextChar);
+ offset += 2;
+ // Reset the start offset as an escape char has been encountered.
+ startOffset = offset;
+ continue;
+ } else if (str.charAt(offset) == delimiterChar) {
+ // A delimiter has been encountered without an escape character.
+ // String needs to be split here. Copy remaining chars and add the
+ // string to list.
+ builder.append(str.substring(startOffset, offset));
+ list.add(builder.toString());
+ // Reset the start offset as a delimiter has been encountered.
+ startOffset = ++offset;
+ builder = new StringBuilder(len - offset);
+ continue;
+ }
+ offset++;
+ }
+ // Copy rest of the characters.
+ if (!str.isEmpty()) {
+ builder.append(str.substring(startOffset));
+ }
+ // Add the last part of delimited string to list.
+ list.add(builder.toString());
+ return list;
+ }
+
+ private static String escapeString(final String str, final char delimiterChar,
+ final char escapeChar) {
+ if (str == null) {
+ return null;
+ }
+ int len = str.length();
+ if (len == 0) {
+ return "";
+ }
+ StringBuilder builder = new StringBuilder();
+ // Keeps track of offset of the passed string.
+ int offset = 0;
+ // Indicates start offset from which characters will be copied from original
+ // string to destination string. Resets when an escape or delimiter char is
+ // encountered.
+ int startOffset = 0;
+ // Iterate over the string till we reach the end.
+ while (offset < len) {
+ char charAtOffset = str.charAt(offset);
+ if (charAtOffset == escapeChar || charAtOffset == delimiterChar) {
+ // If an escape or delimiter character is encountered, copy characters
+ // from the offset where escape or delimiter was last encountered.
+ if (startOffset < offset) {
+ builder.append(str.substring(startOffset, offset));
+ }
+ // Append escape char before delimiter/escape char.
+ builder.append(escapeChar).append(charAtOffset);
+ // Reset start offset for copying characters when next escape/delimiter
+ // char is encountered.
+ startOffset = offset + 1;
+ }
+ offset++;
+ }
+ // Copy remaining characters.
+ builder.append(str.substring(startOffset));
+ return builder.toString();
+ }
+
+ /**
+ * Join different strings in the passed string array delimited by passed
+ * delimiter with delimiter and escape character escaped using passed escape
+ * char.
+ * @param strs strings to be joined.
+ * @param delimiterChar delimiter used to join strings.
+ * @param escapeChar escape character used to escape delimiter and escape
+ * char.
+ * @return a single string joined using delimiter and properly escaped.
+ */
+ static String joinAndEscapeStrings(final String[] strs,
+ final char delimiterChar, final char escapeChar) {
+ int len = strs.length;
+ // Escape each string in string array.
+ for (int index = 0; index < len; index++) {
+ if (strs[index] == null) {
+ return null;
+ }
+ strs[index] = escapeString(strs[index], delimiterChar, escapeChar);
+ }
+ // Join the strings after they have been escaped.
+ return StringUtils.join(strs, delimiterChar);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org