Repository: ambari Updated Branches: refs/heads/trunk e7955140c -> 88947af23
AMBARI-11103. Ambari Upgrade from 2.0.0 to 2.1.0 fails due to StackEntity (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/88947af2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/88947af2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/88947af2 Branch: refs/heads/trunk Commit: 88947af23d601f702760954ce8d47f33fc445a8e Parents: e795514 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Wed May 13 16:29:26 2015 +0300 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Wed May 13 16:29:26 2015 +0300 ---------------------------------------------------------------------- .../ambari/server/upgrade/UpgradeCatalog200.java | 1 + .../ambari/server/upgrade/UpgradeCatalog210.java | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/88947af2/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java index d2b9610..6b634ec 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java @@ -201,6 +201,7 @@ public class UpgradeCatalog200 extends AbstractUpgradeCatalog { columns.add(new DBColumnInfo("upgrade_package", String.class, 255, null, false)); columns.add(new DBColumnInfo("repositories", char[].class, null, null, false)); dbAccessor.createTable("repo_version", columns, "repo_version_id"); + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, sequence_value) VALUES('repo_version_id_seq', 0)", false); dbAccessor.executeQuery("ALTER TABLE repo_version ADD CONSTRAINT UQ_repo_version_display_name UNIQUE (display_name)"); dbAccessor.executeQuery("ALTER TABLE repo_version ADD CONSTRAINT UQ_repo_version_stack_version UNIQUE (stack, version)"); http://git-wip-us.apache.org/repos/asf/ambari/blob/88947af2/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java index c27849b..c023ae1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java @@ -160,8 +160,8 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog { columns.add(new DBColumnInfo("action", String.class, 255, null, false)); columns.add(new DBColumnInfo("cluster_name", String.class, 100, null, false)); columns.add(new DBColumnInfo("bp_name", String.class, 100, null, false)); - columns.add(new DBColumnInfo("cluster_properties", byte[].class, null, null, false)); - columns.add(new DBColumnInfo("cluster_attributes", byte[].class, null, null, false)); + columns.add(new DBColumnInfo("cluster_properties", char[].class, null, null, false)); + columns.add(new DBColumnInfo("cluster_attributes", char[].class, null, null, false)); columns.add(new DBColumnInfo("description", String.class, 1024, null, false)); dbAccessor.createTable(TOPOLOGY_REQUEST_TABLE, columns, "id"); @@ -169,8 +169,8 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog { columns.clear(); columns.add(new DBColumnInfo("id", Long.class, null, null, false)); columns.add(new DBColumnInfo("name", String.class, 255, null, false)); - columns.add(new DBColumnInfo("group_properties", byte[].class, null, null, false)); - columns.add(new DBColumnInfo("group_attributes", byte[].class, null, null, false)); + columns.add(new DBColumnInfo("group_properties", char[].class, null, null, false)); + columns.add(new DBColumnInfo("group_attributes", char[].class, null, null, false)); columns.add(new DBColumnInfo("request_id", Long.class, null, null, false)); dbAccessor.createTable(TOPOLOGY_HOST_GROUP_TABLE, columns, "id"); @@ -497,14 +497,14 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog { columns.add(new DBColumnInfo("id", Long.class, null, null, false)); columns.add(new DBColumnInfo("widget_name", String.class, 255, null, false)); columns.add(new DBColumnInfo("widget_type", String.class, 255, null, false)); - columns.add(new DBColumnInfo("metrics", byte[].class, null, null, true)); + columns.add(new DBColumnInfo("metrics", char[].class, null, null, true)); columns.add(new DBColumnInfo("time_created", Long.class, null, null, false)); columns.add(new DBColumnInfo("author", String.class, 255, null, true)); columns.add(new DBColumnInfo("description", String.class, 255, null, true)); columns.add(new DBColumnInfo("default_section_name", String.class, 255, null, true)); columns.add(new DBColumnInfo("scope", String.class, 255, null, true)); - columns.add(new DBColumnInfo("widget_values", byte[].class, null, null, true)); - columns.add(new DBColumnInfo("properties", byte[].class, null, null, true)); + columns.add(new DBColumnInfo("widget_values", char[].class, null, null, true)); + columns.add(new DBColumnInfo("properties", char[].class, null, null, true)); columns.add(new DBColumnInfo("cluster_id", Long.class, null, null, false)); dbAccessor.createTable(WIDGET_TABLE, columns, "id");
