diff --git a/files/default/sql/ddl/2.5.0__initial_tables.sql b/files/default/sql/ddl/2.5.0__initial_tables.sql index 942fc07fd..d2fcfb373 100755 --- a/files/default/sql/ddl/2.5.0__initial_tables.sql +++ b/files/default/sql/ddl/2.5.0__initial_tables.sql @@ -1049,22 +1049,6 @@ CREATE TABLE `roles_audit` ( ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `rstudio_interpreter` --- - -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `rstudio_interpreter` ( - `port` int(11) NOT NULL, - `name` varchar(255) COLLATE latin1_general_cs NOT NULL, - `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `last_accessed` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`port`,`name`), - CONSTRAINT `FK_575_582` FOREIGN KEY (`port`) REFERENCES `rstudio_project` (`port`) 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 `rstudio_project` -- @@ -1126,10 +1110,6 @@ CREATE TABLE `rstudio_settings` ( CONSTRAINT `RS_FK_USERS` FOREIGN KEY (`team_member`) REFERENCES `users` (`email`) 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 */; - -/*!40101 SET character_set_client = utf8 */; -/*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `serving` diff --git a/files/default/sql/ddl/updates/2.5.0.sql b/files/default/sql/ddl/updates/2.5.0.sql index e69de29bb..82ee1e19d 100644 --- a/files/default/sql/ddl/updates/2.5.0.sql +++ b/files/default/sql/ddl/updates/2.5.0.sql @@ -0,0 +1,22 @@ +ALTER TABLE `hopsworks`.`rstudio_settings` DROP `num_tf_ps`, DROP `num_tf_gpus`, DROP `num_mpi_np`, +DROP `appmaster_cores`, DROP `appmaster_memory`, DROP `num_executors`, DROP `num_executor_cores`, + DROP `executor_memory`, DROP `dynamic_initial_executors`,DROP `dynamic_min_executors`, DROP `dynamic_max_executors`, + DROP `log_level`, DROP `mode`, DROP `umask`, DROP `archives`, DROP `jars`, DROP `files`,DROP `py_files`, DROP `spark_params`; + +ALTER TABLE `hopsworks`.`rstudio_project` DROP `host_ip`, DROP `token`; + +ALTER TABLE `hopsworks`.`rstudio_project` ADD COLUMN `expires` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP; + +ALTER TABLE `hopsworks`.`rstudio_project` ADD COLUMN `login_username` varchar(255) COLLATE latin1_general_cs DEFAULT + NULL; + +ALTER TABLE `hopsworks`.`rstudio_project` ADD COLUMN `login_password` varchar(255) COLLATE latin1_general_cs DEFAULT + NULL; + +ALTER TABLE `hopsworks`.`rstudio_project` MODIFY COLUMN `pid` varchar(255) COLLATE latin1_general_cs NOT NULL; + +ALTER TABLE `hopsworks`.`rstudio_settings` ADD COLUMN `job_config` varchar(11000) COLLATE latin1_general_cs DEFAULT + NULL; + +ALTER TABLE `hopsworks`.`rstudio_settings` ADD COLUMN `docker_config` varchar(11000) COLLATE latin1_general_cs DEFAULT + NULL; \ No newline at end of file diff --git a/files/default/sql/ddl/updates/3.0.0.sql b/files/default/sql/ddl/updates/3.0.0.sql deleted file mode 100644 index a9efe46d5..000000000 --- a/files/default/sql/ddl/updates/3.0.0.sql +++ /dev/null @@ -1,95 +0,0 @@ -CREATE TABLE IF NOT EXISTS `feature_store_code` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `commit_time` DATETIME(3) NOT NULL, - `inode_pid` BIGINT(20) NOT NULL, - `inode_name` VARCHAR(255) COLLATE latin1_general_cs NOT NULL, - `partition_id` BIGINT(20) NOT NULL, - `feature_group_id` INT(11), - `feature_group_commit_id` BIGINT(20), - `training_dataset_id`INT(11), - `application_id`VARCHAR(50), - PRIMARY KEY (`id`), - KEY `feature_group_id` (`feature_group_id`), - KEY `training_dataset_id` (`training_dataset_id`), - KEY `feature_group_commit_id_fk` (`feature_group_id`, `feature_group_commit_id`), - CONSTRAINT `fg_fk_fsc` FOREIGN KEY (`feature_group_id`) REFERENCES `feature_group` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION, - CONSTRAINT `fg_ci_fk_fsc` FOREIGN KEY (`feature_group_id`, `feature_group_commit_id`) REFERENCES `feature_group_commit` (`feature_group_id`, `commit_id`) ON DELETE SET NULL ON UPDATE NO ACTION, - CONSTRAINT `td_fk_fsc` FOREIGN KEY (`training_dataset_id`) REFERENCES `training_dataset` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION, - CONSTRAINT `inode_fk_fsc` FOREIGN KEY (`inode_pid`,`inode_name`,`partition_id`) REFERENCES `hops`.`hdfs_inodes` (`parent_id`,`name`,`partition_id`) ON DELETE CASCADE ON UPDATE NO ACTION -) ENGINE=ndbcluster DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs; - -ALTER TABLE `hopsworks`.`on_demand_feature` ADD COLUMN `idx` int(11) NOT NULL DEFAULT 0; - -ALTER TABLE `hopsworks`.`statistics_config` -ADD COLUMN `exact_uniqueness` TINYINT(1) NOT NULL DEFAULT '1'; - -DROP TABLE `hopsworks`.`ndb_backup`; - -DROP TABLE `project_devices`; -DROP TABLE `project_devices_settings`; - -ALTER TABLE `hopsworks`.`dataset_shared_with` ADD COLUMN `shared_by` INT(11) DEFAULT NULL; -ALTER TABLE `hopsworks`.`dataset_shared_with` ADD COLUMN `accepted_by` INT(11) DEFAULT NULL; - -ALTER TABLE `hopsworks`.`dataset_shared_with` ADD CONSTRAINT `fk_shared_by` FOREIGN KEY (`shared_by`) REFERENCES `users` (`uid`) ON DELETE NO ACTION ON UPDATE NO ACTION; -ALTER TABLE `hopsworks`.`dataset_shared_with` ADD CONSTRAINT `fk_accepted_by` FOREIGN KEY (`accepted_by`) REFERENCES `users` (`uid`) ON DELETE NO ACTION ON UPDATE NO ACTION; - -ALTER TABLE `hopsworks`.`feature_store_snowflake_connector` ADD COLUMN `application` VARCHAR(50) DEFAULT NULL; - -CREATE TABLE IF NOT EXISTS `hopsworks`.`alert_receiver` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, - `name` VARCHAR(128) NOT NULL, - `config` BLOB NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `name_UNIQUE` (`name`) -) ENGINE=ndbcluster DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs; - -ALTER TABLE `hopsworks`.`project_service_alert` ADD COLUMN `receiver` INT(11) DEFAULT NULL, -ADD INDEX `fk_project_service_alert_1_idx` (`receiver`); - -ALTER TABLE `hopsworks`.`project_service_alert` -ADD CONSTRAINT `fk_project_service_alert_1` FOREIGN KEY (`receiver`) - REFERENCES `hopsworks`.`alert_receiver` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION; - -ALTER TABLE `hopsworks`.`job_alert` ADD COLUMN `receiver` INT(11) DEFAULT NULL, -ADD INDEX `fk_job_alert_1_idx` (`receiver`); - -ALTER TABLE `hopsworks`.`job_alert` -ADD CONSTRAINT `fk_job_alert_1` FOREIGN KEY (`receiver`) - REFERENCES `hopsworks`.`alert_receiver` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION; - -ALTER TABLE `hopsworks`.`feature_group_alert` ADD COLUMN `receiver` INT(11) DEFAULT NULL, -ADD INDEX `fk_feature_group_alert_1_idx` (`receiver` ASC); - -ALTER TABLE `hopsworks`.`feature_group_alert` -ADD CONSTRAINT `fk_feature_group_alert_1` FOREIGN KEY (`receiver`) - REFERENCES `hopsworks`.`alert_receiver` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION; - -ALTER TABLE `hopsworks`.`jupyter_project` ADD COLUMN `no_limit` tinyint(1) DEFAULT 0; - -ALTER TABLE `hopsworks`.`jupyter_settings` ADD COLUMN `no_limit` tinyint(1) DEFAULT 0; - -ALTER TABLE `hopsworks`.`oauth_login_state` MODIFY COLUMN `state` VARCHAR(256); - -ALTER TABLE `hopsworks`.`rstudio_settings` DROP `num_tf_ps`, DROP `num_tf_gpus`, DROP `num_mpi_np`, - DROP `appmaster_cores`, DROP `appmaster_memory`, DROP `num_executors`, DROP `num_executor_cores`, - DROP `executor_memory`, DROP `dynamic_initial_executors`,DROP `dynamic_min_executors`, DROP `dynamic_max_executors`, - DROP `log_level`, DROP `mode`, DROP `umask`, DROP `archives`, DROP `jars`, DROP `files`,DROP `py_files`, DROP `spark_params`; - -ALTER TABLE `hopsworks`.`rstudio_project` DROP `host_ip`, DROP `token`; - -ALTER TABLE `hopsworks`.`rstudio_project` ADD COLUMN `expires` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP; - -ALTER TABLE `hopsworks`.`rstudio_project` ADD COLUMN `login_username` varchar(255) COLLATE latin1_general_cs DEFAULT - NULL; - -ALTER TABLE `hopsworks`.`rstudio_project` ADD COLUMN `login_password` varchar(255) COLLATE latin1_general_cs DEFAULT - NULL; - -ALTER TABLE `hopsworks`.`rstudio_project` MODIFY COLUMN `pid` varchar(255) COLLATE latin1_general_cs NOT NULL; - -ALTER TABLE `hopsworks`.`rstudio_settings` ADD COLUMN `job_config` varchar(11000) COLLATE latin1_general_cs DEFAULT - NULL; - -ALTER TABLE `hopsworks`.`rstudio_settings` ADD COLUMN `docker_config` varchar(11000) COLLATE latin1_general_cs DEFAULT - NULL; diff --git a/templates/default/sql/dml/2.5.0.sql.erb b/templates/default/sql/dml/2.5.0.sql.erb index e69de29bb..d3fb23524 100644 --- a/templates/default/sql/dml/2.5.0.sql.erb +++ b/templates/default/sql/dml/2.5.0.sql.erb @@ -0,0 +1,12 @@ +REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_host", "<%= node['hopsworks']['rstudio_host'] %>"); +REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_origin_scheme", "<%= node['hopsworks']['rstudio_origin_scheme'] %>"); +REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_www_address", "<%= node['hopsworks']['rstudio_www_address'] %>"); +REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_session_timeout_minutes", "<%= node['hopsworks']['rstudio_session_timeout_minutes'] %>"); +REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_logging_level", "<%= node['hopsworks']['rstudio_logging_level'] %>"); +REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_logger_type", "<%= node['hopsworks']['rstudio_logger_type'] %>"); +REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_log_file_max_size", "<%= node['hopsworks']['rstudio_log_file_max_size'] %>"); +REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_dir", "<%= node['hopsworks']['rstudio_dir'] %>"); +REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_user", "<%= node['hops']['yarnapp']['user'] %>"); +REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_group", "<%= node['hops']['group'] %>"); +REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_cran_repo", "<%= node['hopsworks']['rstudio_cran_repo'] %>"); +REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_shutdown_timer_interval", "<%= node['rstudio']['shutdown_timer_interval'] %>"); diff --git a/templates/default/sql/dml/3.0.0.sql.erb b/templates/default/sql/dml/3.0.0.sql.erb deleted file mode 100644 index acfed999b..000000000 --- a/templates/default/sql/dml/3.0.0.sql.erb +++ /dev/null @@ -1,27 +0,0 @@ -REPLACE INTO `hopsworks`.`variables` VALUES ("kube_serving_node_labels", "<%= node['kube-hops']['serving_node_labels'] %>", 1); -REPLACE INTO `hopsworks`.`variables` VALUES ("kube_serving_node_tolerations", "<%= node['kube-hops']['serving_node_tolerations'] %>", 1); - -DELETE FROM `hopsworks`.`variables` WHERE id="ndb_dir"; -DELETE FROM `hopsworks`.`variables` WHERE id="mysql_dir"; -DELETE FROM `hopsworks`.`variables` WHERE id="mysql_user"; - -DELETE FROM `hopsworks`.`bbc_group` WHERE group_name="AUDITOR"; - - -REPLACE INTO `hopsworks`.`variables` VALUES ("kibana_service_log_viewer", "<%= node['elastic']['opendistro_security']['service_log_viewer']['username'] %>", 1); - -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("reject_remote_user_no_group", "<%= node['hopsworks']['reject_remote_user_no_group'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("managed_cloud_redirect_uri", "<%= node['hopsworks']['managed_cloud_redirect_uri'] %>"); - -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_host", "<%= node['hopsworks']['rstudio_host'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_origin_scheme", "<%= node['hopsworks']['rstudio_origin_scheme'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_www_address", "<%= node['hopsworks']['rstudio_www_address'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_session_timeout_minutes", "<%= node['hopsworks']['rstudio_session_timeout_minutes'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_logging_level", "<%= node['hopsworks']['rstudio_logging_level'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_logger_type", "<%= node['hopsworks']['rstudio_logger_type'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_log_file_max_size", "<%= node['hopsworks']['rstudio_log_file_max_size'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_dir", "<%= node['hopsworks']['rstudio_dir'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_user", "<%= node['hops']['yarnapp']['user'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_group", "<%= node['hops']['group'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_cran_repo", "<%= node['hopsworks']['rstudio_cran_repo'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("rstudio_shutdown_timer_interval", "<%= node['rstudio']['shutdown_timer_interval'] %>"); diff --git a/templates/default/sql/dml/undo/2.5.0__undo.sql.erb b/templates/default/sql/dml/undo/2.5.0__undo.sql.erb index e69de29bb..829940c73 100644 --- a/templates/default/sql/dml/undo/2.5.0__undo.sql.erb +++ b/templates/default/sql/dml/undo/2.5.0__undo.sql.erb @@ -0,0 +1,12 @@ +DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_host'; +DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_origin_scheme'; +DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_www_address'; +DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_session_timeout_minutes'; +DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_logging_level'; +DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_logger_type'; +DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_log_file_max_size'; +DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_dir'; +DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_user'; +DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_group'; +DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_cran_repo'; +DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_shutdown_timer_interval'; \ No newline at end of file diff --git a/templates/default/sql/dml/undo/3.0.0__undo.sql.erb b/templates/default/sql/dml/undo/3.0.0__undo.sql.erb deleted file mode 100644 index 7c4aec59c..000000000 --- a/templates/default/sql/dml/undo/3.0.0__undo.sql.erb +++ /dev/null @@ -1,25 +0,0 @@ -DELETE FROM `hopsworks`.`variables` WHERE `id`='kube_serving_node_labels'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='kube_serving_node_tolerations'; - -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("mysql_user", "<%= node['ndb']['user'] %>"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("ndb_dir", "<%= node['ndb']['dir'] %>/mysql-cluster"); -REPLACE INTO `hopsworks`.`variables`(`id`, `value`) VALUES ("mysql_dir", "<%= node['mysql']['dir'] %>/mysql"); - - -DELETE FROM `hopsworks`.`variables` WHERE id="kibana_service_log_viewer"; - -DELETE FROM `hopsworks`.`variables` WHERE `id`='reject_remote_user_no_group'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='managed_cloud_redirect_uri'; - -DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_host'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_origin_scheme'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_www_address'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_session_timeout_minutes'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_logging_level'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_logger_type'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_log_file_max_size'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_dir'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_user'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_group'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_cran_repo'; -DELETE FROM `hopsworks`.`variables` WHERE `id`='rstudio_shutdown_timer_interval';