Browse Source

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

John Speidel 11 years ago
parent
commit
b3f8c1d019

+ 1 - 1
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");
 

+ 1 - 1
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);