Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[HWORKS-262] Remove user email FK from hopsworks schema #844

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[HWORKS-262] Remove user email FK from hopsworks schema #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d74d80c
[HWORKS-262] Remove user email FK from hopsworks schema
SirOibaf May 27, 2024
86be0ad
Fix fk name
SirOibaf May 27, 2024
ba33b77
Fix migration of the project_team table
SirOibaf Jun 2, 2024
c8df71f
Fix primary keys in jupyter_settings and rstudio_settings
SirOibaf Jun 2, 2024
688fdd2
More fixes to the initial tables
SirOibaf Jun 3, 2024
a80772c
Update email index requirement in users table
SirOibaf Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 28 additions & 48 deletions files/default/sql/ddl/3.8.0__initial_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,17 +245,16 @@ CREATE TABLE `dataset_request` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`dataset` int(11) NOT NULL,
`projectId` int(11) NOT NULL,
`user_email` varchar(150) COLLATE latin1_general_cs NOT NULL,
`uid` INT(11) NOT NULL,
`requested` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`message` varchar(3000) COLLATE latin1_general_cs DEFAULT NULL,
`message_id` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `index2` (`dataset`,`projectId`),
KEY `projectId` (`projectId`,`user_email`),
KEY `message_id` (`message_id`),
CONSTRAINT `FK_429_449` FOREIGN KEY (`dataset`) REFERENCES `dataset` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION,
CONSTRAINT `FK_438_452` FOREIGN KEY (`message_id`) REFERENCES `message` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
CONSTRAINT `FK_302_451` FOREIGN KEY (`projectId`,`user_email`) REFERENCES `project_team` (`project_id`,`team_member`) ON DELETE CASCADE ON UPDATE NO ACTION
CONSTRAINT `project_team_fk_ds` FOREIGN KEY (`projectId`,`uid`) REFERENCES `project_team` (`project_id`,`uid`) ON DELETE CASCADE ON UPDATE NO ACTION
) ENGINE=ndbcluster AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand All @@ -269,7 +268,7 @@ CREATE TABLE `dataset_request` (
CREATE TABLE `executions` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`submission_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`user` varchar(150) COLLATE latin1_general_cs NOT NULL,
`uid` INT(11) NOT NULL,
`state` varchar(128) COLLATE latin1_general_cs NOT NULL,
`execution_start` bigint(20) DEFAULT NULL,
`execution_stop` bigint(20) DEFAULT NULL,
Expand All @@ -285,12 +284,11 @@ CREATE TABLE `executions` (
PRIMARY KEY (`id`),
UNIQUE KEY `app_id` (`app_id`),
KEY `job_id` (`job_id`),
KEY `user` (`user`),
KEY `submission_time_idx` (`submission_time`,`job_id`),
KEY `state_idx` (`state`,`job_id`),
KEY `finalStatus_idx` (`finalStatus`,`job_id`),
KEY `progress_idx` (`progress`,`job_id`),
CONSTRAINT `FK_262_366` FOREIGN KEY (`user`) REFERENCES `users` (`email`) ON DELETE NO ACTION ON UPDATE NO ACTION
CONSTRAINT `user_fk_executions` FOREIGN KEY (`uid`) REFERENCES `users` (`uid`) ON DELETE NO ACTION ON UPDATE NO ACTION
) ENGINE=ndbcluster AUTO_INCREMENT=23 DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand Down Expand Up @@ -645,17 +643,16 @@ CREATE TABLE `jobs` (
`name` varchar(128) COLLATE latin1_general_cs DEFAULT NULL,
`creation_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`project_id` int(11) NOT NULL,
`creator` varchar(150) COLLATE latin1_general_cs NOT NULL,
`uid` INT(11) NOT NULL,
`type` varchar(128) COLLATE latin1_general_cs NOT NULL,
`json_config` varchar(12500) COLLATE latin1_general_cs NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `name_project_idx` (`name`,`project_id`),
KEY `project_id` (`project_id`),
KEY `creator` (`creator`),
KEY `creator_project_idx` (`creator`,`project_id`),
KEY `uid_project_idx` (`uid`, `project_id`),
KEY `creation_time_project_idx` (`creation_time`,`project_id`),
KEY `type_project_id_idx` (`type`,`project_id`),
CONSTRAINT `FK_262_353` FOREIGN KEY (`creator`) REFERENCES `users` (`email`) ON DELETE NO ACTION ON UPDATE NO ACTION,
CONSTRAINT `user_fk_jobs` FOREIGN KEY (`uid`) REFERENCES `users` (`uid`) ON DELETE NO ACTION ON UPDATE NO ACTION,
CONSTRAINT `FK_284_352` FOREIGN KEY (`project_id`) REFERENCES `project` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION
) ENGINE=ndbcluster AUTO_INCREMENT=37 DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs;
/*!40101 SET character_set_client = @saved_cs_client */;
Expand Down Expand Up @@ -692,7 +689,7 @@ CREATE TABLE `jupyter_project` (
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `jupyter_settings` (
`project_id` int(11) NOT NULL,
`team_member` varchar(150) COLLATE latin1_general_cs NOT NULL,
`uid` INT(11) NOT NULL,
`secret` varchar(255) COLLATE latin1_general_cs NOT NULL,
`advanced` tinyint(1) DEFAULT '0',
`shutdown_level` int(11) NOT NULL DEFAULT '6',
Expand All @@ -701,10 +698,10 @@ CREATE TABLE `jupyter_settings` (
`job_config` varchar(11000) COLLATE latin1_general_cs DEFAULT NULL,
`docker_config` varchar(1000) COLLATE latin1_general_cs DEFAULT NULL,
`python_kernel` TINYINT(1) DEFAULT 1,
PRIMARY KEY (`project_id`,`team_member`),
KEY `team_member` (`team_member`),
PRIMARY KEY (`project_id`, `uid`),
KEY `secret_idx` (`secret`),
CONSTRAINT `FK_262_309` FOREIGN KEY (`team_member`) REFERENCES `users` (`email`) ON DELETE CASCADE ON UPDATE NO ACTION,
KEY `pid` (`project_id`),
CONSTRAINT `user_fk_jp_settings` FOREIGN KEY (`uid`) REFERENCES `users` (`uid`) ON DELETE CASCADE ON UPDATE NO ACTION,
CONSTRAINT `FK_284_308` FOREIGN KEY (`project_id`) REFERENCES `project` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION
) ENGINE=ndbcluster DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs;
/*!40101 SET character_set_client = @saved_cs_client */;
Expand Down Expand Up @@ -768,8 +765,8 @@ CREATE TABLE `materialized_jwt` (
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `message` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`user_from` varchar(150) COLLATE latin1_general_cs DEFAULT NULL,
`user_to` varchar(150) COLLATE latin1_general_cs NOT NULL,
`uid_from` INT(11) DEFAULT NULL,
`uid_to` INT(11) NOT NULL,
`date_sent` datetime NOT NULL,
`subject` varchar(128) COLLATE latin1_general_cs DEFAULT NULL,
`preview` varchar(128) COLLATE latin1_general_cs DEFAULT NULL,
Expand All @@ -779,31 +776,15 @@ CREATE TABLE `message` (
`path` varchar(600) COLLATE latin1_general_cs DEFAULT NULL,
`reply_to_msg` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `user_from` (`user_from`),
KEY `user_to` (`user_to`),
KEY `user_from` (`uid_from`),
KEY `user_to` (`uid_to`),
KEY `reply_to_msg` (`reply_to_msg`),
CONSTRAINT `FK_262_441` FOREIGN KEY (`user_from`) REFERENCES `users` (`email`) ON DELETE SET NULL ON UPDATE NO ACTION,
CONSTRAINT `FK_262_442` FOREIGN KEY (`user_to`) REFERENCES `users` (`email`) ON DELETE CASCADE ON UPDATE NO ACTION,
CONSTRAINT `user_fk_msg_from` FOREIGN KEY (`uid_from`) REFERENCES `users` (`uid`) ON DELETE SET NULL ON UPDATE NO ACTION,
CONSTRAINT `user_fk_msg_to` FOREIGN KEY (`uid_to`) REFERENCES `users` (`uid`) ON DELETE CASCADE ON UPDATE NO ACTION,
CONSTRAINT `FK_438_443` FOREIGN KEY (`reply_to_msg`) REFERENCES `message` (`id`) ON DELETE SET NULL ON UPDATE NO ACTION
) ENGINE=ndbcluster AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `message_to_user`
--

/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `message_to_user` (
`message` int(11) NOT NULL,
`user_email` varchar(150) COLLATE latin1_general_cs NOT NULL,
PRIMARY KEY (`message`,`user_email`),
KEY `user_email` (`user_email`),
CONSTRAINT `FK_262_458` FOREIGN KEY (`user_email`) REFERENCES `users` (`email`) ON DELETE CASCADE ON UPDATE NO ACTION,
CONSTRAINT `FK_438_457` FOREIGN KEY (`message`) REFERENCES `message` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION
) ENGINE=ndbcluster DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `oauth_client`
--
Expand Down Expand Up @@ -912,7 +893,7 @@ CREATE TABLE `ops_log` (
CREATE TABLE `project` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`projectname` varchar(100) COLLATE latin1_general_cs NOT NULL,
`username` varchar(150) COLLATE latin1_general_cs NOT NULL,
`uid` INT(11) NOT NULL,
`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`description` varchar(2000) COLLATE latin1_general_cs DEFAULT NULL,
`payment_type` varchar(255) COLLATE latin1_general_cs NOT NULL DEFAULT 'PREPAID',
Expand All @@ -925,8 +906,7 @@ CREATE TABLE `project` (
`online_feature_store_available` tinyint(1) NOT NULL DEFAULT '1',
PRIMARY KEY (`id`),
UNIQUE KEY `projectname` (`projectname`),
KEY `user_idx` (`username`),
CONSTRAINT `FK_262_290` FOREIGN KEY (`username`) REFERENCES `users` (`email`) ON DELETE NO ACTION ON UPDATE NO ACTION
CONSTRAINT `user_fk_project` FOREIGN KEY (`uid`) REFERENCES `users` (`uid`) ON DELETE NO ACTION ON UPDATE NO ACTION
) ENGINE=ndbcluster AUTO_INCREMENT=119 DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand Down Expand Up @@ -1002,12 +982,12 @@ CREATE TABLE `project_services` (
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `project_team` (
`project_id` int(11) NOT NULL,
`team_member` varchar(150) COLLATE latin1_general_cs NOT NULL,
`uid` INT(11) NOT NULL,
`team_role` varchar(32) COLLATE latin1_general_cs NOT NULL,
`added` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`project_id`,`team_member`),
KEY `team_member` (`team_member`),
CONSTRAINT `FK_262_304` FOREIGN KEY (`team_member`) REFERENCES `users` (`email`) ON DELETE CASCADE ON UPDATE NO ACTION,
PRIMARY KEY (`project_id`,`uid`),
KEY `pid` (`project_id`),
CONSTRAINT `user_fk_team` FOREIGN KEY (`uid`) REFERENCES `users` (`uid`) ON DELETE CASCADE ON UPDATE NO ACTION,
CONSTRAINT `FK_284_303` FOREIGN KEY (`project_id`) REFERENCES `project` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION
) ENGINE=ndbcluster DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs;
/*!40101 SET character_set_client = @saved_cs_client */;
Expand Down Expand Up @@ -1205,7 +1185,7 @@ CREATE TABLE `rstudio_project` (
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `rstudio_settings` (
`project_id` int(11) NOT NULL,
`team_member` varchar(150) COLLATE latin1_general_cs NOT NULL,
`uid` INT(11) NOT NULL,
`num_tf_ps` int(11) DEFAULT '1',
`num_tf_gpus` int(11) DEFAULT '0',
`num_mpi_np` int(11) DEFAULT '1',
Expand All @@ -1228,10 +1208,10 @@ CREATE TABLE `rstudio_settings` (
`py_files` varchar(1500) COLLATE latin1_general_cs DEFAULT '',
`spark_params` varchar(6500) COLLATE latin1_general_cs DEFAULT '',
`shutdown_level` int(11) NOT NULL DEFAULT '6',
PRIMARY KEY (`project_id`,`team_member`),
KEY `team_member` (`team_member`),
PRIMARY KEY (`project_id`, `uid`),
KEY `pid` (`project_id`),
KEY `secret_idx` (`secret`),
CONSTRAINT `RS_FK_USERS` FOREIGN KEY (`team_member`) REFERENCES `users` (`email`) ON DELETE CASCADE ON UPDATE NO ACTION,
CONSTRAINT `user_fk_rstudio` FOREIGN KEY (`uid`) REFERENCES `users` (`uid`) ON DELETE CASCADE ON UPDATE NO ACTION,
CONSTRAINT `RS_FK_PROJS` FOREIGN KEY (`project_id`) REFERENCES `project` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION
) ENGINE=ndbcluster DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs;
/*!40101 SET character_set_client = @saved_cs_client */;
Expand Down Expand Up @@ -1621,7 +1601,7 @@ CREATE TABLE `users` (
`salt` varchar(128) COLLATE latin1_general_cs NOT NULL DEFAULT '',
PRIMARY KEY (`uid`),
UNIQUE KEY `username` (`username`),
UNIQUE KEY `email` (`email`)
KEY `email` (`email`)
) ENGINE=ndbcluster AUTO_INCREMENT=10178 DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs;
/*!40101 SET character_set_client = @saved_cs_client */;

Expand Down
Loading