This is an automated email from the ASF dual-hosted git repository. smolnar pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new 129632c AMBARI-24992. Updated ambari_configuration.property_value to support longer input (#2694) 129632c is described below commit 129632c94aa339571d0fa278a2259157b5244fcb Author: Sandor Molnar <smol...@apache.org> AuthorDate: Wed Dec 5 22:43:53 2018 +0100 AMBARI-24992. Updated ambari_configuration.property_value to support longer input (#2694) --- .../org/apache/ambari/server/upgrade/UpgradeCatalog280.java | 9 +++++++++ ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql | 2 +- ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +- .../src/main/resources/Ambari-DDL-Postgres-CREATE.sql | 2 +- .../src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 2 +- .../src/main/resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +- .../apache/ambari/server/upgrade/UpgradeCatalog280Test.java | 11 +++++++++++ 7 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog280.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog280.java index 938e453..d4ab5eb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog280.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog280.java @@ -44,6 +44,9 @@ public class UpgradeCatalog280 extends AbstractUpgradeCatalog { private static final String UPGRADE_TABLE = "upgrade"; private static final String UPGRADE_PACK_STACK_ID = "upgrade_pack_stack_id"; + protected static final String AMBARI_CONFIGURATION_TABLE = "ambari_configuration"; + protected static final String AMBARI_CONFIGURATION_PROPERTY_VALUE_COLUMN = "property_value"; + @Inject public UpgradeCatalog280(Injector injector) { super(injector); @@ -64,6 +67,12 @@ public class UpgradeCatalog280 extends AbstractUpgradeCatalog { removeLastValidState(); addColumnsToRequestScheduleTable(); addColumnsToUpgradeTable(); + modifyPropertyValueColumnInAmbariConfigurationTable(); + } + + private void modifyPropertyValueColumnInAmbariConfigurationTable() throws SQLException { + dbAccessor.alterColumn(AMBARI_CONFIGURATION_TABLE, new DBAccessor.DBColumnInfo(AMBARI_CONFIGURATION_PROPERTY_VALUE_COLUMN, String.class, 4000, null, false)); + LOG.info("Altered {}.{} to NOT NULL and extended its length to 4000", AMBARI_CONFIGURATION_TABLE, AMBARI_CONFIGURATION_PROPERTY_VALUE_COLUMN); } @Override diff --git a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql index 5eeb23c..48021a2 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql @@ -106,7 +106,7 @@ CREATE TABLE clusterconfig ( CREATE TABLE ambari_configuration ( category_name VARCHAR(100) NOT NULL, property_name VARCHAR(100) NOT NULL, - property_value VARCHAR(2048), + property_value VARCHAR(4000) NOT NULL, CONSTRAINT PK_ambari_configuration PRIMARY KEY (category_name, property_name)); CREATE TABLE serviceconfig ( diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql index ff1176a..8e7b228 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql @@ -125,7 +125,7 @@ CREATE TABLE clusterconfig ( CREATE TABLE ambari_configuration ( category_name VARCHAR(100) NOT NULL, property_name VARCHAR(100) NOT NULL, - property_value VARCHAR(2048), + property_value VARCHAR(4000) NOT NULL, CONSTRAINT PK_ambari_configuration PRIMARY KEY (category_name, property_name)); CREATE TABLE serviceconfig ( 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 3af5ada..afd83c7 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql @@ -88,7 +88,7 @@ CREATE TABLE clusters ( CREATE TABLE ambari_configuration ( category_name VARCHAR(100) NOT NULL, property_name VARCHAR(100) NOT NULL, - property_value VARCHAR(2048), + property_value VARCHAR(4000) NOT NULL, CONSTRAINT PK_ambari_configuration PRIMARY KEY (category_name, property_name) ); diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql index 76be14c..209e762 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql @@ -105,7 +105,7 @@ CREATE TABLE clusterconfig ( CREATE TABLE ambari_configuration ( category_name VARCHAR(100) NOT NULL, property_name VARCHAR(100) NOT NULL, - property_value VARCHAR(2048), + property_value VARCHAR(4000) NOT NULL, CONSTRAINT PK_ambari_configuration PRIMARY KEY (category_name, property_name)); CREATE TABLE serviceconfig ( diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql index d584a9f..b4555a7 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql @@ -119,7 +119,7 @@ CREATE TABLE clusterconfig ( CREATE TABLE ambari_configuration ( category_name VARCHAR(100) NOT NULL, property_name VARCHAR(100) NOT NULL, - property_value VARCHAR(2048), + property_value VARCHAR(4000) NOT NULL, CONSTRAINT PK_ambari_configuration PRIMARY KEY (category_name, property_name) ); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog280Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog280Test.java index 4722dab..c7b0fad 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog280Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog280Test.java @@ -18,6 +18,8 @@ package org.apache.ambari.server.upgrade; +import static org.apache.ambari.server.upgrade.UpgradeCatalog280.AMBARI_CONFIGURATION_PROPERTY_VALUE_COLUMN; +import static org.apache.ambari.server.upgrade.UpgradeCatalog280.AMBARI_CONFIGURATION_TABLE; import static org.apache.ambari.server.upgrade.UpgradeCatalog280.HOST_COMPONENT_STATE_TABLE; import static org.apache.ambari.server.upgrade.UpgradeCatalog280.LAST_LIVE_STATE_COLUMN; import static org.easymock.EasyMock.capture; @@ -67,6 +69,10 @@ public class UpgradeCatalog280Test { Capture<DBAccessor.DBColumnInfo> upgradePackStackColumn = newCapture(CaptureType.ALL); dbAccessor.addColumn(eq("upgrade"), capture(upgradePackStackColumn)); expectLastCall().once(); + + final Capture<DBAccessor.DBColumnInfo> alterPropertyValueColumnCapture = newCapture(CaptureType.ALL); + dbAccessor.alterColumn(eq(AMBARI_CONFIGURATION_TABLE), capture(alterPropertyValueColumnCapture)); + expectLastCall().once(); replay(dbAccessor, injector); @@ -93,6 +99,11 @@ public class UpgradeCatalog280Test { Assert.assertEquals(String.class, capturedUpgradeColumn.getType()); Assert.assertEquals((Integer) 255, capturedUpgradeColumn.getLength()); + final DBAccessor.DBColumnInfo alterPropertyValueColumn = alterPropertyValueColumnCapture.getValue(); + Assert.assertEquals(AMBARI_CONFIGURATION_PROPERTY_VALUE_COLUMN, alterPropertyValueColumn.getName()); + Assert.assertEquals(String.class, alterPropertyValueColumn.getType()); + Assert.assertEquals((Integer) 4000, alterPropertyValueColumn.getLength()); + Assert.assertFalse(alterPropertyValueColumn.isNullable()); verify(dbAccessor); }