From df18c2ce24b212eaae395c683641efb8357d530b Mon Sep 17 00:00:00 2001 From: Balazs Bence Sari <> Date: Thu, 25 Jan 2018 11:26:12 +0100 Subject: [PATCH 1/2] AMBARI-22776 Fix DDL issues resulting from incomplete table rename (benyoka) --- .../resources/Ambari-DDL-Derby-CREATE.sql | 10 +++++----- .../resources/Ambari-DDL-MySQL-CREATE.sql | 10 +++++----- .../resources/Ambari-DDL-Oracle-CREATE.sql | 10 +++++----- .../resources/Ambari-DDL-Postgres-CREATE.sql | 10 +++++----- .../Ambari-DDL-SQLAnywhere-CREATE.sql | 10 +++++----- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 10 +++++----- .../orm/entities/BlueprintEntityTest2.java | 20 +++++++++---------- 7 files changed, 40 insertions(+), 40 deletions(-) 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 997e6bef1ec..3599f4916ef 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql @@ -613,11 +613,11 @@ CREATE TABLE blueprint_mpack_instance( CREATE TABLE blueprint_service ( id BIGINT NOT NULL, - mpack_ref_id BIGINT NOT NULL, + mpack_instance_id BIGINT NOT NULL, name VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, CONSTRAINT PK_blueprint_service PRIMARY KEY (id), - CONSTRAINT FK_blueprint_service_mpack_ref FOREIGN KEY (mpack_ref_id) REFERENCES blueprint_mpack_reference(id)); + CONSTRAINT FK_blueprint_svc_mpack_inst FOREIGN KEY (mpack_instance_id) REFERENCES blueprint_mpack_instance(id)); CREATE TABLE blueprint_service_config ( service_id BIGINT NOT NULL, @@ -628,12 +628,12 @@ CREATE TABLE blueprint_service_config ( CONSTRAINT FK_bp_svc_config_to_service FOREIGN KEY (service_id) REFERENCES blueprint_service (id)); CREATE TABLE blueprint_mpack_configuration ( - mpack_ref_id BIGINT NOT NULL, + mpack_instance_id BIGINT NOT NULL, type_name VARCHAR(255) NOT NULL, config_data VARCHAR(3000) NOT NULL, config_attributes VARCHAR(3000), - CONSTRAINT PK_bp_mpack_conf PRIMARY KEY (mpack_ref_id, type_name), - CONSTRAINT FK_bp_mpack_config_to_mpack FOREIGN KEY (mpack_ref_id) REFERENCES blueprint_mpack_reference (id)); + CONSTRAINT PK_bp_mpack_conf PRIMARY KEY (mpack_instance_id, type_name), + CONSTRAINT FK_bp_mpack_config_to_mpack FOREIGN KEY (mpack_instance_id) REFERENCES blueprint_mpack_instance(id)); CREATE TABLE hostgroup ( blueprint_name VARCHAR(255) NOT NULL, 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 bc385de5722..57a41f0b151 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql @@ -632,11 +632,11 @@ CREATE TABLE blueprint_mpack_instance( CREATE TABLE blueprint_service ( id BIGINT NOT NULL, - mpack_ref_id BIGINT NOT NULL, + mpack_instance_id BIGINT NOT NULL, name VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, CONSTRAINT PK_blueprint_service PRIMARY KEY (id), - CONSTRAINT FK_blueprint_service_mpack_ref FOREIGN KEY (mpack_ref_id) REFERENCES blueprint_mpack_reference(id)); + CONSTRAINT FK_blueprint_svc_mpack_inst FOREIGN KEY (mpack_instance_id) REFERENCES blueprint_mpack_instance(id)); CREATE TABLE blueprint_service_config ( service_id BIGINT NOT NULL, @@ -647,12 +647,12 @@ CREATE TABLE blueprint_service_config ( CONSTRAINT FK_bp_svc_config_to_service FOREIGN KEY (service_id) REFERENCES blueprint_service (id)); CREATE TABLE blueprint_mpack_configuration ( - mpack_ref_id BIGINT NOT NULL, + mpack_instance_id BIGINT NOT NULL, type_name VARCHAR(255) NOT NULL, config_data LONGTEXT NOT NULL, config_attributes LONGTEXT, - CONSTRAINT PK_bp_mpack_conf PRIMARY KEY (mpack_ref_id, type_name), - CONSTRAINT FK_bp_mpack_config_to_mpack FOREIGN KEY (mpack_ref_id) REFERENCES blueprint_mpack_reference (id)); + CONSTRAINT PK_bp_mpack_conf PRIMARY KEY (mpack_instance_id, type_name), + CONSTRAINT FK_bp_mpack_config_to_mpack FOREIGN KEY (mpack_instance_id) REFERENCES blueprint_mpack_instance(id)); CREATE TABLE hostgroup ( blueprint_name VARCHAR(100) NOT NULL, 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 04969d8754f..d7146cc134d 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql @@ -611,11 +611,11 @@ CREATE TABLE blueprint_mpack_instance( CREATE TABLE blueprint_service ( id NUMBER(19) NOT NULL, - mpack_ref_id NUMBER(19) NOT NULL, + mpack_instance_id NUMBER(19) NOT NULL, name VARCHAR2(255) NOT NULL, type VARCHAR2(255) NOT NULL, CONSTRAINT PK_blueprint_service PRIMARY KEY (id), - CONSTRAINT FK_blueprint_service_mpack_ref FOREIGN KEY (mpack_ref_id) REFERENCES blueprint_mpack_reference(id)); + CONSTRAINT FK_blueprint_svc_mpack_inst FOREIGN KEY (mpack_instance_id) REFERENCES blueprint_mpack_instance(id)); CREATE TABLE blueprint_service_config ( service_id NUMBER(19) NOT NULL, @@ -626,12 +626,12 @@ CREATE TABLE blueprint_service_config ( CONSTRAINT FK_bp_svc_config_to_service FOREIGN KEY (service_id) REFERENCES blueprint_service (id)); CREATE TABLE blueprint_mpack_configuration ( - mpack_ref_id NUMBER(19) NOT NULL, + mpack_instance_id NUMBER(19) NOT NULL, type_name VARCHAR2(255) NOT NULL, config_data CLOB NOT NULL, config_attributes CLOB, - CONSTRAINT PK_bp_mpack_conf PRIMARY KEY (mpack_ref_id, type_name), - CONSTRAINT FK_bp_mpack_config_to_mpack FOREIGN KEY (mpack_ref_id) REFERENCES blueprint_mpack_reference (id)); + CONSTRAINT PK_bp_mpack_conf PRIMARY KEY (mpack_instance_id, type_name), + CONSTRAINT FK_bp_mpack_config_to_mpack FOREIGN KEY (mpack_instance_id) REFERENCES blueprint_mpack_instance(id)); CREATE TABLE hostgroup ( blueprint_name VARCHAR2(255) NOT NULL, 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 2ef9ed6bf5a..2e9dea5868e 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql @@ -601,11 +601,11 @@ CREATE TABLE blueprint_mpack_instance( CREATE TABLE blueprint_service ( id BIGINT NOT NULL, - mpack_ref_id BIGINT NOT NULL, + mpack_instance_id BIGINT NOT NULL, name VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, CONSTRAINT PK_blueprint_service PRIMARY KEY (id), - CONSTRAINT FK_blueprint_service_mpack_ref FOREIGN KEY (mpack_ref_id) REFERENCES blueprint_mpack_reference(id)); + CONSTRAINT FK_blueprint_svc_mpack_inst FOREIGN KEY (mpack_instance_id) REFERENCES blueprint_mpack_instance(id)); CREATE TABLE blueprint_service_config ( service_id BIGINT NOT NULL, @@ -616,12 +616,12 @@ CREATE TABLE blueprint_service_config ( CONSTRAINT FK_bp_svc_config_to_service FOREIGN KEY (service_id) REFERENCES blueprint_service (id)); CREATE TABLE blueprint_mpack_configuration ( - mpack_ref_id BIGINT NOT NULL, + mpack_instance_id BIGINT NOT NULL, type_name VARCHAR(255) NOT NULL, config_data TEXT NOT NULL, config_attributes TEXT, - CONSTRAINT PK_bp_mpack_conf PRIMARY KEY (mpack_ref_id, type_name), - CONSTRAINT FK_bp_mpack_config_to_mpack FOREIGN KEY (mpack_ref_id) REFERENCES blueprint_mpack_reference (id)); + CONSTRAINT PK_bp_mpack_conf PRIMARY KEY (mpack_instance_id, type_name), + CONSTRAINT FK_bp_mpack_config_to_mpack FOREIGN KEY (mpack_instance_id) REFERENCES blueprint_mpack_instance(id)); CREATE TABLE hostgroup ( blueprint_name VARCHAR(255) NOT NULL, 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 36ef59fd1d2..bf704386bfd 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql @@ -608,11 +608,11 @@ CREATE TABLE blueprint_mpack_instance( CREATE TABLE blueprint_service ( id NUMERIC(19) NOT NULL, - mpack_ref_id BIGINT NOT NULL, + mpack_instance_id BIGINT NOT NULL, name VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, CONSTRAINT PK_blueprint_service PRIMARY KEY (id), - CONSTRAINT FK_blueprint_service_mpack_ref FOREIGN KEY (mpack_ref_id) REFERENCES blueprint_mpack_reference(id)); + CONSTRAINT FK_blueprint_svc_mpack_inst FOREIGN KEY (mpack_instance_id) REFERENCES blueprint_mpack_instance(id)); CREATE TABLE blueprint_service_config ( service_id NUMERIC(19) NOT NULL, @@ -623,12 +623,12 @@ CREATE TABLE blueprint_service_config ( CONSTRAINT FK_bp_svc_config_to_service FOREIGN KEY (service_id) REFERENCES blueprint_service (id)); CREATE TABLE blueprint_mpack_configuration ( - mpack_ref_id NUMERIC(19) NOT NULL, + mpack_instance_id NUMERIC(19) NOT NULL, type_name VARCHAR(255) NOT NULL, config_data TEXT NOT NULL, config_attributes TEXT, - CONSTRAINT PK_bp_mpack_conf PRIMARY KEY (mpack_ref_id, type_name), - CONSTRAINT FK_bp_mpack_config_to_mpack FOREIGN KEY (mpack_ref_id) REFERENCES blueprint_mpack_reference (id)); + CONSTRAINT PK_bp_mpack_conf PRIMARY KEY (mpack_instance_id, type_name), + CONSTRAINT FK_bp_mpack_config_to_mpack FOREIGN KEY (mpack_instance_id) REFERENCES blueprint_mpack_instance(id)); CREATE TABLE hostgroup ( blueprint_name VARCHAR(255) NOT NULL, 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 43ef059ac45..9553a90d3e0 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql @@ -617,11 +617,11 @@ CREATE TABLE blueprint_mpack_instance( CREATE TABLE blueprint_service ( id BIGINT NOT NULL, - mpack_ref_id BIGINT NOT NULL, + mpack_instance_id BIGINT NOT NULL, name VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, CONSTRAINT PK_blueprint_service PRIMARY KEY (id), - CONSTRAINT FK_blueprint_service_mpack_ref FOREIGN KEY (mpack_ref_id) REFERENCES blueprint_mpack_reference(id)); + CONSTRAINT FK_blueprint_svc_mpack_inst FOREIGN KEY (mpack_instance_id) REFERENCES blueprint_mpack_instance(id)); CREATE TABLE blueprint_service_config ( service_id BIGINT NOT NULL, @@ -632,12 +632,12 @@ CREATE TABLE blueprint_service_config ( CONSTRAINT FK_bp_svc_config_to_service FOREIGN KEY (service_id) REFERENCES blueprint_service (id)); CREATE TABLE blueprint_mpack_configuration ( - mpack_ref_id BIGINT NOT NULL, + mpack_instance_id BIGINT NOT NULL, type_name VARCHAR(255) NOT NULL, config_data TEXT NOT NULL, config_attributes TEXT, - CONSTRAINT PK_bp_mpack_conf PRIMARY KEY (mpack_ref_id, type_name), - CONSTRAINT FK_bp_mpack_config_to_mpack FOREIGN KEY (mpack_ref_id) REFERENCES blueprint_mpack_reference (id)); + CONSTRAINT PK_bp_mpack_conf PRIMARY KEY (mpack_instance_id, type_name), + CONSTRAINT FK_bp_mpack_config_to_mpack FOREIGN KEY (mpack_instance_id) REFERENCES blueprint_mpack_instance(id)); CREATE TABLE hostgroup ( blueprint_name VARCHAR(255) NOT NULL, diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/BlueprintEntityTest2.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/BlueprintEntityTest2.java index 6d0a5e2a504..b9b11700f72 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/BlueprintEntityTest2.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/BlueprintEntityTest2.java @@ -124,18 +124,18 @@ private BlueprintEntity createTestBlueprint() { blueprintEntity.setBlueprintName(BLUEPRINT_NAME); blueprintEntity.setSecurityType(SecurityType.NONE); - BlueprintMpackInstanceEntity mpackReferenceEntity = new BlueprintMpackInstanceEntity(); - mpackReferenceEntity.setBlueprint(blueprintEntity); - mpackReferenceEntity.setMpackName("HDPCORE"); - mpackReferenceEntity.setMpackVersion("3.0.0.0"); - mpackReferenceEntity.setMpackUri("http://hdpcore.org/3.0.0.0"); + BlueprintMpackInstanceEntity mpackInstanceEntity = new BlueprintMpackInstanceEntity(); + mpackInstanceEntity.setBlueprint(blueprintEntity); + mpackInstanceEntity.setMpackName("HDPCORE"); + mpackInstanceEntity.setMpackVersion("3.0.0.0"); + mpackInstanceEntity.setMpackUri("http://hdpcore.org/3.0.0.0"); BlueprintMpackConfigEntity mpackConfigEntity = new BlueprintMpackConfigEntity(); - mpackConfigEntity.setMpackReference(mpackReferenceEntity); + mpackConfigEntity.setMpackReference(mpackInstanceEntity); mpackConfigEntity.setConfigAttributes("attributes"); mpackConfigEntity.setConfigData("configdata"); mpackConfigEntity.setType("zk-env.sh"); - mpackReferenceEntity.getConfigurations().add(mpackConfigEntity); + mpackInstanceEntity.getConfigurations().add(mpackConfigEntity); HostGroupEntity hostGroupEntity = new HostGroupEntity(); hostGroupEntity.setBlueprintEntity(blueprintEntity); @@ -163,10 +163,10 @@ private BlueprintEntity createTestBlueprint() { hostGroupEntity.addComponent(hgComponentEntity2); BlueprintServiceEntity blueprintService = new BlueprintServiceEntity(); - blueprintService.setMpackReference(mpackReferenceEntity); + blueprintService.setMpackReference(mpackInstanceEntity); blueprintService.setName("ZK1"); blueprintService.setType("ZOOKEEPER"); - mpackReferenceEntity.getServiceInstances().add(blueprintService); + mpackInstanceEntity.getServiceInstances().add(blueprintService); BlueprintServiceConfigEntity blueprintServiceConfigEntity = new BlueprintServiceConfigEntity(); blueprintServiceConfigEntity.setService(blueprintService); @@ -175,7 +175,7 @@ private BlueprintEntity createTestBlueprint() { blueprintServiceConfigEntity.setConfigData("data"); blueprintService.getConfigurations().add(blueprintServiceConfigEntity); - blueprintEntity.getMpackReferences().add(mpackReferenceEntity); + blueprintEntity.getMpackReferences().add(mpackInstanceEntity); blueprintEntity.getHostGroups().add(hostGroupEntity); return blueprintEntity; From cc17c8bc69d60ec01e1ab0ac746bff6ff9b92e40 Mon Sep 17 00:00:00 2001 From: Balazs Bence Sari <> Date: Thu, 25 Jan 2018 13:55:13 +0100 Subject: [PATCH 2/2] AMBARI-22776 More DDL fixes and renamings in the code (benyoka) --- .../internal/BlueprintResourceProvider.java | 2 +- .../server/orm/entities/BlueprintEntity.java | 10 +++--- .../entities/BlueprintMpackConfigEntity.java | 34 +++++++++---------- .../BlueprintMpackConfigEntityPk.java | 8 ++--- .../BlueprintMpackInstanceEntity.java | 6 ++-- .../BlueprintServiceConfigEntity.java | 2 +- .../orm/entities/BlueprintServiceEntity.java | 16 ++++----- .../resources/Ambari-DDL-Derby-CREATE.sql | 25 ++++---------- .../resources/Ambari-DDL-MySQL-CREATE.sql | 25 ++++---------- .../resources/Ambari-DDL-Oracle-CREATE.sql | 25 ++++---------- .../resources/Ambari-DDL-Postgres-CREATE.sql | 14 ++++---- .../Ambari-DDL-SQLAnywhere-CREATE.sql | 25 ++++---------- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 31 ++++++----------- .../BlueprintResourceProviderTest.java | 12 +++---- .../orm/entities/BlueprintEntityTest2.java | 24 ++++++------- 15 files changed, 102 insertions(+), 157 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java index b9899bd0596..7eef2dfed42 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java @@ -377,7 +377,7 @@ List>> populateConfigurationList( // TODO: use multiple mpacks BlueprintMpackInstanceEntity mpack = - ((BlueprintConfigEntity)config).getBlueprintEntity().getMpackReferences().iterator().next(); + ((BlueprintConfigEntity)config).getBlueprintEntity().getMpackInstances().iterator().next(); StackInfo metaInfoStack; try { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintEntity.java index 31cbf866f58..ea92a7be0e5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintEntity.java @@ -68,7 +68,7 @@ public class BlueprintEntity { private Collection settings = new ArrayList<>(); @OneToMany(cascade = CascadeType.ALL, mappedBy = "blueprint") - private Collection mpackReferences = new ArrayList<>(); + private Collection mpackInstances = new ArrayList<>(); /** @@ -159,11 +159,11 @@ public void setSecurityDescriptorReference(String securityDescriptorReference) { this.securityDescriptorReference = securityDescriptorReference; } - public Collection getMpackReferences() { - return mpackReferences; + public Collection getMpackInstances() { + return mpackInstances; } - public void setMpackReferences(Collection mpackReferences) { - this.mpackReferences = mpackReferences; + public void setMpackInstances(Collection mpackInstances) { + this.mpackInstances = mpackInstances; } } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntity.java index 50cb0d21c7e..abc76a78144 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntity.java @@ -38,8 +38,8 @@ public class BlueprintMpackConfigEntity implements BlueprintConfiguration { @Id - @Column(name = "mpack_ref_id", nullable = false, insertable = false, updatable = false) - private Long mpackRefId; + @Column(name = "mpack_instance_id", nullable = false, insertable = false, updatable = false) + private Long mpackInstanceId; @Id @Column(name = "type_name", nullable = false, insertable = true, updatable = false, length = 100) @@ -56,21 +56,21 @@ public class BlueprintMpackConfigEntity implements BlueprintConfiguration { private String configAttributes; @ManyToOne - @JoinColumn(name = "mpack_ref_id", referencedColumnName = "id", nullable = false) - private BlueprintMpackInstanceEntity mpackReference; + @JoinColumn(name = "mpack_instance_id", referencedColumnName = "id", nullable = false) + private BlueprintMpackInstanceEntity mpackInstance; /** - * @return the id of the mpack referency entity this configuration belongs to + * @return the id of the mpack instance entity this configuration belongs to */ - public Long getMpackRefId() { - return mpackRefId; + public Long getMpackInstanceId() { + return mpackInstanceId; } /** - * @param mpackRefId the id of the mpack referency entity this configuration belongs to + * @param mpackInstanceId the id of the instance referency entity this configuration belongs to */ - public void setMpackRefId(Long mpackRefId) { - this.mpackRefId = mpackRefId; + public void setMpackInstanceId(Long mpackInstanceId) { + this.mpackInstanceId = mpackInstanceId; } /** @@ -109,7 +109,7 @@ public void setBlueprintName(String blueprintName) { */ @Override public String getBlueprintName() { - return getMpackReference().getBlueprint().getBlueprintName(); + return getMpackInstance().getBlueprint().getBlueprintName(); } /** @@ -134,16 +134,16 @@ public void setConfigAttributes(String configAttributes) { } /** - * @return the mpack referency entity this configuration belongs to + * @return the mpack instance entity this configuration belongs to */ - public BlueprintMpackInstanceEntity getMpackReference() { - return mpackReference; + public BlueprintMpackInstanceEntity getMpackInstance() { + return mpackInstance; } /** - * @param mpackReference the mpack referency entity this configuration belongs to + * @param mpackInstance the mpack instance entity this configuration belongs to */ - public void setMpackReference(BlueprintMpackInstanceEntity mpackReference) { - this.mpackReference = mpackReference; + public void setMpackInstance(BlueprintMpackInstanceEntity mpackInstance) { + this.mpackInstance = mpackInstance; } } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntityPk.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntityPk.java index 6f4f01701e5..5a95df2af43 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntityPk.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntityPk.java @@ -28,8 +28,8 @@ */ public class BlueprintMpackConfigEntityPk { @Id - @Column(name = "mpack_ref_id", nullable = false, insertable = true, updatable = false) - private Long mpackRefId; + @Column(name = "mpack_instance_id", nullable = false, insertable = true, updatable = false) + private Long mpackInstanceId; @Id @Column(name = "type_name", nullable = false, insertable = true, updatable = false, length = 100) @@ -40,12 +40,12 @@ public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; BlueprintMpackConfigEntityPk that = (BlueprintMpackConfigEntityPk) o; - return Objects.equals(mpackRefId, that.mpackRefId) && + return Objects.equals(mpackInstanceId, that.mpackInstanceId) && Objects.equals(type, that.type); } @Override public int hashCode() { - return Objects.hash(mpackRefId, type); + return Objects.hash(mpackInstanceId, type); } } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackInstanceEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackInstanceEntity.java index c87d9947a3a..fb9ed7cfe9a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackInstanceEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackInstanceEntity.java @@ -48,7 +48,7 @@ valueColumnName = "sequence_value", pkColumnValue = "blueprint_mpack_instance_id_seq", initialValue = 1) public class BlueprintMpackInstanceEntity { @Id - @GeneratedValue(strategy = GenerationType.TABLE, generator = "blueprint_mpack_reference_id_generator") + @GeneratedValue(strategy = GenerationType.TABLE, generator = "blueprint_mpack_instance_id_generator") @Column(name = "id", nullable = false, updatable = false) private Long id; @@ -61,10 +61,10 @@ public class BlueprintMpackInstanceEntity { @Column(name = "mpack_uri") private String mpackUri; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "mpackReference") + @OneToMany(cascade = CascadeType.ALL, mappedBy = "mpackInstance") private Collection serviceInstances = new ArrayList<>(); - @OneToMany(cascade = CascadeType.ALL, mappedBy = "mpackReference") + @OneToMany(cascade = CascadeType.ALL, mappedBy = "mpackInstance") private Collection configurations = new ArrayList<>(); @ManyToOne diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintServiceConfigEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintServiceConfigEntity.java index 3dd88923059..a2bcf4e8c7a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintServiceConfigEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintServiceConfigEntity.java @@ -93,7 +93,7 @@ public void setBlueprintName(String blueprintName) { */ @Override public String getBlueprintName() { - return getService().getMpackReference().getBlueprint().getBlueprintName(); + return getService().getMpackInstance().getBlueprint().getBlueprintName(); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintServiceEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintServiceEntity.java index cbca4736d30..96ebe0db1a8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintServiceEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintServiceEntity.java @@ -47,8 +47,8 @@ public class BlueprintServiceEntity { private Long id; @ManyToOne() - @JoinColumn(name = "mpack_ref_id", referencedColumnName = "id", nullable = false) - private BlueprintMpackInstanceEntity mpackReference; + @JoinColumn(name = "mpack_instance_id", referencedColumnName = "id", nullable = false) + private BlueprintMpackInstanceEntity mpackInstance; @OneToMany(cascade = CascadeType.ALL, mappedBy = "service") private Collection configurations = new ArrayList<>(); @@ -72,17 +72,17 @@ public void setId(Long id) { } /** - * @return the mpack reference to the mpack associated with this service + * @return the mpack instance to the mpack associated with this service */ - public BlueprintMpackInstanceEntity getMpackReference() { - return mpackReference; + public BlueprintMpackInstanceEntity getMpackInstance() { + return mpackInstance; } /** - * @param mpackReference the mpack reference to the mpack associated with this service + * @param mpackInstance the mpack instance to the mpack associated with this service */ - public void setMpackReference(BlueprintMpackInstanceEntity mpackReference) { - this.mpackReference = mpackReference; + public void setMpackInstance(BlueprintMpackInstanceEntity mpackInstance) { + this.mpackInstance = mpackInstance; } /** 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 3599f4916ef..d0692d0bfcd 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql @@ -85,17 +85,6 @@ CREATE TABLE clusters ( CONSTRAINT FK_clusters_desired_stack_id FOREIGN KEY (desired_stack_id) REFERENCES stack(stack_id), CONSTRAINT FK_clusters_resource_id FOREIGN KEY (resource_id) REFERENCES adminresource(resource_id)); -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 ( category_name VARCHAR(100) NOT NULL, property_name VARCHAR(100) NOT NULL, @@ -145,8 +134,8 @@ CREATE TABLE servicegroupdependencies ( dependent_service_group_cluster_id BIGINT NOT NULL, CONSTRAINT PK_servicegroupdependencies PRIMARY KEY (id), CONSTRAINT UQ_servicegroupdependencies UNIQUE (service_group_id, service_group_cluster_id, dependent_service_group_id, dependent_service_group_cluster_id), - CONSTRAINT FK_servicegroupdependencies_service_group_cluster_id FOREIGN KEY (service_group_id, service_group_cluster_id) REFERENCES servicegroups (id, cluster_id), - CONSTRAINT FK_servicegroupdependencies_dependent_service_group_cluster_id FOREIGN KEY (dependent_service_group_id, dependent_service_group_cluster_id) REFERENCES servicegroups (id, cluster_id)); + CONSTRAINT FK_svcgrpdep_svcgrp_cl_id FOREIGN KEY (service_group_id, service_group_cluster_id) REFERENCES servicegroups (id, cluster_id), + CONSTRAINT FK_svcgrpdep_dep_svcgrp_cl_id FOREIGN KEY (dependent_service_group_id, dependent_service_group_cluster_id) REFERENCES servicegroups (id, cluster_id)); CREATE TABLE clusterservices ( id BIGINT NOT NULL, @@ -191,8 +180,8 @@ CREATE TABLE servicedependencies ( dependent_service_cluster_id BIGINT NOT NULL, CONSTRAINT PK_servicedependencies PRIMARY KEY (id), CONSTRAINT UQ_servicedependencies UNIQUE (service_id, service_group_id, service_cluster_id, dependent_service_id, dependent_service_group_id, dependent_service_cluster_id), - CONSTRAINT FK_servicedependencies_service_group_cluster_id FOREIGN KEY (service_id, service_group_id, service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), - CONSTRAINT FK_servicedependencies_dependent_service_group_cluster_id FOREIGN KEY (dependent_service_id, dependent_service_group_id, dependent_service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); + CONSTRAINT FK_svcdep_svc_grp_clstr_id FOREIGN KEY (service_id, service_group_id, service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_svcdep_dep_scv_grp_clstr_id FOREIGN KEY (dependent_service_id, dependent_service_group_id, dependent_service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); CREATE TABLE serviceconfig ( service_config_id BIGINT NOT NULL, @@ -207,7 +196,7 @@ CREATE TABLE serviceconfig ( note VARCHAR(3000), CONSTRAINT PK_serviceconfig PRIMARY KEY (service_config_id), CONSTRAINT FK_serviceconfig_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id), - CONSTRAINT FK_serviceconfig_cluster_service FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_serviceconfig_clstr_svc FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), CONSTRAINT UQ_scv_service_version UNIQUE (cluster_id, service_id, version)); CREATE TABLE serviceconfighosts ( @@ -535,8 +524,8 @@ CREATE TABLE hostconfigmapping ( selected INTEGER NOT NULL DEFAULT 0, user_name VARCHAR(255) NOT NULL DEFAULT '_db', CONSTRAINT PK_hostconfigmapping PRIMARY KEY (cluster_id, host_id, type_name, create_timestamp), - CONSTRAINT FK_hostconfmapping_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id), - CONSTRAINT FK_hostconfmapping_cluster_service FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_hostconfmapping_clstr_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id), + CONSTRAINT FK_hostconfmapping_clstr_svc FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), CONSTRAINT FK_hostconfmapping_host_id FOREIGN KEY (host_id) REFERENCES hosts (host_id)); CREATE TABLE metainfo ( 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 57a41f0b151..3d04e48df7f 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql @@ -104,17 +104,6 @@ CREATE TABLE clusters ( CONSTRAINT FK_clusters_desired_stack_id FOREIGN KEY (desired_stack_id) REFERENCES stack(stack_id), CONSTRAINT FK_clusters_resource_id FOREIGN KEY (resource_id) REFERENCES adminresource(resource_id)); -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 ( category_name VARCHAR(100) NOT NULL, property_name VARCHAR(100) NOT NULL, @@ -164,8 +153,8 @@ CREATE TABLE servicegroupdependencies ( dependent_service_group_cluster_id BIGINT NOT NULL, CONSTRAINT PK_servicegroupdependencies PRIMARY KEY (id), CONSTRAINT UQ_servicegroupdependencies UNIQUE (service_group_id, service_group_cluster_id, dependent_service_group_id, dependent_service_group_cluster_id), - CONSTRAINT FK_servicegroupdependencies_service_group_cluster_id FOREIGN KEY (service_group_id, service_group_cluster_id) REFERENCES servicegroups (id, cluster_id), - CONSTRAINT FK_servicegroupdependencies_dependent_service_group_cluster_id FOREIGN KEY (dependent_service_group_id, dependent_service_group_cluster_id) REFERENCES servicegroups (id, cluster_id)); + CONSTRAINT FK_svcgrpdep_svcgrp_cl_id FOREIGN KEY (service_group_id, service_group_cluster_id) REFERENCES servicegroups (id, cluster_id), + CONSTRAINT FK_svcgrpdep_dep_svcgrp_cl_id FOREIGN KEY (dependent_service_group_id, dependent_service_group_cluster_id) REFERENCES servicegroups (id, cluster_id)); CREATE TABLE clusterservices ( id BIGINT NOT NULL, @@ -210,8 +199,8 @@ CREATE TABLE servicedependencies ( dependent_service_cluster_id BIGINT NOT NULL, CONSTRAINT PK_servicedependencies PRIMARY KEY (id), CONSTRAINT UQ_servicedependencies UNIQUE (service_id, service_group_id, service_cluster_id, dependent_service_id, dependent_service_group_id, dependent_service_cluster_id), - CONSTRAINT FK_servicedependencies_service_group_cluster_id FOREIGN KEY (service_id, service_group_id, service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), - CONSTRAINT FK_servicedependencies_dependent_service_group_cluster_id FOREIGN KEY (dependent_service_id, dependent_service_group_id, dependent_service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); + CONSTRAINT FK_svcdep_svc_grp_clstr_id FOREIGN KEY (service_id, service_group_id, service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_svcdep_dep_scv_grp_clstr_id FOREIGN KEY (dependent_service_id, dependent_service_group_id, dependent_service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); CREATE TABLE serviceconfig ( service_config_id BIGINT NOT NULL, @@ -226,7 +215,7 @@ CREATE TABLE serviceconfig ( note LONGTEXT, CONSTRAINT PK_serviceconfig PRIMARY KEY (service_config_id), CONSTRAINT FK_serviceconfig_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id), - CONSTRAINT FK_serviceconfig_cluster_service FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_serviceconfig_clstr_svc FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), CONSTRAINT UQ_scv_service_version UNIQUE (cluster_id, service_id, version)); CREATE TABLE serviceconfighosts ( @@ -547,8 +536,8 @@ CREATE TABLE hostconfigmapping ( version_tag VARCHAR(255) NOT NULL, user_name VARCHAR(255) NOT NULL DEFAULT '_db', CONSTRAINT PK_hostconfigmapping PRIMARY KEY (create_timestamp, host_id, cluster_id, type_name), - CONSTRAINT FK_hostconfmapping_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id), - CONSTRAINT FK_hostconfmapping_cluster_service FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_hostconfmapping_clstr_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id), + CONSTRAINT FK_hostconfmapping_clstr_svc FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), CONSTRAINT FK_hostconfmapping_host_id FOREIGN KEY (host_id) REFERENCES hosts (host_id)); CREATE TABLE metainfo ( 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 d7146cc134d..04f24ad55c0 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql @@ -85,17 +85,6 @@ CREATE TABLE clusters ( CONSTRAINT FK_clusters_desired_stack_id FOREIGN KEY (desired_stack_id) REFERENCES stack(stack_id), CONSTRAINT FK_clusters_resource_id FOREIGN KEY (resource_id) REFERENCES adminresource(resource_id)); -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 ( category_name VARCHAR2(100) NOT NULL, property_name VARCHAR2(100) NOT NULL, @@ -145,8 +134,8 @@ CREATE TABLE servicegroupdependencies ( dependent_service_group_cluster_id NUMBER(19) NOT NULL, CONSTRAINT PK_servicegroupdependencies PRIMARY KEY (id), CONSTRAINT UQ_servicegroupdependencies UNIQUE (service_group_id, service_group_cluster_id, dependent_service_group_id, dependent_service_group_cluster_id), - CONSTRAINT FK_servicegroupdependencies_service_group_cluster_id FOREIGN KEY (service_group_id, service_group_cluster_id) REFERENCES servicegroups (id, cluster_id), - CONSTRAINT FK_servicegroupdependencies_dependent_service_group_cluster_id FOREIGN KEY (dependent_service_group_id, dependent_service_group_cluster_id) REFERENCES servicegroups (id, cluster_id)); + CONSTRAINT FK_svcgrpdep_svcgrp_cl_id FOREIGN KEY (service_group_id, service_group_cluster_id) REFERENCES servicegroups (id, cluster_id), + CONSTRAINT FK_svcgrpdep_dep_svcgrp_cl_id FOREIGN KEY (dependent_service_group_id, dependent_service_group_cluster_id) REFERENCES servicegroups (id, cluster_id)); CREATE TABLE clusterservices ( id NUMBER(19) NOT NULL, @@ -190,8 +179,8 @@ CREATE TABLE servicedependencies ( dependent_service_cluster_id NUMBER(19) NOT NULL, CONSTRAINT PK_servicedependencies PRIMARY KEY (id), CONSTRAINT UQ_servicedependencies UNIQUE (service_id, service_group_id, service_cluster_id, dependent_service_id, dependent_service_group_id, dependent_service_cluster_id), - CONSTRAINT FK_servicedependencies_service_group_cluster_id FOREIGN KEY (service_id, service_group_id, service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), - CONSTRAINT FK_servicedependencies_dependent_service_group_cluster_id FOREIGN KEY (dependent_service_id, dependent_service_group_id, dependent_service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); + CONSTRAINT FK_svcdep_svc_grp_clstr_id FOREIGN KEY (service_id, service_group_id, service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_svcdep_dep_scv_grp_clstr_id FOREIGN KEY (dependent_service_id, dependent_service_group_id, dependent_service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); CREATE TABLE serviceconfig ( service_config_id NUMBER(19) NOT NULL, @@ -206,7 +195,7 @@ CREATE TABLE serviceconfig ( note CLOB, CONSTRAINT PK_serviceconfig PRIMARY KEY (service_config_id), CONSTRAINT FK_serviceconfig_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id), - CONSTRAINT FK_serviceconfig_cluster_service FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_serviceconfig_clstr_svc FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), CONSTRAINT UQ_scv_service_version UNIQUE (cluster_id, service_id, version)); CREATE TABLE serviceconfighosts ( @@ -527,8 +516,8 @@ CREATE TABLE hostconfigmapping ( version_tag VARCHAR2(255) NOT NULL, user_name VARCHAR(255) DEFAULT '_db', CONSTRAINT PK_hostconfigmapping PRIMARY KEY (create_timestamp, host_id, cluster_id, type_name), - CONSTRAINT FK_hostconfmapping_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id), - CONSTRAINT FK_hostconfmapping_cluster_service FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_hostconfmapping_clstr_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id), + CONSTRAINT FK_hostconfmapping_clstr_svc FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), CONSTRAINT FK_hostconfmapping_host_id FOREIGN KEY (host_id) REFERENCES hosts (host_id)); CREATE TABLE metainfo ( 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 2e9dea5868e..5ba57fbb5f1 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql @@ -136,8 +136,8 @@ CREATE TABLE servicegroupdependencies ( dependent_service_group_cluster_id BIGINT NOT NULL, CONSTRAINT PK_servicegroupdependencies PRIMARY KEY (id), CONSTRAINT UQ_servicegroupdependencies UNIQUE (service_group_id, service_group_cluster_id, dependent_service_group_id, dependent_service_group_cluster_id), - CONSTRAINT FK_servicegroupdependencies_service_group_cluster_id FOREIGN KEY (service_group_id, service_group_cluster_id) REFERENCES servicegroups (id, cluster_id), - CONSTRAINT FK_servicegroupdependencies_dependent_service_group_cluster_id FOREIGN KEY (dependent_service_group_id, dependent_service_group_cluster_id) REFERENCES servicegroups (id, cluster_id)); + CONSTRAINT FK_svcgrpdep_svcgrp_cl_id FOREIGN KEY (service_group_id, service_group_cluster_id) REFERENCES servicegroups (id, cluster_id), + CONSTRAINT FK_svcgrpdep_dep_svcgrp_cl_id FOREIGN KEY (dependent_service_group_id, dependent_service_group_cluster_id) REFERENCES servicegroups (id, cluster_id)); CREATE TABLE clusterservices ( id BIGINT NOT NULL, @@ -181,8 +181,8 @@ CREATE TABLE servicedependencies ( dependent_service_cluster_id BIGINT NOT NULL, CONSTRAINT PK_servicedependencies PRIMARY KEY (id), CONSTRAINT UQ_servicedependencies UNIQUE (service_id, service_group_id, service_cluster_id, dependent_service_id, dependent_service_group_id, dependent_service_cluster_id), - CONSTRAINT FK_servicedependencies_service_group_cluster_id FOREIGN KEY (service_id, service_group_id, service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), - CONSTRAINT FK_servicedependencies_dependent_service_group_cluster_id FOREIGN KEY (dependent_service_id, dependent_service_group_id, dependent_service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); + CONSTRAINT FK_svcdep_svc_grp_clstr_id FOREIGN KEY (service_id, service_group_id, service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_svcdep_dep_scv_grp_clstr_id FOREIGN KEY (dependent_service_id, dependent_service_group_id, dependent_service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); CREATE TABLE serviceconfig ( service_config_id BIGINT NOT NULL, @@ -197,7 +197,7 @@ CREATE TABLE serviceconfig ( note TEXT, CONSTRAINT PK_serviceconfig PRIMARY KEY (service_config_id), CONSTRAINT FK_serviceconfig_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id), - CONSTRAINT FK_serviceconfig_cluster_service FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_serviceconfig_clstr_svc FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), CONSTRAINT UQ_scv_service_version UNIQUE (cluster_id, service_id, version )); CREATE TABLE serviceconfighosts ( @@ -524,8 +524,8 @@ CREATE TABLE hostconfigmapping ( selected INTEGER NOT NULL DEFAULT 0, user_name VARCHAR(255) NOT NULL DEFAULT '_db', CONSTRAINT PK_hostconfigmapping PRIMARY KEY (cluster_id, host_id, type_name, create_timestamp), - CONSTRAINT FK_hostconfmapping_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id), - CONSTRAINT FK_hostconfmapping_cluster_service FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_hostconfmapping_clstr_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id), + CONSTRAINT FK_hostconfmapping_clstr_svc FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), CONSTRAINT FK_hostconfmapping_host_id FOREIGN KEY (host_id) REFERENCES hosts (host_id)); CREATE TABLE metainfo ( 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 bf704386bfd..790926f02ab 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql @@ -84,17 +84,6 @@ CREATE TABLE clusters ( CONSTRAINT FK_clusters_desired_stack_id FOREIGN KEY (desired_stack_id) REFERENCES stack(stack_id), CONSTRAINT FK_clusters_resource_id FOREIGN KEY (resource_id) REFERENCES adminresource(resource_id)); -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 ( category_name VARCHAR(100) NOT NULL, property_name VARCHAR(100) NOT NULL, @@ -144,8 +133,8 @@ CREATE TABLE servicegroupdependencies ( dependent_service_group_cluster_id NUMBER(19) NOT NULL, CONSTRAINT PK_servicegroupdependencies PRIMARY KEY (id), CONSTRAINT UQ_servicegroupdependencies UNIQUE (service_group_id, service_group_cluster_id, dependent_service_group_id, dependent_service_group_cluster_id), - CONSTRAINT FK_servicegroupdependencies_service_group_cluster_id FOREIGN KEY (service_group_id, service_group_cluster_id) REFERENCES servicegroups (id, cluster_id), - CONSTRAINT FK_servicegroupdependencies_dependent_service_group_cluster_id FOREIGN KEY (dependent_service_group_id, dependent_service_group_cluster_id) REFERENCES servicegroups (id, cluster_id)); + CONSTRAINT FK_svcgrpdep_svcgrp_cl_id FOREIGN KEY (service_group_id, service_group_cluster_id) REFERENCES servicegroups (id, cluster_id), + CONSTRAINT FK_svcgrpdep_dep_svcgrp_cl_id FOREIGN KEY (dependent_service_group_id, dependent_service_group_cluster_id) REFERENCES servicegroups (id, cluster_id)); CREATE TABLE clusterservices ( id NUMERIC(19) NOT NULL, @@ -189,8 +178,8 @@ CREATE TABLE servicedependencies ( dependent_service_cluster_id NUMBER(19) NOT NULL, CONSTRAINT PK_servicedependencies PRIMARY KEY (id), CONSTRAINT UQ_servicedependencies UNIQUE (service_id, service_group_id, service_cluster_id, dependent_service_id, dependent_service_group_id, dependent_service_cluster_id), - CONSTRAINT FK_servicedependencies_service_group_cluster_id FOREIGN KEY (service_id, service_group_id, service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), - CONSTRAINT FK_servicedependencies_dependent_service_group_cluster_id FOREIGN KEY (dependent_service_id, dependent_service_group_id, dependent_service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); + CONSTRAINT FK_svcdep_svc_grp_clstr_id FOREIGN KEY (service_id, service_group_id, service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_svcdep_dep_scv_grp_clstr_id FOREIGN KEY (dependent_service_id, dependent_service_group_id, dependent_service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); CREATE TABLE serviceconfig ( service_config_id NUMERIC(19) NOT NULL, @@ -205,7 +194,7 @@ CREATE TABLE serviceconfig ( note TEXT, CONSTRAINT PK_serviceconfig PRIMARY KEY (service_config_id), CONSTRAINT FK_serviceconfig_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id), - CONSTRAINT FK_serviceconfig_cluster_service FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_serviceconfig_clstr_svc FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), CONSTRAINT UQ_scv_service_version UNIQUE (cluster_id, service_id, version)); CREATE TABLE serviceconfighosts ( @@ -524,8 +513,8 @@ CREATE TABLE hostconfigmapping ( version_tag VARCHAR(255) NOT NULL, user_name VARCHAR(255) NOT NULL DEFAULT '_db', CONSTRAINT PK_hostconfigmapping PRIMARY KEY (create_timestamp, host_id, cluster_id, type_name), - CONSTRAINT FK_hostconfmapping_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id), - CONSTRAINT FK_hostconfmapping_cluster_service FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_hostconfmapping_clstr_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id), + CONSTRAINT FK_hostconfmapping_clstr_svc FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), CONSTRAINT FK_hostconfmapping_host_id FOREIGN KEY (host_id) REFERENCES hosts (host_id)); CREATE TABLE metainfo ( 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 9553a90d3e0..eead2a04bfe 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql @@ -98,17 +98,6 @@ CREATE TABLE clusters ( CONSTRAINT FK_clusters_desired_stack_id FOREIGN KEY (desired_stack_id) REFERENCES stack(stack_id), CONSTRAINT FK_clusters_resource_id FOREIGN KEY (resource_id) REFERENCES adminresource(resource_id)); -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 ( category_name VARCHAR(100) NOT NULL, property_name VARCHAR(100) NOT NULL, @@ -159,8 +148,8 @@ CREATE TABLE servicegroupdependencies ( dependent_service_group_cluster_id BIGINT NOT NULL, CONSTRAINT PK_servicegroupdependencies PRIMARY KEY (id), CONSTRAINT UQ_servicegroupdependencies UNIQUE (service_group_id, service_group_cluster_id, dependent_service_group_id, dependent_service_group_cluster_id), - CONSTRAINT FK_servicegroupdependencies_service_group_cluster_id FOREIGN KEY (service_group_id, service_group_cluster_id) REFERENCES servicegroups (id, cluster_id), - CONSTRAINT FK_servicegroupdependencies_dependent_service_group_cluster_id FOREIGN KEY (dependent_service_group_id, dependent_service_group_cluster_id) REFERENCES servicegroups (id, cluster_id)); + CONSTRAINT FK_svcgrpdep_svcgrp_cl_id FOREIGN KEY (service_group_id, service_group_cluster_id) REFERENCES servicegroups (id, cluster_id), + CONSTRAINT FK_svcgrpdep_dep_svcgrp_cl_id FOREIGN KEY (dependent_service_group_id, dependent_service_group_cluster_id) REFERENCES servicegroups (id, cluster_id)); CREATE TABLE clusterservices ( id BIGINT NOT NULL, @@ -204,8 +193,8 @@ CREATE TABLE servicedependencies ( dependent_service_cluster_id BIGINT NOT NULL, CONSTRAINT PK_servicedependencies PRIMARY KEY (id), CONSTRAINT UQ_servicedependencies UNIQUE (service_id, service_group_id, service_cluster_id, dependent_service_id, dependent_service_group_id, dependent_service_cluster_id), - CONSTRAINT FK_servicedependencies_service_group_cluster_id FOREIGN KEY (service_id, service_group_id, service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), - CONSTRAINT FK_servicedependencies_dependent_service_group_cluster_id FOREIGN KEY (dependent_service_id, dependent_service_group_id, dependent_service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); + CONSTRAINT FK_svcdep_svc_grp_clstr_id FOREIGN KEY (service_id, service_group_id, service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_svcdep_dep_scv_grp_clstr_id FOREIGN KEY (dependent_service_id, dependent_service_group_id, dependent_service_cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id)); CREATE TABLE serviceconfig ( service_config_id BIGINT NOT NULL, @@ -220,8 +209,8 @@ CREATE TABLE serviceconfig ( note VARCHAR(MAX), CONSTRAINT PK_serviceconfig PRIMARY KEY CLUSTERED (service_config_id), CONSTRAINT FK_serviceconfig_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id), - CONSTRAINT FK_serviceconfig_cluster_service FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), - CONSTRAINT UQ_scv_service_version UNIQUE (cluster_id, service_name, version)); + CONSTRAINT FK_serviceconfig_clstr_svc FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT UQ_scv_service_version UNIQUE (cluster_id, service_id, version)); CREATE TABLE serviceconfighosts ( service_config_id BIGINT NOT NULL, @@ -291,9 +280,9 @@ CREATE TABLE hostcomponentdesiredstate ( maintenance_state VARCHAR(32) NOT NULL, restart_required BIT NOT NULL DEFAULT 0, CONSTRAINT PK_hostcomponentdesiredstate PRIMARY KEY CLUSTERED (id), - CONSTRAINT UQ_hcdesiredstate_name UNIQUE (component_name, service_id, host_id, cluster_id), + CONSTRAINT UQ_hcdesiredstate_name UNIQUE (component_name, service_id, host_id, service_group_id, cluster_id), CONSTRAINT FK_hcdesiredstate_host_id FOREIGN KEY (host_id) REFERENCES hosts (host_id), - CONSTRAINT hstcmpnntdesiredstatecmpnntnme FOREIGN KEY (component_name, service_id, cluster_id) REFERENCES servicecomponentdesiredstate (component_name, service_id, cluster_id)); + CONSTRAINT hstcmpnntdesiredstatecmpnntnme FOREIGN KEY (component_name, service_id, service_group_id, cluster_id) REFERENCES servicecomponentdesiredstate (component_name, service_id, service_group_id, cluster_id)); CREATE TABLE hostcomponentstate ( id BIGINT NOT NULL, @@ -539,8 +528,8 @@ CREATE TABLE hostconfigmapping ( selected INTEGER NOT NULL DEFAULT 0, user_name VARCHAR(255) NOT NULL DEFAULT '_db', CONSTRAINT PK_hostconfigmapping PRIMARY KEY CLUSTERED (cluster_id, host_id, type_name, create_timestamp), - CONSTRAINT FK_hostconfmapping_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id), - CONSTRAINT FK_hostconfmapping_cluster_service FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), + CONSTRAINT FK_hostconfmapping_clstr_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id), + CONSTRAINT FK_hostconfmapping_clstr_svc FOREIGN KEY (service_id, service_group_id, cluster_id) REFERENCES clusterservices (id, service_group_id, cluster_id), CONSTRAINT FK_hostconfmapping_host_id FOREIGN KEY (host_id) REFERENCES hosts (host_id)); CREATE TABLE metainfo ( diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java index 6f81ce58f77..fc61a204a41 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java @@ -811,7 +811,7 @@ private BlueprintEntity createEntity(Map properties) { mpackEntity.setMpackVersion(stackVersion); mpackEntity.setBlueprint(entity); - entity.getMpackReferences().add(mpackEntity); + entity.getMpackInstances().add(mpackEntity); Set> hostGroupProperties = (Set>) properties.get( BlueprintResourceProvider.HOST_GROUP_PROPERTY_ID); @@ -1024,12 +1024,12 @@ public void testPopulateConfigurationList() throws Exception { expect(info.getConfigPropertiesTypes("type3")).andReturn(pwdProperties).anyTimes(); expect(metaInfo.getStack("test-stack-name", "test-stack-version")).andReturn(info).anyTimes(); - BlueprintMpackInstanceEntity mpackReference = createMock(BlueprintMpackInstanceEntity.class); - expect(mpackReference.getMpackName()).andReturn("test-stack-name").anyTimes(); - expect(mpackReference.getMpackVersion()).andReturn("test-stack-version").anyTimes(); - expect(entity.getMpackReferences()).andReturn(Collections.singleton(mpackReference)).anyTimes(); + BlueprintMpackInstanceEntity mpackInstance = createMock(BlueprintMpackInstanceEntity.class); + expect(mpackInstance.getMpackName()).andReturn("test-stack-name").anyTimes(); + expect(mpackInstance.getMpackVersion()).andReturn("test-stack-version").anyTimes(); + expect(entity.getMpackInstances()).andReturn(Collections.singleton(mpackInstance)).anyTimes(); - replay(info, metaInfo, entity, mpackReference); + replay(info, metaInfo, entity, mpackInstance); // attributes is null diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/BlueprintEntityTest2.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/BlueprintEntityTest2.java index b9b11700f72..5bbf75eff30 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/BlueprintEntityTest2.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/BlueprintEntityTest2.java @@ -82,15 +82,15 @@ public void testCreateAndLoadBlueprint() { } private void verifyBlueprint(BlueprintEntity blueprintEntity) { - assertEquals(1, blueprintEntity.getMpackReferences().size()); + assertEquals(1, blueprintEntity.getMpackInstances().size()); - BlueprintMpackInstanceEntity mpackReferenceEntity = - blueprintEntity.getMpackReferences().iterator().next(); - assertEquals("HDPCORE", mpackReferenceEntity.getMpackName()); - assertEquals(1, mpackReferenceEntity.getConfigurations().size()); + BlueprintMpackInstanceEntity mpackInstanceEntity = + blueprintEntity.getMpackInstances().iterator().next(); + assertEquals("HDPCORE", mpackInstanceEntity.getMpackName()); + assertEquals(1, mpackInstanceEntity.getConfigurations().size()); BlueprintMpackConfigEntity mpackConfigEntity = - mpackReferenceEntity.getConfigurations().iterator().next(); + mpackInstanceEntity.getConfigurations().iterator().next(); assertEquals("configdata", mpackConfigEntity.getConfigData()); assertEquals("zk-env.sh", mpackConfigEntity.getType()); @@ -109,11 +109,11 @@ private void verifyBlueprint(BlueprintEntity blueprintEntity) { HostGroupConfigEntity hostGroupConfig = hostGroup.getConfigurations().iterator().next(); assertEquals("hdfs-site", hostGroupConfig.getType()); - assertEquals(1, mpackReferenceEntity.getServiceInstances().size()); - BlueprintServiceEntity service = mpackReferenceEntity.getServiceInstances().iterator().next(); + assertEquals(1, mpackInstanceEntity.getServiceInstances().size()); + BlueprintServiceEntity service = mpackInstanceEntity.getServiceInstances().iterator().next(); assertEquals("ZK1", service.getName()); assertEquals("ZOOKEEPER", service.getType()); - assertSame(mpackReferenceEntity, service.getMpackReference()); + assertSame(mpackInstanceEntity, service.getMpackInstance()); assertEquals(1, service.getConfigurations().size()); assertEquals("hadoop-env", service.getConfigurations().iterator().next().getType()); @@ -131,7 +131,7 @@ private BlueprintEntity createTestBlueprint() { mpackInstanceEntity.setMpackUri("http://hdpcore.org/3.0.0.0"); BlueprintMpackConfigEntity mpackConfigEntity = new BlueprintMpackConfigEntity(); - mpackConfigEntity.setMpackReference(mpackInstanceEntity); + mpackConfigEntity.setMpackInstance(mpackInstanceEntity); mpackConfigEntity.setConfigAttributes("attributes"); mpackConfigEntity.setConfigData("configdata"); mpackConfigEntity.setType("zk-env.sh"); @@ -163,7 +163,7 @@ private BlueprintEntity createTestBlueprint() { hostGroupEntity.addComponent(hgComponentEntity2); BlueprintServiceEntity blueprintService = new BlueprintServiceEntity(); - blueprintService.setMpackReference(mpackInstanceEntity); + blueprintService.setMpackInstance(mpackInstanceEntity); blueprintService.setName("ZK1"); blueprintService.setType("ZOOKEEPER"); mpackInstanceEntity.getServiceInstances().add(blueprintService); @@ -175,7 +175,7 @@ private BlueprintEntity createTestBlueprint() { blueprintServiceConfigEntity.setConfigData("data"); blueprintService.getConfigurations().add(blueprintServiceConfigEntity); - blueprintEntity.getMpackReferences().add(mpackInstanceEntity); + blueprintEntity.getMpackInstances().add(mpackInstanceEntity); blueprintEntity.getHostGroups().add(hostGroupEntity); return blueprintEntity;