Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-14714 c118e515a -> b0f5639cb
AMBARI-22297 Fix DDL Scripts: fix stack table and add blueprintv2 table (benyoka) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0f5639c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0f5639c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0f5639c Branch: refs/heads/branch-feature-AMBARI-14714 Commit: b0f5639cb03be37d841b2b526be54a52d20e9d08 Parents: c118e51 Author: Balazs Bence Sari <beny...@apache.org> Authored: Wed Oct 25 14:24:47 2017 +0200 Committer: Balazs Bence Sari <beny...@apache.org> Committed: Wed Oct 25 14:25:03 2017 +0200 ---------------------------------------------------------------------- .../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 10 ++++++++++ .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 10 ++++++++++ .../src/main/resources/Ambari-DDL-Oracle-CREATE.sql | 11 +++++++++++ .../src/main/resources/Ambari-DDL-Postgres-CREATE.sql | 10 ++++++++++ .../src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 11 +++++++++++ .../src/main/resources/Ambari-DDL-SQLServer-CREATE.sql | 11 +++++++++++ 6 files changed, 63 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f5639c/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 b8c0a42..0d82cd4 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql @@ -39,6 +39,7 @@ CREATE TABLE stack ( stack_id BIGINT NOT NULL, stack_name VARCHAR(255) NOT NULL, stack_version VARCHAR(255) NOT NULL, + repo_version VARCHAR(255) NOT NULL, current_mpack_id BIGINT, CONSTRAINT PK_stack PRIMARY KEY (stack_id), CONSTRAINT FK_mpacks FOREIGN KEY (current_mpack_id) REFERENCES mpacks(id), @@ -529,6 +530,15 @@ CREATE TABLE blueprint ( CONSTRAINT PK_blueprint PRIMARY KEY (blueprint_name), CONSTRAINT FK_blueprint_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id)); +CREATE TABLE blueprintv2 ( + blueprint_name VARCHAR(255) NOT NULL, + security_type VARCHAR(32) NOT NULL DEFAULT 'NONE', + security_descriptor_reference VARCHAR(255), + stack_id BIGINT NOT NULL, + content VARCHAR(32000) NOT NULL, + CONSTRAINT PK_blueprintv2 PRIMARY KEY (blueprint_name), + CONSTRAINT FK_blueprintv2_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id)); + CREATE TABLE hostgroup ( blueprint_name VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f5639c/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 c56e486..d70d853 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql @@ -58,6 +58,7 @@ CREATE TABLE stack ( stack_id BIGINT NOT NULL, stack_name VARCHAR(100) NOT NULL, stack_version VARCHAR(100) NOT NULL, + repo_version VARCHAR(255) NOT NULL, current_mpack_id BIGINT, CONSTRAINT PK_stack PRIMARY KEY (stack_id), CONSTRAINT FK_mpacks FOREIGN KEY (current_mpack_id) REFERENCES mpacks(id), @@ -546,6 +547,15 @@ CREATE TABLE blueprint ( CONSTRAINT PK_blueprint PRIMARY KEY (blueprint_name), CONSTRAINT FK_blueprint_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id)); +CREATE TABLE blueprintv2 ( + blueprint_name VARCHAR(255) NOT NULL, + security_type VARCHAR(32) NOT NULL DEFAULT 'NONE', + security_descriptor_reference VARCHAR(255), + stack_id BIGINT NOT NULL, + content LONGTEXT NOT NULL, + CONSTRAINT PK_blueprintv2 PRIMARY KEY (blueprint_name), + CONSTRAINT FK_blueprintv2_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id)); + CREATE TABLE hostgroup ( blueprint_name VARCHAR(100) NOT NULL, name VARCHAR(100) NOT NULL, http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f5639c/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 8917d48..54e890d 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql @@ -39,6 +39,7 @@ CREATE TABLE stack ( stack_id NUMBER(19) NOT NULL, stack_name VARCHAR2(255) NOT NULL, stack_version VARCHAR2(255) NOT NULL, + repo_version VARCHAR2(255) NOT NULL, current_mpack_id BIGINT, CONSTRAINT PK_stack PRIMARY KEY (stack_id), CONSTRAINT FK_mpacks FOREIGN KEY (current_mpack_id) REFERENCES mpacks(id), @@ -528,6 +529,16 @@ CREATE TABLE blueprint ( CONSTRAINT PK_blueprint PRIMARY KEY (blueprint_name), CONSTRAINT FK_blueprint_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id)); +CREATE TABLE blueprintv2 ( + blueprint_name VARCHAR2(255) NOT NULL, + security_type VARCHAR2(32) NOT NULL DEFAULT 'NONE', + security_descriptor_reference VARCHAR2(255), + stack_id NUMBER(19) NOT NULL, + content CLOB NOT NULL, + CONSTRAINT PK_blueprintv2 PRIMARY KEY (blueprint_name), + CONSTRAINT FK_blueprintv2_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id)); + + CREATE TABLE hostgroup ( blueprint_name VARCHAR2(255) NOT NULL, name VARCHAR2(255) NOT NULL, http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f5639c/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 482f5e8..437756a 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql @@ -39,6 +39,7 @@ CREATE TABLE stack ( stack_id BIGINT NOT NULL, stack_name VARCHAR(255) NOT NULL, stack_version VARCHAR(255) NOT NULL, + repo_version VARCHAR(255) NOT NULL, current_mpack_id BIGINT, CONSTRAINT PK_stack PRIMARY KEY (stack_id), CONSTRAINT FK_mpacks FOREIGN KEY (current_mpack_id) REFERENCES mpacks(id), @@ -527,6 +528,15 @@ CREATE TABLE blueprint ( CONSTRAINT PK_blueprint PRIMARY KEY (blueprint_name), CONSTRAINT FK_blueprint_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id)); +CREATE TABLE blueprintv2 ( + blueprint_name VARCHAR(255) NOT NULL, + security_type VARCHAR(32) NOT NULL DEFAULT 'NONE', + security_descriptor_reference VARCHAR(255), + stack_id BIGINT NOT NULL, + content VARCHAR(32000) NOT NULL, + CONSTRAINT PK_blueprintv2 PRIMARY KEY (blueprint_name), + CONSTRAINT FK_blueprintv2_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id)); + CREATE TABLE hostgroup ( blueprint_name VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f5639c/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 e7c5c72..74e3e69 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql @@ -38,6 +38,7 @@ CREATE TABLE stack ( stack_id NUMERIC(19) NOT NULL, stack_name VARCHAR(255) NOT NULL, stack_version VARCHAR(255) NOT NULL, + repo_version VARCHAR(255) NOT NULL, current_mpack_id BIGINT, CONSTRAINT PK_stack PRIMARY KEY (stack_id), CONSTRAINT FK_mpacks FOREIGN KEY (current_mpack_id) REFERENCES mpacks(id), @@ -524,6 +525,16 @@ CREATE TABLE blueprint ( CONSTRAINT PK_blueprint PRIMARY KEY (blueprint_name), CONSTRAINT FK_blueprint_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id)); +CREATE TABLE blueprintv2 ( + blueprint_name VARCHAR(255) NOT NULL, + security_type VARCHAR(32) NOT NULL DEFAULT 'NONE', + security_descriptor_reference VARCHAR(255), + stack_id NUMERIC(19) NOT NULL, + content TEXT NOT NULL, + CONSTRAINT PK_blueprintv2 PRIMARY KEY (blueprint_name), + CONSTRAINT FK_blueprintv2_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id)); + + CREATE TABLE hostgroup ( blueprint_name VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f5639c/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 f87af4c..cffe53d 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql @@ -51,6 +51,7 @@ CREATE TABLE stack ( stack_id BIGINT NOT NULL, stack_name VARCHAR(255) NOT NULL, stack_version VARCHAR(255) NOT NULL, + repo_version VARCHAR(255) NOT NULL, current_mpack_id BIGINT, CONSTRAINT PK_stack PRIMARY KEY CLUSTERED (stack_id), CONSTRAINT FK_mpacks FOREIGN KEY (current_mpack_id) REFERENCES mpacks(id), @@ -532,6 +533,16 @@ CREATE TABLE blueprint ( CONSTRAINT PK_blueprint PRIMARY KEY CLUSTERED (blueprint_name), CONSTRAINT FK_blueprint_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id)); + +CREATE TABLE blueprintv2 ( + blueprint_name VARCHAR(255) NOT NULL, + security_type VARCHAR(32) NOT NULL DEFAULT 'NONE', + security_descriptor_reference VARCHAR(255), + stack_id BIGINT NOT NULL, + content VARCHAR(MAX) NOT NULL, + CONSTRAINT PK_blueprintv2 PRIMARY KEY (blueprint_name), + CONSTRAINT FK_blueprintv2_stack_id FOREIGN KEY (stack_id) REFERENCES stack(stack_id)); + CREATE TABLE hostgroup ( blueprint_name VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL,