Author: smohanty
Date: Thu May 30 16:49:21 2013
New Revision: 1487928
URL: http://svn.apache.org/r1487928
Log:
AMBARI-2228. Fix MySQL and Oracle DDL scripts according to last DB changes.
(smohanty)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-server/src/main/resources/mysql-ddl.sql
incubator/ambari/trunk/ambari-server/src/main/resources/oracle-DDL.sql
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1487928&r1=1487927&r2=1487928&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu May 30 16:49:21 2013
@@ -907,6 +907,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2228. Fix MySQL and Oracle DDL scripts according to last DB
+ changes. (smohanty)
+
AMBARI-2198. Avoid using $::fqdn in puppet which uses the fqdn value from
puppet/facter, instead pass in the hostname from
python socket.getfqdn(). (smohanty)
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/mysql-ddl.sql
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/mysql-ddl.sql?rev=1487928&r1=1487927&r2=1487928&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/mysql-ddl.sql
(original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/mysql-ddl.sql Thu
May 30 16:49:21 2013
@@ -15,8 +15,8 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
-DROP DATABASE IF EXISTS `ambari`;
-DROP USER `ambari`;
+-- DROP DATABASE IF EXISTS `ambari`;
+-- DROP USER `ambari`;
delimiter ;
@@ -41,14 +41,14 @@ CREATE TABLE servicecomponentdesiredstat
CREATE TABLE serviceconfigmapping (config_type VARCHAR(255) NOT NULL,
cluster_id BIGINT NOT NULL, config_tag VARCHAR(255) NOT NULL, service_name
VARCHAR(255) NOT NULL, timestamp BIGINT NOT NULL, PRIMARY KEY (config_type,
cluster_id, service_name));
CREATE TABLE servicedesiredstate (cluster_id BIGINT NOT NULL,
desired_host_role_mapping INTEGER NOT NULL, desired_stack_version VARCHAR(255)
NOT NULL, desired_state VARCHAR(255) NOT NULL, service_name VARCHAR(255) NOT
NULL, PRIMARY KEY (cluster_id, service_name));
CREATE TABLE roles (role_name VARCHAR(255) NOT NULL, PRIMARY KEY (role_name));
-CREATE TABLE users (user_id INTEGER NOT NULL, create_time DATETIME DEFAULT
NOW(), ldap_user INTEGER NOT NULL DEFAULT 0, user_name VARCHAR(255),
user_password VARCHAR(255), PRIMARY KEY (user_id));
+CREATE TABLE users (user_id INTEGER NOT NULL, create_time TIMESTAMP DEFAULT
NOW(), ldap_user INTEGER NOT NULL DEFAULT 0, user_name VARCHAR(255),
user_password VARCHAR(255), PRIMARY KEY (user_id));
CREATE TABLE execution_command (task_id BIGINT NOT NULL, command LONGBLOB,
PRIMARY KEY (task_id));
CREATE TABLE host_role_command (task_id BIGINT NOT NULL, attempt_count
SMALLINT NOT NULL, event LONGTEXT NOT NULL, exitcode INTEGER NOT NULL,
host_name VARCHAR(255) NOT NULL, last_attempt_time BIGINT NOT NULL, request_id
BIGINT NOT NULL, role VARCHAR(255), role_command VARCHAR(255), stage_id BIGINT
NOT NULL, start_time BIGINT NOT NULL, status VARCHAR(255), std_error LONGBLOB,
std_out LONGBLOB, PRIMARY KEY (task_id));
CREATE TABLE role_success_criteria (role VARCHAR(255) NOT NULL, request_id
BIGINT NOT NULL, stage_id BIGINT NOT NULL, success_factor DOUBLE NOT NULL,
PRIMARY KEY (role, request_id, stage_id));
CREATE TABLE stage (stage_id BIGINT NOT NULL, request_id BIGINT NOT NULL,
cluster_id BIGINT, log_info VARCHAR(255) NOT NULL, request_context
VARCHAR(255), PRIMARY KEY (stage_id, request_id));
CREATE TABLE key_value_store (`key` VARCHAR(255) NOT NULL, `value` LONGTEXT,
PRIMARY KEY (`key`));
-CREATE TABLE clusterconfigmapping (type_name VARCHAR(255) NOT NULL,
create_timestamp BIGINT NOT NULL, cluster_id BIGINT NOT NULL, selected INTEGER
NOT NULL, version_tag VARCHAR(255) NOT NULL, PRIMARY KEY (type_name,
create_timestamp, cluster_id));
-CREATE TABLE hostconfigmapping (create_timestamp BIGINT NOT NULL, host_name
VARCHAR(255) NOT NULL, cluster_id BIGINT NOT NULL, type_name VARCHAR(255) NOT
NULL, selected INTEGER NOT NULL, service_name VARCHAR(255), version_tag
VARCHAR(255) NOT NULL, PRIMARY KEY (create_timestamp, host_name, cluster_id,
type_name));
+CREATE TABLE clusterconfigmapping (type_name VARCHAR(255) NOT NULL,
create_timestamp BIGINT NOT NULL, cluster_id BIGINT NOT NULL, selected INTEGER
NOT NULL, version_tag VARCHAR(255) NOT NULL, user_name VARCHAR(255) NOT NULL
DEFAULT '_db', PRIMARY KEY (type_name, create_timestamp, cluster_id));
+CREATE TABLE hostconfigmapping (create_timestamp BIGINT NOT NULL, host_name
VARCHAR(255) NOT NULL, cluster_id BIGINT NOT NULL, type_name VARCHAR(255) NOT
NULL, selected INTEGER NOT NULL, service_name VARCHAR(255), version_tag
VARCHAR(255) NOT NULL, user_name VARCHAR(255) NOT NULL DEFAULT '_db', PRIMARY
KEY (create_timestamp, host_name, cluster_id, type_name));
CREATE TABLE metainfo (`metainfo_key` VARCHAR(255) NOT NULL, `metainfo_value`
LONGTEXT, PRIMARY KEY (`metainfo_key`));
CREATE TABLE ClusterHostMapping (cluster_id BIGINT NOT NULL, host_name
VARCHAR(255) NOT NULL, PRIMARY KEY (cluster_id, host_name));
CREATE TABLE user_roles (role_name VARCHAR(255) NOT NULL, user_id INTEGER NOT
NULL, PRIMARY KEY (role_name, user_id));
@@ -90,12 +90,12 @@ INSERT INTO ambari_sequences(sequence_na
INSERT INTO ambari_sequences(sequence_name, value) values
('host_role_command_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, value) values ('user_id_seq', 1);
-insert into ambari.Roles(role_name)
+insert into ambari.roles(role_name)
select 'admin'
union all
select 'user';
-insert into ambari.Users(user_id, user_name, user_password)
+insert into ambari.users(user_id, user_name, user_password)
select
1,'admin','538916f8943ec225d97a9a86a2c6ec0818c1cd400e09e03b660fdaaec4af29ddbb6f2b1033b81b00';
insert into ambari.user_roles(role_name, user_id)
@@ -180,7 +180,7 @@ CREATE TABLE clusterEvent (
host TEXT, rack TEXT
);
-GRANT ALL ON ambari.* TO `ambari-server`;
+GRANT ALL ON ambari.* TO `ambari`;
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/oracle-DDL.sql
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/oracle-DDL.sql?rev=1487928&r1=1487927&r2=1487928&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/oracle-DDL.sql
(original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/oracle-DDL.sql Thu
May 30 16:49:21 2013
@@ -46,8 +46,8 @@ CREATE TABLE host_role_command (task_id
CREATE TABLE role_success_criteria (role VARCHAR2(255) NOT NULL, request_id
NUMBER(19) NOT NULL, stage_id NUMBER(19) NOT NULL, success_factor NUMBER(19,4)
NOT NULL, PRIMARY KEY (role, request_id, stage_id));
CREATE TABLE stage (stage_id NUMBER(19) NOT NULL, request_id NUMBER(19) NOT
NULL, cluster_id NUMBER(19) NULL, log_info VARCHAR2(255) NULL, request_context
VARCHAR2(255) NULL, PRIMARY KEY (stage_id, request_id));
CREATE TABLE key_value_store ("key" VARCHAR2(255) NOT NULL, "value" CLOB NULL,
PRIMARY KEY ("key"));
-CREATE TABLE clusterconfigmapping (type_name VARCHAR2(255) NOT NULL,
create_timestamp NUMBER(19) NOT NULL, cluster_id NUMBER(19) NOT NULL, selected
NUMBER(10) NOT NULL, version_tag VARCHAR2(255) NOT NULL, PRIMARY KEY
(type_name, create_timestamp, cluster_id));
-CREATE TABLE hostconfigmapping (create_timestamp NUMBER(19) NOT NULL,
host_name VARCHAR2(255) NOT NULL, cluster_id NUMBER(19) NOT NULL, type_name
VARCHAR2(255) NOT NULL, selected NUMBER(10) NOT NULL, service_name
VARCHAR2(255) NULL, version_tag VARCHAR2(255) NOT NULL, PRIMARY KEY
(create_timestamp, host_name, cluster_id, type_name));
+CREATE TABLE clusterconfigmapping (type_name VARCHAR2(255) NOT NULL,
create_timestamp NUMBER(19) NOT NULL, cluster_id NUMBER(19) NOT NULL, selected
NUMBER(10) NOT NULL, version_tag VARCHAR2(255) NOT NULL, user_name VARCHAR(255)
DEFAULT '_db', PRIMARY KEY (type_name, create_timestamp, cluster_id));
+CREATE TABLE hostconfigmapping (create_timestamp NUMBER(19) NOT NULL,
host_name VARCHAR2(255) NOT NULL, cluster_id NUMBER(19) NOT NULL, type_name
VARCHAR2(255) NOT NULL, selected NUMBER(10) NOT NULL, service_name
VARCHAR2(255) NULL, version_tag VARCHAR2(255) NOT NULL, user_name VARCHAR(255)
DEFAULT '_db', PRIMARY KEY (create_timestamp, host_name, cluster_id,
type_name));
CREATE TABLE metainfo ("metainfo_key" VARCHAR2(255) NOT NULL, "metainfo_value"
CLOB NULL, PRIMARY KEY ("metainfo_key"));
CREATE TABLE ClusterHostMapping (cluster_id NUMBER(19) NOT NULL, host_name
VARCHAR2(255) NOT NULL, PRIMARY KEY (cluster_id, host_name));
CREATE TABLE user_roles (role_name VARCHAR2(255) NOT NULL, user_id NUMBER(10)
NOT NULL, PRIMARY KEY (role_name, user_id));
