AMBARI-21307 Added new resource related changes to the db creation ddl-s
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/11e1f7d5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/11e1f7d5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/11e1f7d5 Branch: refs/heads/feature-branch-AMBARI-21307 Commit: 11e1f7d556cacf3ad543544a1469c1387f15289b Parents: cf60e6c Author: lpuskas <lpus...@apache.org> Authored: Thu Jul 6 18:15:18 2017 +0200 Committer: lpuskas <lpus...@apache.org> Committed: Tue Aug 8 18:00:10 2017 +0200 ---------------------------------------------------------------------- .../AmbariConfigurationResourceProvider.java | 12 ++-- .../server/orm/dao/AmbariConfigurationDAO.java | 65 ++------------------ .../apache/ambari/server/orm/dao/DaoUtils.java | 13 +--- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 21 +++++++ .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 20 ++++++ .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 20 ++++++ .../resources/Ambari-DDL-Postgres-CREATE.sql | 14 ++--- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 20 ++++++ .../resources/Ambari-DDL-SQLServer-CREATE.sql | 20 ++++++ 9 files changed, 120 insertions(+), 85 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/11e1f7d5/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java index 5e5af9e..e8f186d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java @@ -97,14 +97,14 @@ public class AmbariConfigurationResourceProvider extends AbstractAuthorizedResou } } - private static Set<String> properties = Sets.newHashSet( + private static Set<String> PROPERTIES = Sets.newHashSet( ResourcePropertyId.ID.getPropertyId(), ResourcePropertyId.TYPE.getPropertyId(), ResourcePropertyId.VERSION.getPropertyId(), ResourcePropertyId.VERSION_TAG.getPropertyId(), ResourcePropertyId.DATA.getPropertyId()); - private static Map<Resource.Type, String> pkPropertyMap = Collections.unmodifiableMap( + private static Map<Resource.Type, String> PK_PROPERTY_MAP = Collections.unmodifiableMap( new HashMap<Resource.Type, String>() {{ put(Resource.Type.AmbariConfiguration, ResourcePropertyId.ID.getPropertyId()); }} @@ -117,7 +117,7 @@ public class AmbariConfigurationResourceProvider extends AbstractAuthorizedResou private Gson gson; protected AmbariConfigurationResourceProvider() { - super(properties, pkPropertyMap); + super(PROPERTIES, PK_PROPERTY_MAP); setRequiredCreateAuthorizations(EnumSet.of(RoleAuthorization.AMBARI_MANAGE_CONFIGURATION)); setRequiredDeleteAuthorizations(EnumSet.of(RoleAuthorization.AMBARI_MANAGE_CONFIGURATION)); @@ -126,7 +126,7 @@ public class AmbariConfigurationResourceProvider extends AbstractAuthorizedResou @Override protected Set<String> getPKPropertyIds() { - return Sets.newHashSet("AmbariConfiguration/id"); + return Sets.newHashSet(ResourcePropertyId.ID.getPropertyId()); } @Override @@ -137,7 +137,7 @@ public class AmbariConfigurationResourceProvider extends AbstractAuthorizedResou AmbariConfigurationEntity ambariConfigurationEntity = getEntityFromRequest(request); LOGGER.info("Persisting new ambari configuration: {} ", ambariConfigurationEntity); - ambariConfigurationDAO.persist(ambariConfigurationEntity); + ambariConfigurationDAO.create(ambariConfigurationEntity); return getRequestStatus(null); } @@ -170,7 +170,7 @@ public class AmbariConfigurationResourceProvider extends AbstractAuthorizedResou } else { LOGGER.debug("Deleting amari configuration with id: {}", idFromRequest); try { - ambariConfigurationDAO.deleteById(idFromRequest); + ambariConfigurationDAO.removeByPK(idFromRequest); } catch (IllegalStateException e) { throw new NoSuchResourceException(e.getMessage()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/11e1f7d5/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java index dea37eb..c29a423 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java @@ -14,79 +14,24 @@ package org.apache.ambari.server.orm.dao; -import java.util.List; - import javax.inject.Inject; -import javax.inject.Provider; import javax.inject.Singleton; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import org.apache.ambari.server.orm.RequiresSession; import org.apache.ambari.server.orm.entities.AmbariConfigurationEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.inject.persist.Transactional; /** * DAO dealing with ambari configuration related JPA operations. */ @Singleton -// todo extend CrudDao (amend crud dao to handle NPEs) -public class AmbariConfigurationDAO { - - private static final Logger LOGGER = LoggerFactory.getLogger(AmbariConfigurationDAO.class); - - @Inject - private Provider<EntityManager> entityManagerProvider; +public class AmbariConfigurationDAO extends CrudDAO<AmbariConfigurationEntity, Long> { - /** - * DAO utilities for dealing mostly with {@link TypedQuery} results. - */ @Inject - private DaoUtils daoUtils; - - public AmbariConfigurationEntity findByid(Long id) { - return entityManagerProvider.get().find(AmbariConfigurationEntity.class, id); - } - - @RequiresSession - @Transactional - public void persist(AmbariConfigurationEntity entity) { - LOGGER.debug("Persisting ambari configuration: {}", entity); - entityManagerProvider.get().persist(entity); + public AmbariConfigurationDAO() { + super(AmbariConfigurationEntity.class); } - @RequiresSession - public List<AmbariConfigurationEntity> findAll() { - TypedQuery<AmbariConfigurationEntity> query = entityManagerProvider.get().createNamedQuery( - "AmbariConfigurationEntity.findAll", AmbariConfigurationEntity.class); - return daoUtils.selectList(query); + public void create(AmbariConfigurationEntity entity) { + super.create(entity); } - - - @RequiresSession - @Transactional - public void deleteById(Long ambariConfigurationId) { - - if (ambariConfigurationId == null) { - throw new IllegalArgumentException("No Ambari Configuration id provided."); - } - - LOGGER.debug("Removing Ambari Configuration with id :{}", ambariConfigurationId); - - AmbariConfigurationEntity ambariConfigurationEntity = findByid(ambariConfigurationId); - if (ambariConfigurationEntity == null) { - String msg = String.format("No Ambari Configuration found with id: %s", ambariConfigurationId); - LOGGER.debug(msg); - throw new IllegalStateException(msg); - } - - entityManagerProvider.get().remove(ambariConfigurationEntity); - LOGGER.debug("Ambari Configuration with id: {}", ambariConfigurationId); - } - - } http://git-wip-us.apache.org/repos/asf/ambari/blob/11e1f7d5/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/DaoUtils.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/DaoUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/DaoUtils.java index cd3faf0..e6112ad 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/DaoUtils.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/DaoUtils.java @@ -18,8 +18,6 @@ package org.apache.ambari.server.orm.dao; -import static org.apache.ambari.server.orm.DBAccessor.DbType; - import java.util.Collections; import java.util.List; @@ -31,19 +29,10 @@ import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import org.apache.ambari.server.orm.DBAccessor; - -import com.google.inject.Inject; import com.google.inject.Singleton; @Singleton public class DaoUtils { - @Inject - private DBAccessor dbAccessor; - - public DbType getDbType() { - return dbAccessor.getDbType(); - } public <T> List<T> selectAll(EntityManager entityManager, Class<T> entityClass) { CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); @@ -92,7 +81,7 @@ public class DaoUtils { public void setParameters(Query query, Object... parameters) { for (int i = 0; i < parameters.length; i++) { - query.setParameter(i+1, parameters[i]); + query.setParameter(i + 1, parameters[i]); } } } http://git-wip-us.apache.org/repos/asf/ambari/blob/11e1f7d5/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql ---------------------------------------------------------------------- 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 89bc4a4..7b827df 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql @@ -84,6 +84,23 @@ CREATE TABLE clusterconfig ( CONSTRAINT UQ_config_type_tag UNIQUE (version_tag, type_name, cluster_id), CONSTRAINT UQ_config_type_version UNIQUE (cluster_id, type_name, version)); +CREATE TABLE configuration_base ( + id BIGINT NOT NULL, + version_tag VARCHAR(255) NOT NULL, + version BIGINT NOT NULL, + type VARCHAR(255) NOT NULL, + data VARCHAR(3000) NOT NULL, + attributes VARCHAR(3000), + create_timestamp BIGINT NOT NULL, + CONSTRAINT PK_configuration_base PRIMARY KEY (id) +); + +CREATE TABLE ambari_configuration ( + id BIGINT NOT NULL, + CONSTRAINT PK_ambari_configuration PRIMARY KEY (id), + CONSTRAINT FK_ambari_configuration_configuration_base FOREIGN KEY (id) REFERENCES configuration_base (id) +); + CREATE TABLE serviceconfig ( service_config_id BIGINT NOT NULL, cluster_id BIGINT NOT NULL, @@ -1142,6 +1159,8 @@ INSERT INTO ambari_sequences (sequence_name, sequence_value) union all select 'servicecomponent_version_id_seq', 0 FROM SYSIBM.SYSDUMMY1 union all + select 'configuration_id_seq', 0 FROM SYSIBM.SYSDUMMY1 + union all select 'hostcomponentdesiredstate_id_seq', 0 FROM SYSIBM.SYSDUMMY1; @@ -1242,6 +1261,7 @@ INSERT INTO roleauthorization(authorization_id, authorization_name) SELECT 'AMBARI.ADD_DELETE_CLUSTERS', 'Create new clusters' FROM SYSIBM.SYSDUMMY1 UNION ALL SELECT 'AMBARI.RENAME_CLUSTER', 'Rename clusters' FROM SYSIBM.SYSDUMMY1 UNION ALL SELECT 'AMBARI.MANAGE_SETTINGS', 'Manage settings' FROM SYSIBM.SYSDUMMY1 UNION ALL + SELECT 'AMBARI.MANAGE_CONFIGURATION', 'Manage ambari configurations' FROM SYSIBM.SYSDUMMY1 UNION ALL SELECT 'AMBARI.MANAGE_USERS', 'Manage users' FROM SYSIBM.SYSDUMMY1 UNION ALL SELECT 'AMBARI.MANAGE_GROUPS', 'Manage groups' FROM SYSIBM.SYSDUMMY1 UNION ALL SELECT 'AMBARI.MANAGE_VIEWS', 'Manage Ambari Views' FROM SYSIBM.SYSDUMMY1 UNION ALL @@ -1443,6 +1463,7 @@ INSERT INTO permission_roleauthorization(permission_id, authorization_id) SELECT permission_id, 'AMBARI.ADD_DELETE_CLUSTERS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.RENAME_CLUSTER' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_SETTINGS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL + SELECT permission_id, 'AMBARI.MANAGE_CONFIGURATION' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_USERS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_GROUPS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_VIEWS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL http://git-wip-us.apache.org/repos/asf/ambari/blob/11e1f7d5/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql ---------------------------------------------------------------------- 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 22dad9b..2354597 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql @@ -104,6 +104,23 @@ CREATE TABLE clusterconfig ( CONSTRAINT UQ_config_type_tag UNIQUE (cluster_id, type_name, version_tag), CONSTRAINT UQ_config_type_version UNIQUE (cluster_id, type_name, version)); +CREATE TABLE configuration_base ( + id BIGINT NOT NULL, + version_tag VARCHAR(100) NOT NULL, + version BIGINT NOT NULL, + type VARCHAR(100) NOT NULL, + data LONGTEXT NOT NULL, + attributes LONGTEXT, + create_timestamp BIGINT NOT NULL, + CONSTRAINT PK_configuration_base PRIMARY KEY (id) +); + +CREATE TABLE ambari_configuration ( + id BIGINT NOT NULL, + CONSTRAINT PK_ambari_configuration PRIMARY KEY (id), + CONSTRAINT FK_ambari_configuration_configuration_base FOREIGN KEY (id) REFERENCES configuration_base (id) +); + CREATE TABLE serviceconfig ( service_config_id BIGINT NOT NULL, cluster_id BIGINT NOT NULL, @@ -1107,6 +1124,7 @@ INSERT INTO ambari_sequences(sequence_name, sequence_value) VALUES ('remote_cluster_id_seq', 0), ('remote_cluster_service_id_seq', 0), ('servicecomponent_version_id_seq', 0), + ('configuration_id_seq', 0), ('hostcomponentdesiredstate_id_seq', 0); INSERT INTO adminresourcetype (resource_type_id, resource_type_name) VALUES @@ -1191,6 +1209,7 @@ INSERT INTO roleauthorization(authorization_id, authorization_name) SELECT 'AMBARI.ADD_DELETE_CLUSTERS', 'Create new clusters' UNION ALL SELECT 'AMBARI.RENAME_CLUSTER', 'Rename clusters' UNION ALL SELECT 'AMBARI.MANAGE_SETTINGS', 'Manage administrative settings' UNION ALL + SELECT 'AMBARI.MANAGE_CONFIGURATION', 'Manage ambari configuration' UNION ALL SELECT 'AMBARI.MANAGE_USERS', 'Manage users' UNION ALL SELECT 'AMBARI.MANAGE_GROUPS', 'Manage groups' UNION ALL SELECT 'AMBARI.MANAGE_VIEWS', 'Manage Ambari Views' UNION ALL @@ -1396,6 +1415,7 @@ INSERT INTO permission_roleauthorization(permission_id, authorization_id) SELECT permission_id, 'AMBARI.ADD_DELETE_CLUSTERS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.RENAME_CLUSTER' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_SETTINGS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL + SELECT permission_id, 'AMBARI.MANAGE_CONFIGURATION' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_USERS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_GROUPS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_VIEWS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL http://git-wip-us.apache.org/repos/asf/ambari/blob/11e1f7d5/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql index ea9de0f..3170af6 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql @@ -84,6 +84,23 @@ CREATE TABLE clusterconfig ( CONSTRAINT UQ_config_type_tag UNIQUE (cluster_id, type_name, version_tag), CONSTRAINT UQ_config_type_version UNIQUE (cluster_id, type_name, version)); +CREATE TABLE configuration_base ( + id NUMBER(19) NOT NULL, + version_tag VARCHAR(255) NOT NULL, + version NUMBER(19) NOT NULL, + type VARCHAR(255) NOT NULL, + data CLOB NOT NULL, + attributes CLOB, + create_timestamp NUMBER(19) NOT NULL, + CONSTRAINT PK_configuration_base PRIMARY KEY (id) +); + +CREATE TABLE ambari_configuration ( + id NUMBER(19) NOT NULL, + CONSTRAINT PK_ambari_configuration PRIMARY KEY (id), + CONSTRAINT FK_ambari_configuration_configuration_base FOREIGN KEY (id) REFERENCES configuration_base (id) +); + CREATE TABLE serviceconfig ( service_config_id NUMBER(19) NOT NULL, cluster_id NUMBER(19) NOT NULL, @@ -1086,6 +1103,7 @@ INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('ambari_oper INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('remote_cluster_id_seq', 0); INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('remote_cluster_service_id_seq', 0); INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('servicecomponent_version_id_seq', 0); +INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('configuration_id_seq', 0); INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('hostcomponentdesiredstate_id_seq', 0); INSERT INTO metainfo("metainfo_key", "metainfo_value") values ('version', '${ambariSchemaVersion}'); @@ -1189,6 +1207,7 @@ INSERT INTO roleauthorization(authorization_id, authorization_name) SELECT 'AMBARI.ADD_DELETE_CLUSTERS', 'Create new clusters' FROM dual UNION ALL SELECT 'AMBARI.RENAME_CLUSTER', 'Rename clusters' FROM dual UNION ALL SELECT 'AMBARI.MANAGE_SETTINGS', 'Manage settings' FROM dual UNION ALL + SELECT 'AMBARI.MANAGE_CONFIGURATION', 'Manage ambari configuration' FROM dual UNION ALL SELECT 'AMBARI.MANAGE_USERS', 'Manage users' FROM dual UNION ALL SELECT 'AMBARI.MANAGE_GROUPS', 'Manage groups' FROM dual UNION ALL SELECT 'AMBARI.MANAGE_VIEWS', 'Manage Ambari Views' FROM dual UNION ALL @@ -1394,6 +1413,7 @@ INSERT INTO permission_roleauthorization(permission_id, authorization_id) SELECT permission_id, 'AMBARI.ADD_DELETE_CLUSTERS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.RENAME_CLUSTER' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_SETTINGS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL + SELECT permission_id, 'AMBARI.MANAGE_CONFIGURATION' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_USERS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_GROUPS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_VIEWS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL http://git-wip-us.apache.org/repos/asf/ambari/blob/11e1f7d5/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 6b10009..9ec9039 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql @@ -67,13 +67,13 @@ CREATE TABLE clusters ( ); CREATE TABLE configuration_base ( - id BIGINT NOT NULL, - version_tag VARCHAR(255) NOT NULL, - version BIGINT NOT NULL, - type VARCHAR(255) NOT NULL, - data TEXT NOT NULL, - attributes TEXT, - create_timestamp BIGINT NOT NULL, + id BIGINT NOT NULL, + version_tag VARCHAR(255) NOT NULL, + version BIGINT NOT NULL, + type VARCHAR(255) NOT NULL, + data TEXT NOT NULL, + attributes TEXT, + create_timestamp BIGINT NOT NULL, CONSTRAINT PK_configuration_base PRIMARY KEY (id) ); http://git-wip-us.apache.org/repos/asf/ambari/blob/11e1f7d5/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql ---------------------------------------------------------------------- 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 aa5242c..905fe51 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql @@ -83,6 +83,23 @@ CREATE TABLE clusterconfig ( CONSTRAINT UQ_config_type_tag UNIQUE (cluster_id, type_name, version_tag), CONSTRAINT UQ_config_type_version UNIQUE (cluster_id, type_name, version)); +CREATE TABLE configuration_base ( + id NUMERIC(19) NOT NULL, + version_tag VARCHAR(255) NOT NULL, + version NUMERIC(19) NOT NULL, + type VARCHAR(255) NOT NULL, + data TEXT NOT NULL, + attributes TEXT, + create_timestamp NUMERIC(19) NOT NULL, + CONSTRAINT PK_configuration_base PRIMARY KEY (id) +); + +CREATE TABLE ambari_configuration ( + id NUMERIC(19) NOT NULL, + CONSTRAINT PK_ambari_configuration PRIMARY KEY (id), + CONSTRAINT FK_ambari_configuration_configuration_base FOREIGN KEY (id) REFERENCES configuration_base (id) +); + CREATE TABLE serviceconfig ( service_config_id NUMERIC(19) NOT NULL, cluster_id NUMERIC(19) NOT NULL, @@ -1085,6 +1102,7 @@ INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('remote_clus INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('remote_cluster_service_id_seq', 0); INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('servicecomponent_version_id_seq', 0); INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('hostcomponentdesiredstate_id_seq', 0); +INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('configuration_id_seq', 0); insert into adminresourcetype (resource_type_id, resource_type_name) select 1, 'AMBARI' @@ -1185,6 +1203,7 @@ insert into adminpermission(permission_id, permission_name, resource_type_id, pe SELECT 'AMBARI.ADD_DELETE_CLUSTERS', 'Create new clusters' UNION ALL SELECT 'AMBARI.RENAME_CLUSTER', 'Rename clusters' UNION ALL SELECT 'AMBARI.MANAGE_SETTINGS', 'Manage settings' UNION ALL + SELECT 'AMBARI.MANAGE_CONFIGURATION', 'Manage ambari configuration' UNION ALL SELECT 'AMBARI.MANAGE_USERS', 'Manage users' UNION ALL SELECT 'AMBARI.MANAGE_GROUPS', 'Manage groups' UNION ALL SELECT 'AMBARI.MANAGE_VIEWS', 'Manage Ambari Views' UNION ALL @@ -1390,6 +1409,7 @@ insert into adminpermission(permission_id, permission_name, resource_type_id, pe SELECT permission_id, 'AMBARI.ADD_DELETE_CLUSTERS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.RENAME_CLUSTER' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_SETTINGS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL + SELECT permission_id, 'AMBARI.MANAGE_CONFIGURATION' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_USERS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_GROUPS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_VIEWS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL http://git-wip-us.apache.org/repos/asf/ambari/blob/11e1f7d5/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql ---------------------------------------------------------------------- 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 5008471..76c4962 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql @@ -97,6 +97,23 @@ CREATE TABLE clusterconfig ( CONSTRAINT UQ_config_type_tag UNIQUE (cluster_id, type_name, version_tag), CONSTRAINT UQ_config_type_version UNIQUE (cluster_id, type_name, version)); +CREATE TABLE configuration_base ( + id BIGINT NOT NULL, + version_tag VARCHAR(255) NOT NULL, + version BIGINT NOT NULL, + type VARCHAR(255) NOT NULL, + data VARCHAR(MAX) NOT NULL, + attributes VARCHAR(MAX), + create_timestamp BIGINT NOT NULL, + CONSTRAINT PK_configuration_base PRIMARY KEY (id) +); + +CREATE TABLE ambari_configuration ( + id BIGINT NOT NULL, + CONSTRAINT PK_ambari_configuration PRIMARY KEY (id), + CONSTRAINT FK_ambari_configuration_configuration_base FOREIGN KEY (id) REFERENCES configuration_base (id) +); + CREATE TABLE serviceconfig ( service_config_id BIGINT NOT NULL, cluster_id BIGINT NOT NULL, @@ -1111,6 +1128,7 @@ BEGIN TRANSACTION ('remote_cluster_id_seq', 0), ('remote_cluster_service_id_seq', 0), ('servicecomponent_version_id_seq', 0), + ('configuration_id_seq', 0), ('hostcomponentdesiredstate_id_seq', 0); insert into adminresourcetype (resource_type_id, resource_type_name) @@ -1199,6 +1217,7 @@ BEGIN TRANSACTION SELECT 'AMBARI.ADD_DELETE_CLUSTERS', 'Create new clusters' UNION ALL SELECT 'AMBARI.RENAME_CLUSTER', 'Rename clusters' UNION ALL SELECT 'AMBARI.MANAGE_SETTINGS', 'Manage settings' UNION ALL + SELECT 'AMBARI.MANAGE_CONFIGURATION', 'Manage ambari configuration' UNION ALL SELECT 'AMBARI.MANAGE_USERS', 'Manage users' UNION ALL SELECT 'AMBARI.MANAGE_GROUPS', 'Manage groups' UNION ALL SELECT 'AMBARI.MANAGE_VIEWS', 'Manage Ambari Views' UNION ALL @@ -1404,6 +1423,7 @@ BEGIN TRANSACTION SELECT permission_id, 'AMBARI.ADD_DELETE_CLUSTERS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.RENAME_CLUSTER' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_SETTINGS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL + SELECT permission_id, 'AMBARI.MANAGE_CONFIGURATION' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_USERS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_GROUPS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL SELECT permission_id, 'AMBARI.MANAGE_VIEWS' FROM adminpermission WHERE permission_name='AMBARI.ADMINISTRATOR' UNION ALL
