Repository: ambari
Updated Branches:
refs/heads/trunk d6a4a68d0 - c46d4916a
AMBARI-7254 - Slider View: Slider view not initializing due to long parameter
description
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c46d4916
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c46d4916
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c46d4916
Branch: refs/heads/trunk
Commit: c46d4916abc8775d6ad8c6446a6d640005458ac6
Parents: d6a4a68
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Wed Sep 17 10:41:20 2014 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Wed Sep 17 10:41:20 2014 -0400
--
.../server/upgrade/UpgradeCatalog170.java | 22 +++-
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 6 +++---
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 6 +++---
.../resources/Ambari-DDL-Postgres-CREATE.sql| 6 +++---
.../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 6 +++---
5 files changed, 29 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c46d4916/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
index a08d794..e58b6d3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
@@ -197,14 +197,16 @@ public class UpgradeCatalog170 extends
AbstractUpgradeCatalog {
String.class, 255, null, true));
dbAccessor.addColumn(viewmain, new DBColumnInfo(system_view,
Character.class, 1, null, true));
+dbAccessor.addColumn(viewmain, new DBColumnInfo(resource_type_id,
+Integer.class, 1, 1, false));
+dbAccessor.addColumn(viewmain, new DBColumnInfo(description,
+String.class, 2048, null, true));
dbAccessor.addColumn(viewparameter, new DBColumnInfo(masked,
Character.class, 1, null, true));
dbAccessor.addColumn(users, new DBColumnInfo(active,
Integer.class, 1, 1, false));
dbAccessor.addColumn(users, new DBColumnInfo(principal_id,
Long.class, 1, 1, false));
-dbAccessor.addColumn(viewmain, new DBColumnInfo(resource_type_id,
-Integer.class, 1, 1, false));
dbAccessor.addColumn(viewinstance, new DBColumnInfo(resource_id,
Long.class, 1, 1, false));
dbAccessor.addColumn(viewinstance, new DBColumnInfo(xml_driven,
@@ -223,9 +225,6 @@ public class UpgradeCatalog170 extends
AbstractUpgradeCatalog {
dbAccessor.addColumn(host_role_command, new DBColumnInfo(error_log,
String.class, 255, null, true));
-dbAccessor.addColumn(viewmain, new DBColumnInfo(description,
-String.class, 255, null, true));
-
addAlertingFrameworkDDL();
// Exclusive requests changes
@@ -288,6 +287,19 @@ public class UpgradeCatalog170 extends
AbstractUpgradeCatalog {
}
}
+// alter view tables description columns size
+if (dbType.equals(Configuration.ORACLE_DB_NAME) ||
+dbType.equals(Configuration.MYSQL_DB_NAME)) {
+ dbAccessor.executeQuery(ALTER TABLE viewinstance MODIFY description
VARCHAR(2048));
+ dbAccessor.executeQuery(ALTER TABLE viewparameter MODIFY description
VARCHAR(2048));
+} else if (Configuration.POSTGRES_DB_NAME.equals(dbType)) {
+ dbAccessor.executeQuery(ALTER TABLE viewinstance ALTER COLUMN
description TYPE VARCHAR(2048));
+ dbAccessor.executeQuery(ALTER TABLE viewparameter ALTER COLUMN
description TYPE VARCHAR(2048));
+} else if (dbType.equals(Configuration.DERBY_DB_NAME)) {
+ dbAccessor.executeQuery(ALTER TABLE viewinstance ALTER COLUMN
description SET DATA TYPE VARCHAR(2048));
+ dbAccessor.executeQuery(ALTER TABLE viewparameter ALTER COLUMN
description SET DATA TYPE VARCHAR(2048));
+}
+
//upgrade unit test workaround
if (Configuration.DERBY_DB_NAME.equals(dbType)) {
dbAccessor.executeQuery(ALTER TABLE clusterconfig ALTER COLUMN
config_id DEFAULT 0);
http://git-wip-us.apache.org/repos/asf/ambari/blob/c46d4916/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 fee90c9..a259870 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -65,11 +65,11 @@ CREATE TABLE hostgroup
