You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/10/06 01:26:03 UTC
[2/2] git commit: AMBARI-3466. Revert 1.4.1 changes to job history.
(billie)
AMBARI-3466. Revert 1.4.1 changes to job history. (billie)
Reverting ambari-log4j and web service.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/9afc48b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/9afc48b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/9afc48b0
Branch: refs/heads/branch-1.4.1
Commit: 9afc48b0e49d4b8662d8a1d145386bb8ba995a9c
Parents: 41ea642
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Sat Oct 5 16:24:14 2013 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Sat Oct 5 16:25:10 2013 -0700
----------------------------------------------------------------------
.../apache/ambari/eventdb/db/DBConnector.java | 13 +-
.../ambari/eventdb/db/PostgresConnector.java | 75 ++-----
.../org/apache/ambari/eventdb/model/Apps.java | 193 -------------------
.../ambari/eventdb/model/WorkflowContext.java | 9 -
.../apache/ambari/eventdb/model/Workflows.java | 12 +-
.../eventdb/webservice/WorkflowJsonService.java | 56 ++----
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 +-
.../resources/Ambari-DDL-Postgres-CREATE.sql | 16 +-
.../upgrade/ddl/Ambari-DDL-Oracle-UPGRADE.sql | 2 -
.../ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql | 3 -
11 files changed, 43 insertions(+), 340 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9afc48b0/ambari-server/src/main/java/org/apache/ambari/eventdb/db/DBConnector.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/eventdb/db/DBConnector.java b/ambari-server/src/main/java/org/apache/ambari/eventdb/db/DBConnector.java
index 7a2913c..b859114 100644
--- a/ambari-server/src/main/java/org/apache/ambari/eventdb/db/DBConnector.java
+++ b/ambari-server/src/main/java/org/apache/ambari/eventdb/db/DBConnector.java
@@ -19,8 +19,11 @@ package org.apache.ambari.eventdb.db;
import java.io.IOException;
import java.util.List;
-import org.apache.ambari.eventdb.model.*;
+import org.apache.ambari.eventdb.model.DataTable;
import org.apache.ambari.eventdb.model.Jobs.JobDBEntry;
+import org.apache.ambari.eventdb.model.TaskAttempt;
+import org.apache.ambari.eventdb.model.WorkflowContext;
+import org.apache.ambari.eventdb.model.Workflows;
import org.apache.ambari.eventdb.model.Workflows.WorkflowDBEntry.WorkflowFields;
public interface DBConnector {
@@ -34,11 +37,9 @@ public interface DBConnector {
public DataTable fetchWorkflows(int offset, int limit, String searchTerm, int echo, WorkflowFields field, boolean sortAscending, String searchWorkflowId,
String searchWorkflowName, String searchWorkflowType, String searchUserName, int minJobs, int maxJobs, long minInputBytes, long maxInputBytes,
- long minOutputBytes, long maxOutputBytes, long minDuration, long maxDuration, long minStartTime, long maxStartTime, long minFinishTime,
- long maxFinishTime, String tagSearchTerm) throws IOException;
-
- public List<Apps.AppDBEntry> fetchAppDetails(String workflowId) throws IOException;
-
+ long minOutputBytes, long maxOutputBytes, long minDuration, long maxDuration, long minStartTime, long maxStartTime, long minFinishTime, long maxFinishTime)
+ throws IOException;
+
public List<JobDBEntry> fetchJobDetails(String workflowID) throws IOException;
public List<JobDBEntry> fetchJobDetails(long minFinishTime, long maxStartTime) throws IOException;
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9afc48b0/ambari-server/src/main/java/org/apache/ambari/eventdb/db/PostgresConnector.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/eventdb/db/PostgresConnector.java b/ambari-server/src/main/java/org/apache/ambari/eventdb/db/PostgresConnector.java
index a3ed09b..552df9c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/eventdb/db/PostgresConnector.java
+++ b/ambari-server/src/main/java/org/apache/ambari/eventdb/db/PostgresConnector.java
@@ -27,18 +27,20 @@ import java.util.EnumMap;
import java.util.List;
import java.util.Map;
-import org.apache.ambari.eventdb.model.*;
+import org.apache.ambari.eventdb.model.DataTable;
import org.apache.ambari.eventdb.model.DataTable.AvgData;
import org.apache.ambari.eventdb.model.DataTable.Summary;
import org.apache.ambari.eventdb.model.DataTable.Summary.SummaryFields;
import org.apache.ambari.eventdb.model.DataTable.Times;
import org.apache.ambari.eventdb.model.Jobs.JobDBEntry;
import org.apache.ambari.eventdb.model.Jobs.JobDBEntry.JobFields;
+import org.apache.ambari.eventdb.model.TaskAttempt;
import org.apache.ambari.eventdb.model.TaskAttempt.TaskAttemptFields;
+import org.apache.ambari.eventdb.model.WorkflowContext;
+import org.apache.ambari.eventdb.model.Workflows;
import org.apache.ambari.eventdb.model.Workflows.WorkflowDBEntry;
import org.apache.ambari.eventdb.model.Workflows.WorkflowDBEntry.WorkflowFields;
import org.apache.commons.lang.NotImplementedException;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.JsonParseException;
@@ -48,7 +50,6 @@ import org.codehaus.jackson.map.ObjectMapper;
public class PostgresConnector implements DBConnector {
private static Log LOG = LogFactory.getLog(PostgresConnector.class);
private static final String WORKFLOW_TABLE_NAME = "workflow";
- private static final String APP_TABLE_NAME = "application";
private static final String JOB_TABLE_NAME = "job";
private static final String TASK_ATTEMPT_TABLE_NAME = "taskattempt";
public static final String SORT_ASC = "ASC";
@@ -74,7 +75,6 @@ public class PostgresConnector implements DBConnector {
+ getAvg(WorkflowFields.DURATION, SummaryFields.avgDuration, SummaryFields.minDuration, SummaryFields.maxDuration) + ", min("
+ WorkflowFields.STARTTIME + ") as " + SummaryFields.oldest + ", max(" + WorkflowFields.STARTTIME + ") as " + SummaryFields.youngest + " FROM "
+ WORKFLOW_TABLE_NAME),
- FAD_PS("SELECT " + Apps.AppDBEntry.APP_FIELDS + " FROM " + APP_TABLE_NAME + " WHERE " + Apps.AppDBEntry.AppFields.WORKFLOWID.toString() + " = ?"),
FJD_PS("SELECT " + JobDBEntry.JOB_FIELDS + " FROM " + JOB_TABLE_NAME + " WHERE " + JobFields.WORKFLOWID.toString() + " = ?"),
FJD_TIMERANGE_PS("SELECT " + JobDBEntry.JOB_FIELDS + " FROM " + JOB_TABLE_NAME + " WHERE " + JobFields.FINISHTIME.toString() + " >= ? AND "
+ JobFields.SUBMITTIME.toString() + " <= ? ORDER BY " + JobFields.WORKFLOWID + ", " + JobFields.JOBID),
@@ -214,7 +214,6 @@ public class PostgresConnector implements DBConnector {
w.setOutputBytes(WorkflowFields.OUTPUTBYTES.getLong(rs));
w.setNumJobsCompleted(WorkflowFields.NUMJOBSCOMPLETED.getInt(rs));
w.setWorkflowContext(jsonMapper.readValue(WorkflowFields.WORKFLOWCONTEXT.getString(rs), WorkflowContext.class));
- w.setWorkflowTags(WorkflowFields.WORKFLOWTAGS.getString(rs));
return w;
}
@@ -229,8 +228,8 @@ public class PostgresConnector implements DBConnector {
@Override
public DataTable fetchWorkflows(int offset, int limit, String searchTerm, int echo, WorkflowFields col, boolean sortAscending, String searchWorkflowId,
String searchWorkflowName, String searchWorkflowType, String searchUserName, int minJobs, int maxJobs, long minInputBytes, long maxInputBytes,
- long minOutputBytes, long maxOutputBytes, long minDuration, long maxDuration, long minStartTime, long maxStartTime, long minFinishTime,
- long maxFinishTime, String tagSearchTerm) throws IOException {
+ long minOutputBytes, long maxOutputBytes, long minDuration, long maxDuration, long minStartTime, long maxStartTime, long minFinishTime, long maxFinishTime)
+ throws IOException {
int total = 0;
PreparedStatement ps = getPS(Statements.FW_COUNT_PS);
ResultSet rs = null;
@@ -250,8 +249,7 @@ public class PostgresConnector implements DBConnector {
}
String searchClause = buildSearchClause(searchTerm, searchWorkflowId, searchWorkflowName, searchWorkflowType, searchUserName, minJobs, maxJobs,
- minInputBytes, maxInputBytes, minOutputBytes, maxOutputBytes, minDuration, maxDuration, minStartTime, maxStartTime, minFinishTime, maxFinishTime,
- tagSearchTerm);
+ minInputBytes, maxInputBytes, minOutputBytes, maxOutputBytes, minDuration, maxDuration, minStartTime, maxStartTime, minFinishTime, maxFinishTime);
List<WorkflowDBEntry> workflows = fetchWorkflows(getQualifiedPS(Statements.FW_PS, searchClause, col, sortAscending, offset, limit));
Summary summary = fetchSummary(getQualifiedPS(Statements.FW_SUMMARY_PS, searchClause));
DataTable table = new DataTable();
@@ -269,54 +267,7 @@ public class PostgresConnector implements DBConnector {
table.setSummary(summary);
return table;
}
-
- private static Apps.AppDBEntry getAppDBEntry(ResultSet rs) throws SQLException {
- Apps.AppDBEntry a = new Apps.AppDBEntry();
- a.setWorkflowId(Apps.AppDBEntry.AppFields.WORKFLOWID.getString(rs));
- a.setWorkflowEntityName(Apps.AppDBEntry.AppFields.WORKFLOWENTITYNAME.getString(rs));
- a.setAppId(Apps.AppDBEntry.AppFields.APPID.getString(rs));
- a.setAppName(Apps.AppDBEntry.AppFields.APPNAME.getString(rs));
- a.setAppType(Apps.AppDBEntry.AppFields.APPTYPE.getString(rs));
- a.setFinishTime(Apps.AppDBEntry.AppFields.FINISHTIME.getLong(rs));
- a.setLaunchTime(Apps.AppDBEntry.AppFields.LAUNCHTIME.getLong(rs));
- a.setQueue(Apps.AppDBEntry.AppFields.QUEUE.getString(rs));
- String[] stageStrings = StringUtils.split(Apps.AppDBEntry.AppFields.APPINFO.getString(rs), "-");
- List<Integer> stages = new ArrayList<Integer>();
- for (String s : stageStrings)
- stages.add(Integer.parseInt(s));
- a.setStages(stages);
- a.setStatus(Apps.AppDBEntry.AppFields.STATUS.getString(rs));
- a.setSubmitTime(Apps.AppDBEntry.AppFields.SUBMITTIME.getLong(rs));
- a.setUserName(Apps.AppDBEntry.AppFields.USERNAME.getString(rs));
- return a;
- }
-
- @Override
- public List<Apps.AppDBEntry> fetchAppDetails(String workflowId) throws IOException {
- PreparedStatement ps = getPS(Statements.FAD_PS);
- List<Apps.AppDBEntry> apps = new ArrayList<Apps.AppDBEntry>();
- ResultSet rs = null;
- try {
- ps.setString(1, workflowId);
- rs = ps.executeQuery();
- while (rs.next()) {
- apps.add(getAppDBEntry(rs));
- }
- rs.close();
- } catch (SQLException e) {
- throw new IOException(e);
- } finally {
- if (rs != null)
- try {
- rs.close();
- } catch (SQLException e) {
- LOG.error("Exception while closing ResultSet", e);
- }
-
- }
- return apps;
- }
-
+
private static JobDBEntry getJobDBEntry(ResultSet rs) throws SQLException {
JobDBEntry j = new JobDBEntry();
j.setConfPath(JobFields.CONFPATH.getString(rs));
@@ -338,7 +289,7 @@ public class PostgresConnector implements DBConnector {
j.setWorkflowId(JobFields.WORKFLOWID.getString(rs));
return j;
}
-
+
@Override
public List<JobDBEntry> fetchJobDetails(String workflowId) throws IOException {
PreparedStatement ps = getPS(Statements.FJD_PS);
@@ -360,11 +311,11 @@ public class PostgresConnector implements DBConnector {
} catch (SQLException e) {
LOG.error("Exception while closing ResultSet", e);
}
-
+
}
return jobs;
}
-
+
@Override
public List<JobDBEntry> fetchJobDetails(long minFinishTime, long maxStartTime) throws IOException {
PreparedStatement ps = getPS(Statements.FJD_TIMERANGE_PS);
@@ -597,7 +548,7 @@ public class PostgresConnector implements DBConnector {
private static String buildSearchClause(String searchTerm, String searchWorkflowId, String searchWorkflowName, String searchWorkflowType,
String searchUserName, int minJobs, int maxJobs, long minInputBytes, long maxInputBytes, long minOutputBytes, long maxOutputBytes, long minDuration,
- long maxDuration, long minStartTime, long maxStartTime, long minFinishTime, long maxFinishTime, String searchTags) {
+ long maxDuration, long minStartTime, long maxStartTime, long minFinishTime, long maxFinishTime) {
StringBuilder sb = new StringBuilder();
sb.append(WHERE);
if (searchTerm != null && searchTerm.length() > 0) {
@@ -617,8 +568,6 @@ public class PostgresConnector implements DBConnector {
append(sb, startsWith(WorkflowFields.WORKFLOWID, searchWorkflowType));
if (searchUserName != null)
append(sb, equals(WorkflowFields.USERNAME, searchUserName));
- if (searchTags != null)
- append(sb, like(WorkflowFields.WORKFLOWTAGS, searchTags));
addRangeSearch(sb, WorkflowFields.NUMJOBSTOTAL, minJobs, maxJobs);
addRangeSearch(sb, WorkflowFields.INPUTBYTES, minInputBytes, maxInputBytes);
addRangeSearch(sb, WorkflowFields.OUTPUTBYTES, minOutputBytes, maxOutputBytes);
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9afc48b0/ambari-server/src/main/java/org/apache/ambari/eventdb/model/Apps.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/eventdb/model/Apps.java b/ambari-server/src/main/java/org/apache/ambari/eventdb/model/Apps.java
deleted file mode 100644
index 7b57114..0000000
--- a/ambari-server/src/main/java/org/apache/ambari/eventdb/model/Apps.java
+++ /dev/null
@@ -1,193 +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.ambari.eventdb.model;
-
-import org.apache.commons.lang.StringUtils;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-public class Apps {
- List<AppDBEntry> apps;
-
- public static class AppDBEntry {
- public static enum AppFields {
- APPID,
- APPNAME,
- APPTYPE,
- STATUS,
- USERNAME,
- QUEUE,
- SUBMITTIME,
- LAUNCHTIME,
- FINISHTIME,
- APPINFO,
- WORKFLOWID,
- WORKFLOWENTITYNAME;
-
- public String getString(ResultSet rs) throws SQLException {
- return rs.getString(this.toString());
- }
-
- public int getInt(ResultSet rs) throws SQLException {
- return rs.getInt(this.toString());
- }
-
- public long getLong(ResultSet rs) throws SQLException {
- return rs.getLong(this.toString());
- }
-
- public static String join() {
- String[] tmp = new String[AppFields.values().length];
- for (int i = 0; i < tmp.length; i++)
- tmp[i] = AppFields.values()[i].toString();
- return StringUtils.join(tmp, ",");
- }
- }
-
- @XmlTransient
- public static final String APP_FIELDS = AppFields.join();
-
- private String appId;
- private String appName;
- private String appType;
- private String status;
- private String userName;
- private String queue;
- private long submitTime;
- private long launchTime;
- private long finishTime;
- private List<Integer> stages;
- private String workflowId;
- private String workflowEntityName;
-
- public AppDBEntry() {
- /* Required by JAXB. */
- }
-
- public String getAppId() {
- return appId;
- }
-
- public void setAppId(String appId) {
- this.appId = appId;
- }
-
- public String getAppName() {
- return appName;
- }
-
- public void setAppName(String appName) {
- this.appName = appName;
- }
-
- public String getAppType() {
- return appType;
- }
-
- public void setAppType(String appType) {
- this.appType = appType;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getQueue() {
- return queue;
- }
-
- public void setQueue(String queue) {
- this.queue = queue;
- }
-
- public long getSubmitTime() {
- return submitTime;
- }
-
- public void setSubmitTime(long submitTime) {
- this.submitTime = submitTime;
- }
-
- public long getLaunchTime() {
- return launchTime;
- }
-
- public void setLaunchTime(long launchTime) {
- this.launchTime = launchTime;
- }
-
- public long getFinishTime() {
- return finishTime;
- }
-
- public void setFinishTime(long finishTime) {
- this.finishTime = finishTime;
- }
-
- public List<Integer> getStages() {
- return stages;
- }
-
- public void setStages(List<Integer> stages) {
- this.stages = stages;
- }
-
- public String getWorkflowId() {
- return workflowId;
- }
-
- public void setWorkflowId(String workflowId) {
- this.workflowId = workflowId;
- }
-
- public String getWorkflowEntityName() {
- return workflowEntityName;
- }
-
- public void setWorkflowEntityName(String workflowEntityName) {
- this.workflowEntityName = workflowEntityName;
- }
- }
-
- public List<AppDBEntry> getApps() {
- return apps;
- }
-
- public void setApps(List<AppDBEntry> apps) {
- this.apps = apps;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9afc48b0/ambari-server/src/main/java/org/apache/ambari/eventdb/model/WorkflowContext.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/eventdb/model/WorkflowContext.java b/ambari-server/src/main/java/org/apache/ambari/eventdb/model/WorkflowContext.java
index a8b3945..c2b0468 100644
--- a/ambari-server/src/main/java/org/apache/ambari/eventdb/model/WorkflowContext.java
+++ b/ambari-server/src/main/java/org/apache/ambari/eventdb/model/WorkflowContext.java
@@ -29,7 +29,6 @@ public class WorkflowContext {
private String workflowId;
private String workflowName;
private String workflowEntityName;
- private String workflowTags;
private WorkflowDag workflowDag;
@@ -52,10 +51,6 @@ public class WorkflowContext {
return this.workflowEntityName;
}
- public String getWorkflowTags() {
- return workflowTags;
- }
-
public WorkflowDag getWorkflowDag() {
return this.workflowDag;
}
@@ -77,10 +72,6 @@ public class WorkflowContext {
this.workflowEntityName = wfEntityName;
}
- public void setWorkflowTags(String workflowTags) {
- this.workflowTags = workflowTags;
- }
-
public void setWorkflowDag(WorkflowDag wfDag) {
this.workflowDag = wfDag;
}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9afc48b0/ambari-server/src/main/java/org/apache/ambari/eventdb/model/Workflows.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/eventdb/model/Workflows.java b/ambari-server/src/main/java/org/apache/ambari/eventdb/model/Workflows.java
index 0aa3e74..541ce79 100644
--- a/ambari-server/src/main/java/org/apache/ambari/eventdb/model/Workflows.java
+++ b/ambari-server/src/main/java/org/apache/ambari/eventdb/model/Workflows.java
@@ -47,8 +47,7 @@ public class Workflows {
INPUTBYTES,
OUTPUTBYTES,
PARENTWORKFLOWID,
- WORKFLOWCONTEXT,
- WORKFLOWTAGS;
+ WORKFLOWCONTEXT;
public String getString(ResultSet rs) throws SQLException {
return rs.getString(this.toString());
@@ -84,7 +83,6 @@ public class Workflows {
private int numJobsCompleted;
private String parentWorkflowId;
private WorkflowContext workflowContext;
- private String workflowTags;
public WorkflowDBEntry() {
/* Required by JAXB. */
@@ -126,10 +124,6 @@ public class Workflows {
return workflowContext;
}
- public String getWorkflowTags() {
- return workflowTags;
- }
-
public void setWorkflowId(String workflowId) {
this.workflowId = workflowId;
}
@@ -166,10 +160,6 @@ public class Workflows {
this.workflowContext = workflowContext;
}
- public void setWorkflowTags(String workflowTags) {
- this.workflowTags = workflowTags;
- }
-
public long getInputBytes() {
return inputBytes;
}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9afc48b0/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java b/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java
index 42d474b..7d653f2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java
@@ -36,10 +36,15 @@ import javax.ws.rs.core.MediaType;
import org.apache.ambari.eventdb.db.MySQLConnector;
import org.apache.ambari.eventdb.db.OracleConnector;
import org.apache.ambari.eventdb.db.PostgresConnector;
-import org.apache.ambari.eventdb.model.*;
+import org.apache.ambari.eventdb.model.DataTable;
+import org.apache.ambari.eventdb.model.Jobs;
import org.apache.ambari.eventdb.model.Jobs.JobDBEntry;
+import org.apache.ambari.eventdb.model.TaskAttempt;
+import org.apache.ambari.eventdb.model.TaskData;
import org.apache.ambari.eventdb.model.TaskData.Point;
+import org.apache.ambari.eventdb.model.TaskLocalityData;
import org.apache.ambari.eventdb.model.TaskLocalityData.DataPoint;
+import org.apache.ambari.eventdb.model.Workflows;
import org.apache.ambari.eventdb.model.Workflows.WorkflowDBEntry;
import org.apache.ambari.eventdb.model.Workflows.WorkflowDBEntry.WorkflowFields;
import org.apache.ambari.server.configuration.Configuration;
@@ -62,7 +67,6 @@ public class WorkflowJsonService {
private static final Workflows EMPTY_WORKFLOWS = new Workflows();
private static final List<JobDBEntry> EMPTY_JOBS = Collections.emptyList();
- private static final List<Apps.AppDBEntry> EMPTY_APPS = Collections.emptyList();
{
List<WorkflowDBEntry> emptyWorkflows = Collections.emptyList();
EMPTY_WORKFLOWS.setWorkflows(emptyWorkflows);
@@ -134,8 +138,7 @@ public class WorkflowJsonService {
@DefaultValue("-1") @QueryParam("minOutputBytes") long minOutputBytes, @DefaultValue("-1") @QueryParam("maxOutputBytes") long maxOutputBytes,
@DefaultValue("-1") @QueryParam("minDuration") long minDuration, @DefaultValue("-1") @QueryParam("maxDuration") long maxDuration,
@DefaultValue("-1") @QueryParam("minStartTime") long minStartTime, @DefaultValue("-1") @QueryParam("maxStartTime") long maxStartTime,
- @DefaultValue("-1") @QueryParam("minFinishTime") long minFinishTime, @DefaultValue("-1") @QueryParam("maxFinishTime") long maxFinishTime,
- @QueryParam("tagSearch") String tagSearchTerm) {
+ @DefaultValue("-1") @QueryParam("minFinishTime") long minFinishTime, @DefaultValue("-1") @QueryParam("maxFinishTime") long maxFinishTime) {
if (start < 0)
start = 0;
@@ -160,19 +163,22 @@ public class WorkflowJsonService {
case 3: // userName
field = WorkflowFields.USERNAME;
break;
- case 4: // tags
- field = WorkflowFields.WORKFLOWTAGS;
- break;
- case 5: // numJobsTotal
+ case 4: // numJobsTotal
field = WorkflowFields.NUMJOBSTOTAL;
break;
- case 6: // duration
+ case 5: // inputBytes
+ field = WorkflowFields.INPUTBYTES;
+ break;
+ case 6: // outputBytes
+ field = WorkflowFields.OUTPUTBYTES;
+ break;
+ case 7: // duration
field = WorkflowFields.DURATION;
break;
- case 7: // startTime
+ case 8: // startTime
field = WorkflowFields.STARTTIME;
break;
- case 8: // lastUpdateTime
+ case 9: // lastUpdateTime
field = WorkflowFields.LASTUPDATETIME;
break;
default:
@@ -184,8 +190,7 @@ public class WorkflowJsonService {
try {
conn = getConnector();
table = conn.fetchWorkflows(start, amount, searchTerm, echo, field, sortAscending, workflowId, workflowName, workflowType, userName, minJobs, maxJobs,
- minInputBytes, maxInputBytes, minOutputBytes, maxOutputBytes, minDuration, maxDuration, minStartTime, maxStartTime, minFinishTime, maxFinishTime,
- tagSearchTerm);
+ minInputBytes, maxInputBytes, minOutputBytes, maxOutputBytes, minDuration, maxDuration, minStartTime, maxStartTime, minFinishTime, maxFinishTime);
} catch (IOException e) {
LOG.error("Error interacting with RCA database ", e);
} finally {
@@ -195,28 +200,7 @@ public class WorkflowJsonService {
}
return table;
}
-
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/app")
- public Apps getApps(@QueryParam("workflowId") String workflowId) {
- Apps apps = new Apps();
- apps.setApps(EMPTY_APPS);
- PostgresConnector conn = null;
- try {
- conn = getConnector();
- if (workflowId != null)
- apps.setApps(conn.fetchAppDetails(workflowId));
- } catch (IOException e) {
- LOG.error("Error interacting with RCA database ", e);
- } finally {
- if (conn != null) {
- conn.close();
- }
- }
- return apps;
- }
-
+
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/job")
@@ -240,7 +224,7 @@ public class WorkflowJsonService {
}
return jobs;
}
-
+
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/task")
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9afc48b0/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
index 3f39f53..9369561 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -113,7 +113,7 @@ CREATE TABLE workflow (
startTime BIGINT, lastUpdateTime BIGINT,
numJobsTotal INTEGER, numJobsCompleted INTEGER,
inputBytes BIGINT, outputBytes BIGINT,
- duration BIGINT, workflowTags TEXT,
+ duration BIGINT,
PRIMARY KEY (workflowId),
FOREIGN KEY (parentWorkflowId) REFERENCES workflow(workflowId)
);
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9afc48b0/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
index f78f007..843daff 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -106,7 +106,7 @@ CREATE TABLE workflow (
startTime INTEGER, lastUpdateTime INTEGER,
numJobsTotal INTEGER, numJobsCompleted INTEGER,
inputBytes INTEGER, outputBytes INTEGER,
- duration INTEGER, workflowTags VARCHAR2(4000),
+ duration INTEGER,
PRIMARY KEY (workflowId),
FOREIGN KEY (parentWorkflowId) REFERENCES workflow(workflowId)
);
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9afc48b0/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
index 63a8d49..10c73ba 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
@@ -186,26 +186,12 @@ CREATE TABLE workflow (
startTime BIGINT, lastUpdateTime BIGINT,
numJobsTotal INTEGER, numJobsCompleted INTEGER,
inputBytes BIGINT, outputBytes BIGINT,
- duration BIGINT, workflowTags TEXT,
+ duration BIGINT,
PRIMARY KEY (workflowId),
FOREIGN KEY (parentWorkflowId) REFERENCES workflow (workflowId)
);
GRANT ALL PRIVILEGES ON TABLE workflow TO "mapred";
-CREATE TABLE application (
- appId TEXT,
- workflowId TEXT,
- appName TEXT,
- workflowEntityName TEXT,
- userName TEXT, queue TEXT,
- submitTime BIGINT, launchTime BIGINT, finishTime BIGINT,
- appType TEXT,
- status TEXT,
- appInfo TEXT,
- PRIMARY KEY (appId), FOREIGN KEY (workflowId) REFERENCES workflow (workflowId)
-);
-GRANT ALL PRIVILEGES ON TABLE application TO "mapred";
-
CREATE TABLE job (
jobId TEXT, workflowId TEXT, jobName TEXT, workflowEntityName TEXT,
userName TEXT, queue TEXT, acls TEXT, confPath TEXT,
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9afc48b0/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Oracle-UPGRADE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Oracle-UPGRADE.sql b/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Oracle-UPGRADE.sql
index e0f5df7..c16a689 100644
--- a/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Oracle-UPGRADE.sql
+++ b/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Oracle-UPGRADE.sql
@@ -23,8 +23,6 @@ ALTER TABLE clusterconfigmapping ADD (user_name VARCHAR2 (255) DEFAULT '_db');
ALTER TABLE hostconfigmapping ADD (user_name VARCHAR2 (255) DEFAULT '_db');
-ALTER TABLE workflow ADD (workflowTags VARCHAR2 (4000));
-
-- DML
--Upgrade version to current
UPDATE metainfo SET "metainfo_key" = 'version', "metainfo_value" = '${ambariVersion}';
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9afc48b0/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql b/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql
index 85a63e8..4a211f9 100644
--- a/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql
+++ b/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql
@@ -107,6 +107,3 @@ ALTER TABLE ambari.clusterconfigmapping
SELECT update_clusterconfigmapping();
GRANT ALL PRIVILEGES ON TABLE ambari.clusterconfigmapping TO :username;
--- ambari log4j DDL
-\connect ambarirca;
-ALTER TABLE workflow ADD COLUMN workflowTags TEXT;