Repository: ambari Updated Branches: refs/heads/branch-2.6 2aa6e856c -> 53b269989
AMBARI-22167 Ambari schema upgrade failed for Postgres DB with PSQLException for column "legacy" (dgrinenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/53b26998 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53b26998 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53b26998 Branch: refs/heads/branch-2.6 Commit: 53b269989cd8022660f6f754d87913bd10bc0ee4 Parents: 2aa6e85 Author: Dmytro Grinenko <[email protected]> Authored: Mon Oct 9 16:40:56 2017 +0300 Committer: Dmytro Grinenko <[email protected]> Committed: Mon Oct 9 16:40:56 2017 +0300 ---------------------------------------------------------------------- .../ambari/server/orm/entities/RepositoryVersionEntity.java | 8 ++++---- .../org/apache/ambari/server/upgrade/UpgradeCatalog260.java | 2 +- .../src/main/resources/Ambari-DDL-Postgres-CREATE.sql | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/53b26998/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java index 4fd806d..edfe494 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java @@ -159,7 +159,7 @@ public class RepositoryVersionEntity { private short resolved = 0; @Column(name = "legacy", nullable = false) - private boolean isLegacy = false; + private short isLegacy = 0; @ManyToOne @JoinColumn(name = "parent_id") @@ -504,8 +504,8 @@ public class RepositoryVersionEntity { */ @Deprecated @Experimental(feature= ExperimentalFeature.PATCH_UPGRADES) - public Boolean isLegacy(){ - return this.isLegacy; + public boolean isLegacy(){ + return isLegacy == 1; } /** @@ -516,7 +516,7 @@ public class RepositoryVersionEntity { @Deprecated @Experimental(feature= ExperimentalFeature.PATCH_UPGRADES) public void setLegacy(boolean isLegacy){ - this.isLegacy = isLegacy; + this.isLegacy = isLegacy ? (short) 1 : (short) 0; } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/53b26998/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java index 5a24bbb..c701bdb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java @@ -233,7 +233,7 @@ public class UpgradeCatalog260 extends AbstractUpgradeCatalog { private void addLegacyColumn() throws AmbariException, SQLException { Boolean isLegacyColumnExists = dbAccessor.tableHasColumn(REPO_VERSION_TABLE, REPO_VERSION_LEGACY_COLUMN); if (!isLegacyColumnExists) { - DBAccessor.DBColumnInfo legacyColumn = new DBAccessor.DBColumnInfo(REPO_VERSION_LEGACY_COLUMN, Boolean.class, null, 1, false); + DBAccessor.DBColumnInfo legacyColumn = new DBAccessor.DBColumnInfo(REPO_VERSION_LEGACY_COLUMN, Short.class, null, 1, false); dbAccessor.addColumn(REPO_VERSION_TABLE, legacyColumn); legacyColumn.setDefaultValue(0); http://git-wip-us.apache.org/repos/asf/ambari/blob/53b26998/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql index b3b212d..122fd8b 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql @@ -160,7 +160,7 @@ CREATE TABLE repo_version ( version_xsd VARCHAR(512), parent_id BIGINT, resolved SMALLINT NOT NULL DEFAULT 0, - legacy BOOLEAN NOT NULL DEFAULT false, + legacy SMALLINT NOT NULL DEFAULT 0, CONSTRAINT PK_repo_version PRIMARY KEY (repo_version_id), CONSTRAINT FK_repoversion_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id), CONSTRAINT UQ_repo_version_display_name UNIQUE (display_name),
