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/04 23:24:07 UTC
git commit: AMBARI-3463. Fix DDL issues for Jobs. (yuasku)
Updated Branches:
refs/heads/trunk f4b62b546 -> 2b0048b8e
AMBARI-3463. Fix DDL issues for Jobs. (yuasku)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/2b0048b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/2b0048b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/2b0048b8
Branch: refs/heads/trunk
Commit: 2b0048b8ed48d81bd0f9318020707933b46d8abf
Parents: f4b62b5
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Fri Oct 4 14:23:39 2013 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Fri Oct 4 14:24:00 2013 -0700
----------------------------------------------------------------------
ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +-
ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 +-
.../src/main/resources/upgrade/ddl/Ambari-DDL-Oracle-UPGRADE.sql | 2 ++
.../resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql | 3 +++
4 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2b0048b8/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 9369561..3f39f53 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,
+ duration BIGINT, workflowTags TEXT,
PRIMARY KEY (workflowId),
FOREIGN KEY (parentWorkflowId) REFERENCES workflow(workflowId)
);
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2b0048b8/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 843daff..f78f007 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,
+ duration INTEGER, workflowTags VARCHAR2(4000),
PRIMARY KEY (workflowId),
FOREIGN KEY (parentWorkflowId) REFERENCES workflow(workflowId)
);
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2b0048b8/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 c16a689..e0f5df7 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,6 +23,8 @@ 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/2b0048b8/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 4a211f9..85a63e8 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,3 +107,6 @@ 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;