eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qingwz...@apache.org
Subject [2/4] incubator-eagle git commit: [EAGLE-467] Job list apis for querying jobs regardless of the status
Date Fri, 19 Aug 2016 09:46:56 GMT
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JPAEntityRepository.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JPAEntityRepository.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JPAEntityRepository.java
deleted file mode 100755
index 964d68a..0000000
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JPAEntityRepository.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.eagle.jpm.mr.history.entities;
-
-import org.apache.eagle.jpm.util.jobcounter.JobCounters;
-import org.apache.eagle.jpm.util.jobcounter.JobCountersSerDeser;
-import org.apache.eagle.log.entity.repo.EntityRepository;
-
-public class JPAEntityRepository extends EntityRepository {
-
-    public JPAEntityRepository() {
-        serDeserMap.put(JobCounters.class, new JobCountersSerDeser());
-        serDeserMap.put(JobConfig.class, new JobConfigSerDeser());
-        entitySet.add(JobConfigurationAPIEntity.class);
-        entitySet.add(JobEventAPIEntity.class);
-        entitySet.add(JobExecutionAPIEntity.class);
-
-        entitySet.add(TaskAttemptExecutionAPIEntity.class);
-        entitySet.add(TaskExecutionAPIEntity.class);
-        entitySet.add(TaskFailureCountAPIEntity.class);
-        entitySet.add(TaskAttemptCounterAPIEntity.class);
-        entitySet.add(JobProcessTimeStampEntity.class);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobBaseAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobBaseAPIEntity.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobBaseAPIEntity.java
deleted file mode 100644
index 32c6f7c..0000000
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobBaseAPIEntity.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.eagle.jpm.mr.history.entities;
-
-import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
-
-public class JobBaseAPIEntity extends TaggedLogAPIEntity {
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobConfig.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobConfig.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobConfig.java
deleted file mode 100644
index f1dc375..0000000
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobConfig.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.eagle.jpm.mr.history.entities;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-public final class JobConfig {
-    private Map<String, String> config = new TreeMap<>();
-
-    public Map<String, String> getConfig() {
-        return config;
-    }
-
-    public void setConfig(Map<String, String> config) {
-        this.config = config;
-    }
-    
-    public String toString(){
-        return config.toString();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobConfigSerDeser.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobConfigSerDeser.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobConfigSerDeser.java
deleted file mode 100755
index 8776f1f..0000000
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobConfigSerDeser.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.eagle.jpm.mr.history.entities;
-
-import org.apache.eagle.log.entity.meta.EntitySerDeser;
-import org.apache.hadoop.hbase.util.Bytes;
-
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-
-public class JobConfigSerDeser implements EntitySerDeser<JobConfig> {
-
-    @Override
-    public JobConfig deserialize(byte[] bytes) {
-        JobConfig jc = new JobConfig();
-        Map<String, String> map = new TreeMap<String, String>();
-        jc.setConfig(map);
-        String sb = Bytes.toString(bytes);
-        String[] keyValue = sb.split(",");
-        for (String pair : keyValue) {
-            String str[] = pair.split(":");
-            if (pair.equals("") || str[0].equals("")) continue;            
-            String key = str[0];
-            String value = "";
-            if (str.length == 2) value = str[1];
-            map.put(key, value);
-        }
-        return jc;
-    }
-    
-    @Override
-    public byte[] serialize(JobConfig conf) {
-        Map<String, String> map = conf.getConfig();
-        StringBuilder sb = new StringBuilder();
-        for (Entry<String, String> entry : map.entrySet())
-            sb.append(entry.getKey() + ":" + entry.getValue() + ",");
-        sb.deleteCharAt(sb.length() - 1);
-        return sb.toString().getBytes();
-    }
-
-    @Override
-    public Class<JobConfig> type(){
-        return JobConfig.class;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobConfigurationAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobConfigurationAPIEntity.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobConfigurationAPIEntity.java
deleted file mode 100755
index 295cc68..0000000
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobConfigurationAPIEntity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.eagle.jpm.mr.history.entities;
-
-import org.apache.eagle.jpm.util.Constants;
-import org.apache.eagle.log.entity.meta.*;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@Table("eaglejpa")
-@ColumnFamily("f")
-@Prefix("jconf")
-@Service(Constants.JPA_JOB_CONFIG_SERVICE_NAME)
-@TimeSeries(true)
-@Partition({"site"})
-@Indexes({
-        @Index(name="Index_1_jobId", columns = { "jobId" }, unique = true),
-        @Index(name="Index_2_jobDefId", columns = { "jobDefId" }, unique = false)
-})
-public class JobConfigurationAPIEntity extends JobBaseAPIEntity {
-    
-    @Column("a")
-    private String configJobName;
-    @Column("b")
-    private JobConfig jobConfig;
-    @Column("c")
-    private String alertEmailList;
-    
-    public JobConfig getJobConfig() {
-        return jobConfig;
-    }
-    public void setJobConfig(JobConfig jobConfig) {
-        this.jobConfig = jobConfig;
-        _pcs.firePropertyChange("jobConfig", null, null);
-    }
-    public String getConfigJobName() {
-        return configJobName;
-    }
-    public void setConfigJobName(String configJobName) {
-        this.configJobName = configJobName;
-        _pcs.firePropertyChange("configJobName", null, null);
-    }
-    public String getAlertEmailList() {
-        return alertEmailList;
-    }
-    public void setAlertEmailList(String alertEmailList) {
-        this.alertEmailList = alertEmailList;
-        _pcs.firePropertyChange("alertEmailList", null, null);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobEventAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobEventAPIEntity.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobEventAPIEntity.java
deleted file mode 100644
index 31dd480..0000000
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobEventAPIEntity.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.eagle.jpm.mr.history.entities;
-
-import org.apache.eagle.jpm.util.Constants;
-import org.apache.eagle.log.entity.meta.*;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@Table("eaglejpa")
-@ColumnFamily("f")
-@Prefix("jevent")
-@Service(Constants.JPA_JOB_EVENT_SERVICE_NAME)
-@TimeSeries(true)
-@Partition({"site"})
-public class JobEventAPIEntity extends JobBaseAPIEntity {
-
-    @Column("a")
-    private String eventType;
-
-    public String getEventType() {
-        return eventType;
-    }
-    public void setEventType(String eventType) {
-        this.eventType = eventType;
-        _pcs.firePropertyChange("eventType", null, null);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobExecutionAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobExecutionAPIEntity.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobExecutionAPIEntity.java
deleted file mode 100755
index e0ec330..0000000
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobExecutionAPIEntity.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * 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.eagle.jpm.mr.history.entities;
-
-import org.apache.eagle.jpm.util.Constants;
-import org.apache.eagle.jpm.util.jobcounter.JobCounters;
-import org.apache.eagle.log.entity.meta.*;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@Table("eaglejpa")
-@ColumnFamily("f")
-@Prefix("jexec")
-@Service(Constants.JPA_JOB_EXECUTION_SERVICE_NAME)
-@TimeSeries(true)
-@Partition({"site"})
-@Indexes({
-    @Index(name="Index_1_jobId", columns = { "jobId" }, unique = true),
-    @Index(name="Index_2_jobDefId", columns = { "jobDefId" }, unique = false)
-    })
-public class JobExecutionAPIEntity extends JobBaseAPIEntity {
-    @Column("a")
-    private String currentState;
-    @Column("b")
-    private long startTime;
-    @Column("c")
-    private long endTime;
-    @Column("d")
-    private int numTotalMaps;
-    @Column("e")
-    private int numFailedMaps;
-    @Column("f")
-    private int numFinishedMaps;
-    @Column("g")
-    private int numTotalReduces;
-    @Column("h")
-    private int numFailedReduces;
-    @Column("i")
-    private int numFinishedReduces;
-    @Column("j")
-    private JobCounters jobCounters;
-    @Column("k")
-    private int dataLocalMaps;
-    @Column("l")
-    private double dataLocalMapsPercentage;
-    @Column("m")
-    private int rackLocalMaps;
-    @Column("n")
-    private double rackLocalMapsPercentage;
-    @Column("o")
-    private int totalLaunchedMaps;
-    @Column("p")
-    private long submissionTime;
-    @Column("q")
-    private long lastMapDuration;
-    @Column("r")
-    private long lastReduceDuration;
-
-    public String getCurrentState() {
-        return currentState;
-    }
-    public void setCurrentState(String currentState) {
-        this.currentState = currentState;
-        _pcs.firePropertyChange("currentState", null, null);
-    }
-    public long getStartTime() {
-        return startTime;
-    }
-    public void setStartTime(long startTime) {
-        this.startTime = startTime;
-        _pcs.firePropertyChange("startTime", null, null);
-    }
-    public long getEndTime() {
-        return endTime;
-    }
-    public void setEndTime(long endTime) {
-        this.endTime = endTime;
-        _pcs.firePropertyChange("endTime", null, null);
-    }
-    public int getNumTotalMaps() {
-        return numTotalMaps;
-    }
-    public void setNumTotalMaps(int numTotalMaps) {
-        this.numTotalMaps = numTotalMaps;
-        _pcs.firePropertyChange("numTotalMaps", null, null);
-    }
-    public int getNumFailedMaps() {
-        return numFailedMaps;
-    }
-    public void setNumFailedMaps(int numFailedMaps) {
-        this.numFailedMaps = numFailedMaps;
-        _pcs.firePropertyChange("numFailedMaps", null, null);
-    }
-    public int getNumFinishedMaps() {
-        return numFinishedMaps;
-    }
-    public void setNumFinishedMaps(int numFinishedMaps) {
-        this.numFinishedMaps = numFinishedMaps;
-        _pcs.firePropertyChange("numFinishedMaps", null, null);
-    }
-    public int getNumTotalReduces() {
-        return numTotalReduces;
-    }
-    public void setNumTotalReduces(int numTotalReduces) {
-        this.numTotalReduces = numTotalReduces;
-        _pcs.firePropertyChange("numTotalReduces", null, null);
-    }
-    public int getNumFailedReduces() {
-        return numFailedReduces;
-    }
-    public void setNumFailedReduces(int numFailedReduces) {
-        this.numFailedReduces = numFailedReduces;
-        _pcs.firePropertyChange("numFailedReduces", null, null);
-    }
-    public int getNumFinishedReduces() {
-        return numFinishedReduces;
-    }
-
-    public void setNumFinishedReduces(int numFinishedReduces) {
-        this.numFinishedReduces = numFinishedReduces;
-        _pcs.firePropertyChange("numFinishedReduces", null, null);
-    }
-
-    public JobCounters getJobCounters() {
-        return jobCounters;
-    }
-
-    public void setJobCounters(JobCounters jobCounters) {
-        this.jobCounters = jobCounters;
-        _pcs.firePropertyChange("jobCounters", null, null);
-    }
-
-    public int getDataLocalMaps() {
-        return dataLocalMaps;
-    }
-
-    public void setDataLocalMaps(int dataLocalMaps) {
-        this.dataLocalMaps = dataLocalMaps;
-        valueChanged("dataLocalMaps");
-    }
-
-    public double getDataLocalMapsPercentage() {
-        return dataLocalMapsPercentage;
-    }
-
-    public void setDataLocalMapsPercentage(double dataLocalMapsPercentage) {
-        this.dataLocalMapsPercentage = dataLocalMapsPercentage;
-        valueChanged("dataLocalMapsPercentage");
-    }
-
-    public int getRackLocalMaps() {
-        return rackLocalMaps;
-    }
-
-    public void setRackLocalMaps(int rackLocalMaps) {
-        this.rackLocalMaps = rackLocalMaps;
-        valueChanged("rackLocalMaps");
-    }
-
-    public double getRackLocalMapsPercentage() {
-        return rackLocalMapsPercentage;
-    }
-
-    public void setRackLocalMapsPercentage(double rackLocalMapsPercentage) {
-        this.rackLocalMapsPercentage = rackLocalMapsPercentage;
-        valueChanged("rackLocalMapsPercentage");
-    }
-
-    public int getTotalLaunchedMaps() {
-        return totalLaunchedMaps;
-    }
-
-    public void setTotalLaunchedMaps(int totalLaunchedMaps) {
-        this.totalLaunchedMaps = totalLaunchedMaps;
-        valueChanged("totalLaunchedMaps");
-    }
-
-    public long getSubmissionTime() {
-        return submissionTime;
-    }
-
-    public void setSubmissionTime(long submissionTime) {
-        this.submissionTime = submissionTime;
-        valueChanged("submissionTime");
-    }
-
-    public long getLastMapDuration() {
-        return lastMapDuration;
-    }
-
-    public void setLastMapDuration(long lastMapDuration) {
-        this.lastMapDuration = lastMapDuration;
-        valueChanged("lastMapDuration");
-    }
-
-    public long getLastReduceDuration() {
-        return lastReduceDuration;
-    }
-
-    public void setLastReduceDuration(long lastReduceDuration) {
-        this.lastReduceDuration = lastReduceDuration;
-        valueChanged("lastReduceDuration");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobProcessTimeStampEntity.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobProcessTimeStampEntity.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobProcessTimeStampEntity.java
deleted file mode 100644
index 9e8a372..0000000
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/JobProcessTimeStampEntity.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.eagle.jpm.mr.history.entities;
-
-import org.apache.eagle.jpm.util.Constants;
-import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
-import org.apache.eagle.log.entity.meta.*;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@Table("eaglejpa_process")
-@ColumnFamily("f")
-@Prefix("process")
-@Service(Constants.JPA_JOB_PROCESS_TIME_STAMP_NAME)
-@TimeSeries(true)
-@Partition({"site"})
-public class JobProcessTimeStampEntity extends TaggedLogAPIEntity {
-    @Column("a")
-    private long currentTimeStamp;
-
-    public long getCurrentTimeStamp() {
-        return currentTimeStamp;
-    }
-    public void setCurrentTimeStamp(long currentTimeStamp) {
-        this.currentTimeStamp = currentTimeStamp;
-        _pcs.firePropertyChange("currentTimeStamp", null, null);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskAttemptCounterAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskAttemptCounterAPIEntity.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskAttemptCounterAPIEntity.java
deleted file mode 100644
index 929a98f..0000000
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskAttemptCounterAPIEntity.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.eagle.jpm.mr.history.entities;
-
-import org.apache.eagle.jpm.util.Constants;
-import org.apache.eagle.log.entity.meta.*;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@Table("eaglejpa_anomaly")
-@ColumnFamily("f")
-@Prefix("tacount")
-@Service(Constants.JPA_TASK_ATTEMPT_COUNTER_SERVICE_NAME)
-@TimeSeries(true)
-@Partition({"site"})
-public class TaskAttemptCounterAPIEntity extends JobBaseAPIEntity {
-    @Column("a")
-    private int totalCount;
-    @Column("b")
-    private int failedCount;
-    @Column("c")
-    private int killedCount;
-    
-    public int getKilledCount() {
-        return killedCount;
-    }
-    public void setKilledCount(int killedCount) {
-        this.killedCount = killedCount;
-        _pcs.firePropertyChange("killedCount", null, null);
-    }
-    public int getFailedCount() {
-        return failedCount;
-    }
-    public void setFailedCount(int failedCount) {
-        this.failedCount = failedCount;
-        _pcs.firePropertyChange("failedCount", null, null);
-    }
-    public int getTotalCount() {
-        return totalCount;
-    }
-    public void setTotalCount(int totalCount) {
-        this.totalCount = totalCount;
-        _pcs.firePropertyChange("totalCount", null, null);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskAttemptExecutionAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskAttemptExecutionAPIEntity.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskAttemptExecutionAPIEntity.java
deleted file mode 100755
index abc28e2..0000000
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskAttemptExecutionAPIEntity.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.eagle.jpm.mr.history.entities;
-
-import org.apache.eagle.jpm.util.Constants;
-import org.apache.eagle.jpm.util.jobcounter.JobCounters;
-import org.apache.eagle.log.entity.meta.*;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@Table("eaglejpa_task")
-@ColumnFamily("f")
-@Prefix("taexec")
-@Service(Constants.JPA_TASK_ATTEMPT_EXECUTION_SERVICE_NAME)
-@TimeSeries(true)
-@Partition({"site"})
-@Indexes({
-    @Index(name="Index_1_jobId", columns = { "jobID" }, unique = false)
-    })
-public class TaskAttemptExecutionAPIEntity extends JobBaseAPIEntity {
-    @Column("a")
-    private String taskStatus;
-    @Column("b")
-    private long startTime;
-    @Column("c")
-    private long endTime;
-    @Column("d")
-    private long duration;
-    @Column("e")
-    private String error;
-    @Column("f")
-    private JobCounters jobCounters;
-    @Column("g")
-    private String taskAttemptID;
-
-    public String getTaskStatus() {
-        return taskStatus;
-    }
-    public void setTaskStatus(String taskStatus) {
-        this.taskStatus = taskStatus;
-        _pcs.firePropertyChange("taskStatus", null, null);
-    }
-    public long getStartTime() {
-        return startTime;
-    }
-    public void setStartTime(long startTime) {
-        this.startTime = startTime;
-        _pcs.firePropertyChange("startTime", null, null);
-    }
-    public long getEndTime() {
-        return endTime;
-    }
-    public void setEndTime(long endTime) {
-        this.endTime = endTime;
-        _pcs.firePropertyChange("endTime", null, null);
-    }
-    public long getDuration() {
-        return duration;
-    }
-    public void setDuration(long duration) {
-        this.duration = duration;
-        _pcs.firePropertyChange("duration", null, null);
-    }
-    public String getError() {
-        return error;
-    }
-    public void setError(String error) {
-        this.error = error;
-        _pcs.firePropertyChange("error", null, null);
-    }
-    public JobCounters getJobCounters() {
-        return jobCounters;
-    }
-    public void setJobCounters(JobCounters jobCounters) {
-        this.jobCounters = jobCounters;
-        _pcs.firePropertyChange("jobCounters", null, null);
-    }
-    public String getTaskAttemptID() {
-        return taskAttemptID;
-    }
-    public void setTaskAttemptID(String taskAttemptID) {
-        this.taskAttemptID = taskAttemptID;
-        _pcs.firePropertyChange("taskAttemptID", null, null);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskExecutionAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskExecutionAPIEntity.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskExecutionAPIEntity.java
deleted file mode 100644
index c1f71b8..0000000
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskExecutionAPIEntity.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.eagle.jpm.mr.history.entities;
-
-import org.apache.eagle.jpm.util.Constants;
-import org.apache.eagle.jpm.util.jobcounter.JobCounters;
-import org.apache.eagle.log.entity.meta.*;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@Table("eaglejpa_task")
-@ColumnFamily("f")
-@Prefix("texec")
-@Service(Constants.JPA_TASK_EXECUTION_SERVICE_NAME)
-@TimeSeries(true)
-@Partition({"site"})
-public class TaskExecutionAPIEntity extends JobBaseAPIEntity {
-    @Column("a")
-    private String taskStatus;
-    @Column("b")
-    private long startTime;
-    @Column("c")
-    private long endTime;
-    @Column("d")
-    private long duration;
-    @Column("e")
-    private String error;
-    @Column("f")
-    private JobCounters jobCounters;
-
-    public String getTaskStatus() {
-        return taskStatus;
-    }
-    public void setTaskStatus(String taskStatus) {
-        this.taskStatus = taskStatus;
-        _pcs.firePropertyChange("taskStatus", null, null);
-    }
-    public long getStartTime() {
-        return startTime;
-    }
-    public void setStartTime(long startTime) {
-        this.startTime = startTime;
-        _pcs.firePropertyChange("startTime", null, null);
-    }
-    public long getEndTime() {
-        return endTime;
-    }
-    public void setEndTime(long endTime) {
-        this.endTime = endTime;
-        _pcs.firePropertyChange("endTime", null, null);
-    }
-    public long getDuration() {
-        return duration;
-    }
-    public void setDuration(long duration) {
-        this.duration = duration;
-        _pcs.firePropertyChange("duration", null, null);
-    }
-    public String getError() {
-        return error;
-    }
-    public void setError(String error) {
-        this.error = error;
-        _pcs.firePropertyChange("error", null, null);
-    }
-    public JobCounters getJobCounters() {
-        return jobCounters;
-    }
-    public void setJobCounters(JobCounters jobCounters) {
-        this.jobCounters = jobCounters;
-        _pcs.firePropertyChange("jobCounters", null, null);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskFailureCountAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskFailureCountAPIEntity.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskFailureCountAPIEntity.java
deleted file mode 100755
index 7456522..0000000
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/entities/TaskFailureCountAPIEntity.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.eagle.jpm.mr.history.entities;
-
-import org.apache.eagle.jpm.util.Constants;
-import org.apache.eagle.log.entity.meta.*;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@Table("eaglejpa_anomaly")
-@ColumnFamily("f")
-@Prefix("taskfailurecount")
-@Service(Constants.JPA_TASK_FAILURE_COUNT_SERVICE_NAME)
-@TimeSeries(true)
-@Partition({"site"})
-public class TaskFailureCountAPIEntity extends JobBaseAPIEntity {
-    @Column("a")
-    private int failureCount;
-    @Column("b")
-    private String error;
-    @Column("c")
-    private String taskStatus;
-
-
-    public String getTaskStatus() {
-        return taskStatus;
-    }
-
-    public void setTaskStatus(String taskStatus) {
-        this.taskStatus = taskStatus;
-        _pcs.firePropertyChange("taskStatus", null, null);
-    }
-
-    public String getError() {
-        return error;
-    }
-
-    public void setError(String error) {
-        this.error = error;
-        _pcs.firePropertyChange("error", null, null);
-    }
-
-    public int getFailureCount() {
-        return failureCount;
-    }
-
-    public void setFailureCount(int failureCount) {
-        this.failureCount = failureCount;
-        _pcs.firePropertyChange("failureCount", null, null);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/HistoryJobEntityCreationListener.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/HistoryJobEntityCreationListener.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/HistoryJobEntityCreationListener.java
index 559f7a8..bdaedd4 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/HistoryJobEntityCreationListener.java
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/HistoryJobEntityCreationListener.java
@@ -19,7 +19,7 @@
 package org.apache.eagle.jpm.mr.history.parser;
 
 
-import org.apache.eagle.jpm.mr.history.entities.JobBaseAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.JobBaseAPIEntity;
 
 /**
  * generalizing this listener would decouple entity creation and entity handling, also will help unit testing

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/HistoryJobEntityLifecycleListener.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/HistoryJobEntityLifecycleListener.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/HistoryJobEntityLifecycleListener.java
index fc678f8..ae6b5c9 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/HistoryJobEntityLifecycleListener.java
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/HistoryJobEntityLifecycleListener.java
@@ -18,7 +18,7 @@
 
 package org.apache.eagle.jpm.mr.history.parser;
 
-import org.apache.eagle.jpm.mr.history.entities.JobBaseAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.JobBaseAPIEntity;
 
 public interface HistoryJobEntityLifecycleListener extends HistoryJobEntityCreationListener {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFEventReaderBase.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFEventReaderBase.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFEventReaderBase.java
index 6442699..af3df85 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFEventReaderBase.java
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFEventReaderBase.java
@@ -18,9 +18,9 @@
 
 package org.apache.eagle.jpm.mr.history.parser;
 
-import org.apache.eagle.jpm.mr.history.entities.JobConfig;
+import org.apache.eagle.jpm.mr.historyentity.JobConfig;
 import org.apache.eagle.jpm.mr.history.crawler.JobHistoryContentFilter;
-import org.apache.eagle.jpm.mr.history.entities.*;
+import org.apache.eagle.jpm.mr.historyentity.*;
 import org.apache.eagle.jpm.util.Constants;
 import org.apache.eagle.jpm.util.JobNameNormalization;
 import org.apache.eagle.jpm.util.MRJobTagName;
@@ -167,20 +167,21 @@ public abstract class JHFEventReaderBase extends JobEntityCreationPublisher impl
            m_user = values.get(Keys.USER);
            m_queueName = values.get(Keys.JOB_QUEUE);
            m_jobName = values.get(Keys.JOBNAME);
-           m_jobDefId = m_jobName;
 
            // If given job name then use it as norm job name, otherwise use eagle JobNameNormalization rule to generate.
            String jobDefId = null;
-           if(configuration != null ) jobDefId = configuration.get(Constants.JOB_DEFINITION_ID_KEY);
+           if(configuration != null ) {
+               jobDefId = configuration.get(m_filter.getJobNameKey());
+           }
 
            if(jobDefId == null) {
                m_jobDefId = JobNameNormalization.getInstance().normalize(m_jobName);
            } else {
-               LOG.debug("Got normJobName from job configuration for " + id + ": " + jobDefId);
+               LOG.debug("Got JobDefId from job configuration for " + id + ": " + jobDefId);
                m_jobDefId = jobDefId;
            }
 
-           LOG.info("NormJobName of " + id + ": " + m_jobDefId);
+           LOG.info("JobDefId of " + id + ": " + m_jobDefId);
 
            m_jobSubmitEventEntity.getTags().put(MRJobTagName.USER.toString(), m_user);
            m_jobSubmitEventEntity.getTags().put(MRJobTagName.JOB_ID.toString(), m_jobId);
@@ -222,6 +223,7 @@ public abstract class JHFEventReaderBase extends JobEntityCreationPublisher impl
            m_jobExecutionEntity.setCurrentState(values.get(Keys.JOB_STATUS));
            m_jobExecutionEntity.setStartTime(m_jobLaunchEventEntity.getTimestamp());
            m_jobExecutionEntity.setEndTime(m_jobFinishEventEntity.getTimestamp());
+           m_jobExecutionEntity.setDurationTime(m_jobExecutionEntity.getEndTime() - m_jobExecutionEntity.getStartTime());
            m_jobExecutionEntity.setTimestamp(m_jobLaunchEventEntity.getTimestamp());
            m_jobExecutionEntity.setSubmissionTime(m_jobSubmitEventEntity.getTimestamp());
            if (values.get(Keys.FAILED_MAPS) != null) {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFMRVer1EventReader.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFMRVer1EventReader.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFMRVer1EventReader.java
index 278deca..654f63f 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFMRVer1EventReader.java
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFMRVer1EventReader.java
@@ -19,7 +19,7 @@
 package org.apache.eagle.jpm.mr.history.parser;
 
 import org.apache.eagle.jpm.mr.history.crawler.JobHistoryContentFilter;
-import org.apache.eagle.jpm.mr.history.entities.JobExecutionAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.JobExecutionAPIEntity;
 import org.apache.eagle.jpm.util.jobcounter.JobCounters;
 import org.apache.eagle.jpm.mr.history.parser.JHFMRVer1Parser.Keys;
 import org.apache.hadoop.conf.Configuration;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobConfigurationCreationServiceListener.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobConfigurationCreationServiceListener.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobConfigurationCreationServiceListener.java
index a748565..0334c9b 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobConfigurationCreationServiceListener.java
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobConfigurationCreationServiceListener.java
@@ -19,8 +19,8 @@
 package org.apache.eagle.jpm.mr.history.parser;
 
 import org.apache.eagle.jpm.mr.history.common.JHFConfigManager;
-import org.apache.eagle.jpm.mr.history.entities.JobBaseAPIEntity;
-import org.apache.eagle.jpm.mr.history.entities.JobConfigurationAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.JobBaseAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.JobConfigurationAPIEntity;
 import org.apache.eagle.service.client.IEagleServiceClient;
 import org.apache.eagle.service.client.impl.EagleServiceClientImpl;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityCreationEagleServiceListener.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityCreationEagleServiceListener.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityCreationEagleServiceListener.java
index 15c932d..e1a3c69 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityCreationEagleServiceListener.java
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityCreationEagleServiceListener.java
@@ -19,7 +19,7 @@
 package org.apache.eagle.jpm.mr.history.parser;
 
 import org.apache.eagle.jpm.mr.history.common.JHFConfigManager;
-import org.apache.eagle.jpm.mr.history.entities.*;
+import org.apache.eagle.jpm.mr.historyentity.*;
 import org.apache.eagle.log.entity.GenericServiceAPIResponseEntity;
 import org.apache.eagle.service.client.IEagleServiceClient;
 import org.apache.eagle.service.client.impl.EagleServiceClientImpl;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityCreationPublisher.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityCreationPublisher.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityCreationPublisher.java
index b9dc13b..6e0371c 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityCreationPublisher.java
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityCreationPublisher.java
@@ -18,7 +18,7 @@
 
 package org.apache.eagle.jpm.mr.history.parser;
 
-import org.apache.eagle.jpm.mr.history.entities.JobBaseAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.JobBaseAPIEntity;
 
 import java.util.Vector;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityLifecycleAggregator.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityLifecycleAggregator.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityLifecycleAggregator.java
index 38ca35c..27de19c 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityLifecycleAggregator.java
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JobEntityLifecycleAggregator.java
@@ -20,9 +20,9 @@ package org.apache.eagle.jpm.mr.history.parser;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.eagle.jpm.mr.history.entities.JobBaseAPIEntity;
-import org.apache.eagle.jpm.mr.history.entities.JobExecutionAPIEntity;
-import org.apache.eagle.jpm.mr.history.entities.TaskAttemptExecutionAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.JobBaseAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.JobExecutionAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.TaskAttemptExecutionAPIEntity;
 import org.apache.eagle.jpm.util.Constants;
 import org.apache.eagle.jpm.util.jobcounter.JobCounters;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/TaskAttemptCounterListener.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/TaskAttemptCounterListener.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/TaskAttemptCounterListener.java
index 94de068..d819baf 100755
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/TaskAttemptCounterListener.java
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/TaskAttemptCounterListener.java
@@ -19,9 +19,9 @@
 package org.apache.eagle.jpm.mr.history.parser;
 
 import org.apache.eagle.jpm.mr.history.common.JHFConfigManager;
-import org.apache.eagle.jpm.mr.history.entities.JobBaseAPIEntity;
-import org.apache.eagle.jpm.mr.history.entities.TaskAttemptCounterAPIEntity;
-import org.apache.eagle.jpm.mr.history.entities.TaskAttemptExecutionAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.JobBaseAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.TaskAttemptCounterAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.TaskAttemptExecutionAPIEntity;
 import org.apache.eagle.jpm.util.MRJobTagName;
 import org.apache.eagle.service.client.IEagleServiceClient;
 import org.apache.eagle.service.client.impl.EagleServiceClientImpl;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/TaskFailureListener.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/TaskFailureListener.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/TaskFailureListener.java
index 177fdc1..6e42fe2 100755
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/TaskFailureListener.java
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/TaskFailureListener.java
@@ -19,9 +19,9 @@
 package org.apache.eagle.jpm.mr.history.parser;
 
 import org.apache.eagle.jpm.mr.history.common.JHFConfigManager;
-import org.apache.eagle.jpm.mr.history.entities.JobBaseAPIEntity;
-import org.apache.eagle.jpm.mr.history.entities.TaskAttemptExecutionAPIEntity;
-import org.apache.eagle.jpm.mr.history.entities.TaskFailureCountAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.JobBaseAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.TaskAttemptExecutionAPIEntity;
+import org.apache.eagle.jpm.mr.historyentity.TaskFailureCountAPIEntity;
 import org.apache.eagle.jpm.util.MRJobTagName;
 import org.apache.eagle.service.client.IEagleServiceClient;
 import org.apache.eagle.service.client.impl.EagleServiceClientImpl;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java
index 6e9ccfa..3daae37 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java
@@ -24,7 +24,7 @@ import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseRichSpout;
 import org.apache.eagle.jpm.mr.history.common.JHFConfigManager;
 import org.apache.eagle.jpm.mr.history.crawler.*;
-import org.apache.eagle.jpm.mr.history.entities.JobProcessTimeStampEntity;
+import org.apache.eagle.jpm.mr.historyentity.JobProcessTimeStampEntity;
 import org.apache.eagle.jpm.mr.history.zkres.JobHistoryZKStateManager;
 import org.apache.eagle.jpm.util.JobIdFilter;
 import org.apache.eagle.jpm.util.JobIdFilterByPartition;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-history/src/main/resources/application.conf
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/resources/application.conf b/eagle-jpm/eagle-jpm-mr-history/src/main/resources/application.conf
index 60f90a0..23a51fc 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/resources/application.conf
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/resources/application.conf
@@ -63,23 +63,20 @@
     }
   },
 
-  "MRConfigureKeys" : [
-    "mapreduce.map.output.compress",
-    "mapreduce.map.output.compress.codec",
-    "mapreduce.output.fileoutputformat.compress",
-    "mapreduce.output.fileoutputformat.compress.type",
-    "mapreduce.output.fileoutputformat.compress.codec",
-    "mapred.output.format.class",
-    "eagle.job.runid",
-    "eagle.job.runidfieldname",
-    "eagle.job.name",
-    "eagle.job.normalizedfieldname",
-    "eagle.alert.email",
-    "eagle.job.alertemailaddress",
-    "dataplatform.etl.info",
-    "mapreduce.map.memory.mb",
-    "mapreduce.reduce.memory.mb",
-    "mapreduce.map.java.opts",
-    "mapreduce.reduce.java.opts"
-  ]
+  "MRConfigureKeys" : {
+    "jobNameKey" : "eagle.job.name",
+    "jobConfigKey" : [
+        "mapreduce.map.output.compress",
+        "mapreduce.map.output.compress.codec",
+        "mapreduce.output.fileoutputformat.compress",
+        "mapreduce.output.fileoutputformat.compress.type",
+        "mapreduce.output.fileoutputformat.compress.codec",
+        "mapred.output.format.class",
+        "dataplatform.etl.info",
+        "mapreduce.map.memory.mb",
+        "mapreduce.reduce.memory.mb",
+        "mapreduce.map.java.opts",
+        "mapreduce.reduce.java.opts"
+    ]
+  }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-running/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-running/pom.xml b/eagle-jpm/eagle-jpm-mr-running/pom.xml
index 1786a44..e409630 100644
--- a/eagle-jpm/eagle-jpm-mr-running/pom.xml
+++ b/eagle-jpm/eagle-jpm-mr-running/pom.xml
@@ -90,6 +90,11 @@
             <artifactId>eagle-jpm-util</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.eagle</groupId>
+            <artifactId>eagle-jpm-entity</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <resources>

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobMain.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobMain.java b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobMain.java
index fb8b805..cef29fe 100644
--- a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobMain.java
+++ b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobMain.java
@@ -43,6 +43,7 @@ public class MRRunningJobMain {
             confKeyKeys.add(Constants.JobConfiguration.HIVE_JOB);
             confKeyKeys.add(Constants.JobConfiguration.PIG_JOB);
             confKeyKeys.add(Constants.JobConfiguration.SCOOBI_JOB);
+            confKeyKeys.add(0, mrRunningConfigManager.getConfig().getString("MRConfigureKeys.jobNameKey"));
 
             //2. init topology
             TopologyBuilder topologyBuilder = new TopologyBuilder();

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/JPMEntityRepository.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/JPMEntityRepository.java b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/JPMEntityRepository.java
deleted file mode 100644
index 6bb11ad..0000000
--- a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/JPMEntityRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.eagle.jpm.mr.running.entities;
-
-import org.apache.eagle.jpm.util.jobcounter.JobCounters;
-import org.apache.eagle.jpm.util.jobcounter.JobCountersSerDeser;
-import org.apache.eagle.log.entity.repo.EntityRepository;
-
-public class JPMEntityRepository extends EntityRepository {
-    public JPMEntityRepository() {
-        entitySet.add(JobExecutionAPIEntity.class);
-        entitySet.add(TaskExecutionAPIEntity.class);
-        entitySet.add(TaskAttemptExecutionAPIEntity.class);
-
-        serDeserMap.put(JobCounters.class, new JobCountersSerDeser());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/JobConfig.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/JobConfig.java b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/JobConfig.java
deleted file mode 100644
index 20f9cf4..0000000
--- a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/JobConfig.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.eagle.jpm.mr.running.entities;
-
-import java.io.Serializable;
-import java.util.HashMap;
-
-public class JobConfig extends HashMap<String, String> implements Serializable {
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/JobExecutionAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/JobExecutionAPIEntity.java b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/JobExecutionAPIEntity.java
deleted file mode 100644
index 5fe7d5a..0000000
--- a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/JobExecutionAPIEntity.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * 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.eagle.jpm.mr.running.entities;
-
-import org.apache.eagle.jpm.util.Constants;
-import org.apache.eagle.jpm.util.jobcounter.JobCounters;
-import org.apache.eagle.jpm.util.resourceFetch.model.AppInfo;
-import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
-import org.apache.eagle.log.entity.meta.*;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@Table("eagleMRRunningJobs")
-@ColumnFamily("f")
-@Prefix("jobs")
-@Service(Constants.JPA_RUNNING_JOB_EXECUTION_SERVICE_NAME)
-@TimeSeries(true)
-@Partition({"site"})
-@Indexes({
-        @Index(name="Index_1_jobId", columns = { "jobId" }, unique = true),
-        @Index(name="Index_2_jobDefId", columns = { "jobDefId" }, unique = false)
-})
-@Tags({"site", "jobId", "jobName", "jobDefId", "jobType", "user", "queue"})
-public class JobExecutionAPIEntity extends TaggedLogAPIEntity {
-    @Column("a")
-    private long startTime;
-    @Column("b")
-    private long endTime;
-    @Column("c")
-    private long elapsedTime;
-    @Column("d")
-    private String status;
-    @Column("e")
-    private int mapsTotal;
-    @Column("f")
-    private int mapsCompleted;
-    @Column("g")
-    private int reducesTotal;
-    @Column("h")
-    private int reducesCompleted;
-    @Column("i")
-    private double mapProgress;
-    @Column("j")
-    private double reduceProgress;
-    @Column("k")
-    private int mapsPending;
-    @Column("l")
-    private int mapsRunning;
-    @Column("m")
-    private int reducesPending;
-    @Column("n")
-    private int reducesRunning;
-    @Column("o")
-    private int newReduceAttempts;
-    @Column("p")
-    private int runningReduceAttempts;
-    @Column("q")
-    private int failedReduceAttempts;
-    @Column("r")
-    private int killedReduceAttempts;
-    @Column("s")
-    private int successfulReduceAttempts;
-    @Column("t")
-    private int newMapAttempts;
-    @Column("u")
-    private int runningMapAttempts;
-    @Column("v")
-    private int failedMapAttempts;
-    @Column("w")
-    private int killedMapAttempts;
-    @Column("x")
-    private int successfulMapAttempts;
-    @Column("y")
-    private AppInfo appInfo;
-    @Column("z")
-    private JobCounters jobCounters;
-    @Column("aa")
-    private JobConfig jobConfig;
-    @Column("ab")
-    private long allocatedMB;
-    @Column("ac")
-    private int allocatedVCores;
-    @Column("ad")
-    private int runningContainers;
-    @Column("ae")
-    private int dataLocalMaps;
-    @Column("af")
-    private double dataLocalMapsPercentage;
-    @Column("ag")
-    private int rackLocalMaps;
-    @Column("ah")
-    private double rackLocalMapsPercentage;
-    @Column("ai")
-    private int totalLaunchedMaps;
-    @Column("aj")
-    private long submissionTime;
-
-    public JobConfig getJobConfig() {
-        return jobConfig;
-    }
-
-    public void setJobConfig(JobConfig jobConfig) {
-        this.jobConfig = jobConfig;
-        valueChanged("jobConfig");
-    }
-
-    public JobCounters getJobCounters() {
-        return jobCounters;
-    }
-
-    public void setJobCounters(JobCounters jobCounters) {
-        this.jobCounters = jobCounters;
-        valueChanged("jobCounters");
-    }
-
-    public long getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(long startTime) {
-        this.startTime = startTime;
-        valueChanged("startTime");
-    }
-
-    public long getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(long endTime) {
-        this.endTime = endTime;
-        valueChanged("endTime");
-    }
-
-    public long getElapsedTime() {
-        return elapsedTime;
-    }
-
-    public void setElapsedTime(long elapsedTime) {
-        this.elapsedTime = elapsedTime;
-        valueChanged("elapsedTime");
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-        valueChanged("status");
-    }
-
-    public int getMapsTotal() {
-        return mapsTotal;
-    }
-
-    public void setMapsTotal(int mapsTotal) {
-        this.mapsTotal = mapsTotal;
-        valueChanged("mapsTotal");
-    }
-
-    public int getMapsCompleted() {
-        return mapsCompleted;
-    }
-
-    public void setMapsCompleted(int mapsCompleted) {
-        this.mapsCompleted = mapsCompleted;
-        valueChanged("mapsCompleted");
-    }
-
-    public int getReducesTotal() {
-        return reducesTotal;
-    }
-
-    public void setReducesTotal(int reducesTotal) {
-        this.reducesTotal = reducesTotal;
-        valueChanged("reducesTotal");
-    }
-
-    public int getReducesCompleted() {
-        return reducesCompleted;
-    }
-
-    public void setReducesCompleted(int reducesCompleted) {
-        this.reducesCompleted = reducesCompleted;
-        valueChanged("reducesCompleted");
-    }
-
-    public double getMapProgress() {
-        return mapProgress;
-    }
-
-    public void setMapProgress(double mapProgress) {
-        this.mapProgress = mapProgress;
-        valueChanged("mapProgress");
-    }
-
-    public double getReduceProgress() {
-        return reduceProgress;
-    }
-
-    public void setReduceProgress(double reduceProgress) {
-        this.reduceProgress = reduceProgress;
-        valueChanged("reduceProgress");
-    }
-
-    public int getMapsPending() {
-        return mapsPending;
-    }
-
-    public void setMapsPending(int mapsPending) {
-        this.mapsPending = mapsPending;
-        valueChanged("mapsPending");
-    }
-
-    public int getMapsRunning() {
-        return mapsRunning;
-    }
-
-    public void setMapsRunning(int mapsRunning) {
-        this.mapsRunning = mapsRunning;
-        valueChanged("mapsRunning");
-    }
-
-    public int getReducesPending() {
-        return reducesPending;
-    }
-
-    public void setReducesPending(int reducesPending) {
-        this.reducesPending = reducesPending;
-        valueChanged("reducesPending");
-    }
-
-    public int getReducesRunning() {
-        return reducesRunning;
-    }
-
-    public void setReducesRunning(int reducesRunning) {
-        this.reducesRunning = reducesRunning;
-        valueChanged("reducesRunning");
-    }
-
-    public int getNewReduceAttempts() {
-        return newReduceAttempts;
-    }
-
-    public void setNewReduceAttempts(int newReduceAttempts) {
-        this.newReduceAttempts = newReduceAttempts;
-        valueChanged("newReduceAttempts");
-    }
-
-    public int getRunningReduceAttempts() {
-        return runningReduceAttempts;
-    }
-
-    public void setRunningReduceAttempts(int runningReduceAttempts) {
-        this.runningReduceAttempts = runningReduceAttempts;
-        valueChanged("runningReduceAttempts");
-    }
-
-    public int getFailedReduceAttempts() {
-        return failedReduceAttempts;
-    }
-
-    public void setFailedReduceAttempts(int failedReduceAttempts) {
-        this.failedReduceAttempts = failedReduceAttempts;
-        valueChanged("failedReduceAttempts");
-    }
-
-    public int getKilledReduceAttempts() {
-        return killedReduceAttempts;
-    }
-
-    public void setKilledReduceAttempts(int killedReduceAttempts) {
-        this.killedReduceAttempts = killedReduceAttempts;
-        valueChanged("killedReduceAttempts");
-    }
-
-    public int getSuccessfulReduceAttempts() {
-        return successfulReduceAttempts;
-    }
-
-    public void setSuccessfulReduceAttempts(int successfulReduceAttempts) {
-        this.successfulReduceAttempts = successfulReduceAttempts;
-        valueChanged("successfulReduceAttempts");
-    }
-
-    public int getNewMapAttempts() {
-        return newMapAttempts;
-    }
-
-    public void setNewMapAttempts(int newMapAttempts) {
-        this.newMapAttempts = newMapAttempts;
-        valueChanged("newMapAttempts");
-    }
-
-    public int getRunningMapAttempts() {
-        return runningMapAttempts;
-    }
-
-    public void setRunningMapAttempts(int runningMapAttempts) {
-        this.runningMapAttempts = runningMapAttempts;
-        valueChanged("runningMapAttempts");
-    }
-
-    public int getFailedMapAttempts() {
-        return failedMapAttempts;
-    }
-
-    public void setFailedMapAttempts(int failedMapAttempts) {
-        this.failedMapAttempts = failedMapAttempts;
-        valueChanged("failedMapAttempts");
-    }
-
-    public int getKilledMapAttempts() {
-        return killedMapAttempts;
-    }
-
-    public void setKilledMapAttempts(int killedMapAttempts) {
-        this.killedMapAttempts = killedMapAttempts;
-        valueChanged("killedMapAttempts");
-    }
-
-    public int getSuccessfulMapAttempts() {
-        return successfulMapAttempts;
-    }
-
-    public void setSuccessfulMapAttempts(int successfulMapAttempts) {
-        this.successfulMapAttempts = successfulMapAttempts;
-        valueChanged("successfulMapAttempts");
-    }
-
-    public AppInfo getAppInfo() {
-        return appInfo;
-    }
-
-    public void setAppInfo(AppInfo appInfo) {
-        this.appInfo = appInfo;
-        valueChanged("appInfo");
-    }
-
-    public long getAllocatedMB() {
-        return allocatedMB;
-    }
-
-    public void setAllocatedMB(long allocatedMB) {
-        this.allocatedMB = allocatedMB;
-        valueChanged("allocatedMB");
-    }
-
-    public int getAllocatedVCores() {
-        return allocatedVCores;
-    }
-
-    public void setAllocatedVCores(int allocatedVCores) {
-        this.allocatedVCores = allocatedVCores;
-        valueChanged("allocatedVCores");
-    }
-
-    public int getRunningContainers() {
-        return runningContainers;
-    }
-
-    public void setRunningContainers(int runningContainers) {
-        this.runningContainers = runningContainers;
-        valueChanged("runningContainers");
-    }
-
-    public int getDataLocalMaps() {
-        return dataLocalMaps;
-    }
-
-    public void setDataLocalMaps(int dataLocalMaps) {
-        this.dataLocalMaps = dataLocalMaps;
-        valueChanged("dataLocalMaps");
-    }
-
-    public double getDataLocalMapsPercentage() {
-        return dataLocalMapsPercentage;
-    }
-
-    public void setDataLocalMapsPercentage(double dataLocalMapsPercentage) {
-        this.dataLocalMapsPercentage = dataLocalMapsPercentage;
-        valueChanged("dataLocalMapsPercentage");
-    }
-
-    public int getRackLocalMaps() {
-        return rackLocalMaps;
-    }
-
-    public void setRackLocalMaps(int rackLocalMaps) {
-        this.rackLocalMaps = rackLocalMaps;
-        valueChanged("rackLocalMaps");
-    }
-
-    public double getRackLocalMapsPercentage() {
-        return rackLocalMapsPercentage;
-    }
-
-    public void setRackLocalMapsPercentage(double rackLocalMapsPercentage) {
-        this.rackLocalMapsPercentage = rackLocalMapsPercentage;
-        valueChanged("rackLocalMapsPercentage");
-    }
-
-    public int getTotalLaunchedMaps() {
-        return totalLaunchedMaps;
-    }
-
-    public void setTotalLaunchedMaps(int totalLaunchedMaps) {
-        this.totalLaunchedMaps = totalLaunchedMaps;
-        valueChanged("totalLaunchedMaps");
-    }
-
-    public long getSubmissionTime() {
-        return submissionTime;
-    }
-
-    public void setSubmissionTime(long submissionTime) {
-        this.submissionTime = submissionTime;
-        valueChanged("submissionTime");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/TaskAttemptExecutionAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/TaskAttemptExecutionAPIEntity.java b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/TaskAttemptExecutionAPIEntity.java
deleted file mode 100644
index c74563b..0000000
--- a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/TaskAttemptExecutionAPIEntity.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * 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.eagle.jpm.mr.running.entities;
-
-import org.apache.eagle.jpm.util.Constants;
-import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
-import org.apache.eagle.log.entity.meta.*;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@Table("eagleMRRunningTasks")
-@ColumnFamily("f")
-@Prefix("tasks_exec_attempt")
-@Service(Constants.JPA_RUNNING_TASK_ATTEMPT_EXECUTION_SERVICE_NAME)
-@TimeSeries(true)
-@Partition({"site"})
-
-@Tags({"site", "jobId", "JobName", "jobDefId", "jobType", "taskType", "taskId", "user", "queue", "host", "rack"})
-public class TaskAttemptExecutionAPIEntity extends TaggedLogAPIEntity {
-    @Column("a")
-    private long startTime;
-    @Column("b")
-    private long finishTime;
-    @Column("c")
-    private long elapsedTime;
-    @Column("d")
-    private double progress;
-    @Column("e")
-    private String id;
-    @Column("f")
-    private String status;
-    @Column("g")
-    private String diagnostics;
-    @Column("h")
-    private String type;
-    @Column("i")
-    private String assignedContainerId;
-
-    public long getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(long startTime) {
-        this.startTime = startTime;
-        valueChanged("startTime");
-    }
-
-    public long getFinishTime() {
-        return finishTime;
-    }
-
-    public void setFinishTime(long finishTime) {
-        this.finishTime = finishTime;
-        valueChanged("finishTime");
-    }
-
-    public long getElapsedTime() {
-        return elapsedTime;
-    }
-
-    public void setElapsedTime(long elapsedTime) {
-        this.elapsedTime = elapsedTime;
-        valueChanged("elapsedTime");
-    }
-
-    public double getProgress() {
-        return progress;
-    }
-
-    public void setProgress(double progress) {
-        this.progress = progress;
-        valueChanged("progress");
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-        valueChanged("id");
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-        valueChanged("status");
-    }
-
-    public String getDiagnostics() {
-        return diagnostics;
-    }
-
-    public void setDiagnostics(String diagnostics) {
-        this.diagnostics = diagnostics;
-        valueChanged("diagnostics");
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-        valueChanged("type");
-    }
-
-    public String getAssignedContainerId() {
-        return assignedContainerId;
-    }
-
-    public void setAssignedContainerId(String assignedContainerId) {
-        this.assignedContainerId = assignedContainerId;
-        valueChanged("assignedContainerId");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/TaskExecutionAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/TaskExecutionAPIEntity.java b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/TaskExecutionAPIEntity.java
deleted file mode 100644
index 7677f45..0000000
--- a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/entities/TaskExecutionAPIEntity.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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.eagle.jpm.mr.running.entities;
-
-import org.apache.eagle.jpm.util.Constants;
-import org.apache.eagle.jpm.util.jobcounter.JobCounters;
-import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
-import org.apache.eagle.log.entity.meta.*;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-@Table("eagleMRRunningTasks")
-@ColumnFamily("f")
-@Prefix("tasks_exec")
-@Service(Constants.JPA_RUNNING_TASK_EXECUTION_SERVICE_NAME)
-@TimeSeries(true)
-@Partition({"site"})
-
-@Tags({"site", "jobId", "JobName", "jobDefId", "jobType", "taskType", "taskId", "user", "queue"})
-public class TaskExecutionAPIEntity extends TaggedLogAPIEntity {
-    @Column("a")
-    private long startTime;
-    @Column("b")
-    private long finishTime;
-    @Column("c")
-    private long elapsedTime;
-    @Column("d")
-    private double progress;
-    @Column("e")
-    private String status;
-    @Column("f")
-    private String successfulAttempt;
-    @Column("g")
-    private String statusDesc;
-    @Column("h")
-    private JobCounters jobCounters;
-    @Column("i")
-    private String host;
-
-    public long getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(long startTime) {
-        this.startTime = startTime;
-        valueChanged("startTime");
-    }
-
-    public long getFinishTime() {
-        return finishTime;
-    }
-
-    public void setFinishTime(long finishTime) {
-        this.finishTime = finishTime;
-        valueChanged("finishTime");
-    }
-
-    public long getElapsedTime() {
-        return elapsedTime;
-    }
-
-    public void setElapsedTime(long elapsedTime) {
-        this.elapsedTime = elapsedTime;
-        valueChanged("elapsedTime");
-    }
-
-    public double getProgress() {
-        return progress;
-    }
-
-    public void setProgress(double progress) {
-        this.progress = progress;
-        valueChanged("progress");
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-        valueChanged("status");
-    }
-
-    public String getSuccessfulAttempt() {
-        return successfulAttempt;
-    }
-
-    public void setSuccessfulAttempt(String successfulAttempt) {
-        this.successfulAttempt = successfulAttempt;
-        valueChanged("successfulAttempt");
-    }
-
-    public String getStatusDesc() {
-        return statusDesc;
-    }
-
-    public void setStatusDesc(String statusDesc) {
-        this.statusDesc = statusDesc;
-        valueChanged("statusDesc");
-    }
-
-    public JobCounters getJobCounters() {
-        return jobCounters;
-    }
-
-    public void setJobCounters(JobCounters jobCounters) {
-        this.jobCounters = jobCounters;
-        valueChanged("jobCounters");
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-        valueChanged("host");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobEntityCreationHandler.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobEntityCreationHandler.java b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobEntityCreationHandler.java
index aae0dd8..0dc53c3 100644
--- a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobEntityCreationHandler.java
+++ b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobEntityCreationHandler.java
@@ -19,11 +19,10 @@
 package org.apache.eagle.jpm.mr.running.parser;
 
 import org.apache.eagle.jpm.mr.running.config.MRRunningConfigManager;
-import org.apache.eagle.jpm.mr.running.entities.JobExecutionAPIEntity;
-import org.apache.eagle.jpm.mr.running.entities.TaskExecutionAPIEntity;
 import org.apache.eagle.jpm.mr.running.parser.metrics.JobExecutionMetricsCreationListener;
 import org.apache.eagle.jpm.mr.running.parser.metrics.TaskExecutionMetricsCreationListener;
-import org.apache.eagle.jpm.util.Utils;
+import org.apache.eagle.jpm.mr.runningentity.JobExecutionAPIEntity;
+import org.apache.eagle.jpm.mr.runningentity.TaskExecutionAPIEntity;
 import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
 import org.apache.eagle.log.entity.GenericMetricEntity;
 import org.apache.eagle.service.client.IEagleServiceClient;
@@ -32,8 +31,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
-import java.util.Deque;
-import java.util.LinkedList;
 import java.util.List;
 
 public class MRJobEntityCreationHandler {
@@ -53,12 +50,16 @@ public class MRJobEntityCreationHandler {
     public void add(TaggedLogAPIEntity entity) {
         entities.add(entity);
         List<GenericMetricEntity> metricEntities;
-        if (entity instanceof TaskExecutionAPIEntity) {
+        /*if (entity instanceof TaskExecutionAPIEntity) {
             metricEntities = taskMetricsListener.generateMetrics((TaskExecutionAPIEntity) entity);
             entities.addAll(metricEntities);
         } else if (entity instanceof JobExecutionAPIEntity) {
             metricEntities = jobMetricsListener.generateMetrics((JobExecutionAPIEntity) entity);
             entities.addAll(metricEntities);
+        }*/
+        if (entity instanceof JobExecutionAPIEntity) {
+            metricEntities = jobMetricsListener.generateMetrics((JobExecutionAPIEntity) entity);
+            entities.addAll(metricEntities);
         }
         if (entities.size() >= eagleServiceConfig.maxFlushNum) {
             this.flush();


Mime
View raw message