ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jspei...@apache.org
Subject git commit: AMBARI-5153. Fix upgrade script to use correct column type for blueprint_configuration table.
Date Wed, 19 Mar 2014 23:55:06 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 3b1fcf36a -> b3f8c1d01


AMBARI-5153.  Fix upgrade script to use correct column type for blueprint_configuration table.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b3f8c1d0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b3f8c1d0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b3f8c1d0

Branch: refs/heads/trunk
Commit: b3f8c1d0198dfd5ddd90aae0ec55b592f5d56376
Parents: 3b1fcf3
Author: John Speidel <jspeidel@hortonworks.com>
Authored: Wed Mar 19 19:34:58 2014 -0400
Committer: John Speidel <jspeidel@hortonworks.com>
Committed: Wed Mar 19 19:34:58 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java   | 2 +-
 ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b3f8c1d0/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java
index eb253a4..ee5acb5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java
@@ -201,7 +201,7 @@ public class UpgradeCatalog150 extends AbstractUpgradeCatalog {
     columns.clear();
     columns.add(new DBColumnInfo("blueprint_name", String.class, 255, null, false));
     columns.add(new DBColumnInfo("type_name", String.class, 255, null, false));
-    columns.add(new DBColumnInfo("config_data", String.class, 32000, null, false));
+    columns.add(new DBColumnInfo("config_data", byte[].class, null, null, false));
 
     dbAccessor.createTable("blueprint_configuration", columns, "blueprint_name", "type_name");
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b3f8c1d0/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 afe6497..2aabe57 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -49,7 +49,7 @@ CREATE TABLE requestschedulebatchrequest (schedule_id NUMBER(19), batch_id
NUMBE
 CREATE TABLE blueprint (blueprint_name VARCHAR2(255) NOT NULL, stack_name VARCHAR2(255) NOT
NULL, stack_version VARCHAR2(255) NOT NULL, PRIMARY KEY(blueprint_name));
 CREATE TABLE hostgroup (blueprint_name VARCHAR2(255) NOT NULL, name VARCHAR2(255) NOT NULL,
cardinality VARCHAR2(255) NOT NULL, PRIMARY KEY(blueprint_name, name));
 CREATE TABLE hostgroup_component (blueprint_name VARCHAR2(255) NOT NULL, hostgroup_name VARCHAR2(255)
NOT NULL, name VARCHAR2(255) NOT NULL, PRIMARY KEY(blueprint_name, hostgroup_name, name));
-CREATE TABLE blueprint_configuration (blueprint_name VARCHAR2(255) NOT NULL, type_name VARCHAR2(255)
NOT NULL, config_data VARCHAR2(32000) NOT NULL , PRIMARY KEY(blueprint_name, type_name));
+CREATE TABLE blueprint_configuration (blueprint_name VARCHAR2(255) NOT NULL, type_name VARCHAR2(255)
NOT NULL, config_data CLOB NOT NULL , PRIMARY KEY(blueprint_name, type_name));
 
 ALTER TABLE users ADD CONSTRAINT UNQ_users_0 UNIQUE (user_name, ldap_user);
 ALTER TABLE clusterconfig ADD CONSTRAINT FK_clusterconfig_cluster_id FOREIGN KEY (cluster_id)
REFERENCES clusters (cluster_id);


Mime
View raw message