Repository: ambari Updated Branches: refs/heads/trunk f3637b565 -> 827700329
AMBARI-5622. Upgrading schema failed during upgrading to 1.6.0. (Myroslav Papirkovskyy via swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/82770032 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/82770032 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/82770032 Branch: refs/heads/trunk Commit: 8277003296ddc6ea981e89565017021b1e93c76e Parents: f3637b5 Author: Siddharth Wagle <[email protected]> Authored: Tue Apr 29 14:33:10 2014 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Tue Apr 29 14:33:10 2014 -0700 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/UpgradeCatalog150.java | 2 +- .../org/apache/ambari/server/upgrade/UpgradeCatalog160.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/82770032/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 5848a67..e409580 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 @@ -851,7 +851,7 @@ public class UpgradeCatalog150 extends AbstractUpgradeCatalog { return "insert into request" + "(request_id, cluster_id, request_context, start_time, end_time, create_time) " + "select distinct s.request_id, s.cluster_id, s.request_context, " + - "coalesce (cmd.start_time, -1), coalesce (cmd.end_time, -1), -1 " + + "coalesce(cmd.start_time, -1), coalesce(cmd.end_time, -1), -1 " + "from " + "(select distinct request_id, cluster_id, request_context from stage ) s " + "left join " + http://git-wip-us.apache.org/repos/asf/ambari/blob/82770032/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java index fb4a87a..5318e22 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java @@ -69,8 +69,15 @@ public class UpgradeCatalog160 extends AbstractUpgradeCatalog { //========================================================================= // Add columns + //TODO type converters are not supported by DBAccessor currently, default value will be provided to query as is in most cases + DBAccessor.DBColumnInfo restartRequiredColumn = + new DBAccessor.DBColumnInfo("restart_required", Boolean.class, 1, 0, false); + if (Configuration.POSTGRES_DB_NAME.equals(getDbType())) { + //only postgres supports boolean type + restartRequiredColumn.setDefaultValue(Boolean.FALSE); + } dbAccessor.addColumn("hostcomponentdesiredstate", - new DBAccessor.DBColumnInfo("restart_required", Boolean.class, 1, 0, false)); + restartRequiredColumn); // ======================================================================== // Add constraints
