Repository: incubator-ranger Updated Branches: refs/heads/master 6b03a286b -> 1a68c9586
RANGER-1308 : Remove DEFAULT CHARSET 'latin1' from ranger db schema script to enable support of unicode or any other charset Signed-off-by: Velmurugan Periasamy <v...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/c19ec875 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/c19ec875 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/c19ec875 Branch: refs/heads/master Commit: c19ec875742665ab96577f5a27ebac2da036d3bc Parents: 6b03a28 Author: pradeep agrawal <pradeep.agra...@freestoneinfotech.com> Authored: Mon Jan 16 12:46:18 2017 +0530 Committer: Velmurugan Periasamy <v...@apache.org> Committed: Fri Jan 20 20:25:27 2017 -0500 ---------------------------------------------------------------------- kms/scripts/db/mysql/kms_core_db.sql | 4 +- .../mysql/patches/008-removeTrailingSlash.sql | 2 +- .../db/mysql/patches/009-updated_schema.sql | 40 ++++++++++---------- .../db/mysql/patches/013-permissionmodel.sql | 6 +-- .../016-updated-schema-for-tag-based-policy.sql | 16 ++++---- .../db/mysql/patches/020-datamask-policy.sql | 6 +-- .../mysql/patches/022-split-service-table.sql | 2 +- .../025-create-schema-for-plugin-info.sql | 2 +- security-admin/db/mysql/xa_core_db.sql | 35 ++++++++--------- 9 files changed, 55 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c19ec875/kms/scripts/db/mysql/kms_core_db.sql ---------------------------------------------------------------------- diff --git a/kms/scripts/db/mysql/kms_core_db.sql b/kms/scripts/db/mysql/kms_core_db.sql index 1177595..f753f7e 100644 --- a/kms/scripts/db/mysql/kms_core_db.sql +++ b/kms/scripts/db/mysql/kms_core_db.sql @@ -24,7 +24,7 @@ CREATE TABLE `ranger_masterkey` ( `bitlength` int DEFAULT NULL , `masterkey` varchar(2048), PRIMARY KEY ( `id` ) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `ranger_keystore`; CREATE TABLE `ranger_keystore` ( @@ -42,4 +42,4 @@ CREATE TABLE `ranger_keystore` ( `kms_attributes` varchar(1024) DEFAULT NULL, `kms_encoded`varchar(2048), PRIMARY KEY (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c19ec875/security-admin/db/mysql/patches/008-removeTrailingSlash.sql ---------------------------------------------------------------------- diff --git a/security-admin/db/mysql/patches/008-removeTrailingSlash.sql b/security-admin/db/mysql/patches/008-removeTrailingSlash.sql index 2e00f5f..c29a786 100644 --- a/security-admin/db/mysql/patches/008-removeTrailingSlash.sql +++ b/security-admin/db/mysql/patches/008-removeTrailingSlash.sql @@ -20,7 +20,7 @@ DELIMITER $$ DROP FUNCTION if exists removeTrailingSlash $$ -CREATE FUNCTION `removeTrailingSlash`(resName varchar(4000), resId bigint, assetId bigint, policyName varchar(1000)) RETURNS varchar(4000) CHARSET latin1 +CREATE FUNCTION `removeTrailingSlash`(resName varchar(4000), resId bigint, assetId bigint, policyName varchar(1000)) RETURNS varchar(4000) BEGIN DECLARE noOfCommas int; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c19ec875/security-admin/db/mysql/patches/009-updated_schema.sql ---------------------------------------------------------------------- diff --git a/security-admin/db/mysql/patches/009-updated_schema.sql b/security-admin/db/mysql/patches/009-updated_schema.sql index 78c7006..14ec1d8 100644 --- a/security-admin/db/mysql/patches/009-updated_schema.sql +++ b/security-admin/db/mysql/patches/009-updated_schema.sql @@ -39,7 +39,7 @@ KEY `x_service_def_cr_time` (`create_time`), KEY `x_service_def_up_time` (`update_time`), CONSTRAINT `x_service_def_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_service_def_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_service`; @@ -67,7 +67,7 @@ KEY `x_service_type` (`type`), CONSTRAINT `x_service_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_service_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_service_FK_type` FOREIGN KEY (`type`) REFERENCES `x_service_def` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_policy`; CREATE TABLE `x_policy` ( @@ -95,7 +95,7 @@ KEY `x_policy_resource_signature` (`resource_signature`), CONSTRAINT `x_policy_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_FK_service` FOREIGN KEY (`service`) REFERENCES `x_service` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_service_config_def`; @@ -126,7 +126,7 @@ primary key (`id`), CONSTRAINT `x_service_config_def_FK_defid` FOREIGN KEY (`def_id`) REFERENCES `x_service_def` (`id`), CONSTRAINT `x_service_config_def_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_service_config_def_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_resource_def`; @@ -164,7 +164,7 @@ CONSTRAINT `x_resource_def_FK_parent` FOREIGN KEY (`parent`) REFERENCES `x_resou CONSTRAINT `x_resource_def_FK_defid` FOREIGN KEY (`def_id`) REFERENCES `x_service_def` (`id`), CONSTRAINT `x_resource_def_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_resource_def_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_access_type_def`; CREATE TABLE `x_access_type_def` ( @@ -184,7 +184,7 @@ primary key (`id`) , CONSTRAINT `x_access_type_def_FK_defid` FOREIGN KEY (`def_id`) REFERENCES `x_service_def` (`id`), CONSTRAINT `x_access_type_def_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_access_type_def_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_access_type_def_grants`; CREATE TABLE `x_access_type_def_grants` ( @@ -200,7 +200,7 @@ primary key (`id`), CONSTRAINT `x_atd_grants_FK_atdid` FOREIGN KEY (`atd_id`) REFERENCES `x_access_type_def` (`id`), CONSTRAINT `x_atd_grants_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_atd_grants_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_policy_condition_def`; CREATE TABLE `x_policy_condition_def` ( @@ -228,7 +228,7 @@ primary key (`id`) , CONSTRAINT `x_policy_condition_def_FK_defid` FOREIGN KEY (`def_id`) REFERENCES `x_service_def` (`id`), CONSTRAINT `x_policy_condition_def_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_condition_def_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_context_enricher_def`; CREATE TABLE `x_context_enricher_def` ( @@ -248,7 +248,7 @@ primary key (`id`) , CONSTRAINT `x_context_enricher_def_FK_defid` FOREIGN KEY (`def_id`) REFERENCES `x_service_def` (`id`), CONSTRAINT `x_context_enricher_def_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_context_enricher_def_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_enum_def`; CREATE TABLE `x_enum_def` ( @@ -266,7 +266,7 @@ primary key (`id`), CONSTRAINT `x_enum_def_FK_defid` FOREIGN KEY (`def_id`) REFERENCES `x_service_def` (`id`), CONSTRAINT `x_enum_def_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_enum_def_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_enum_element_def`; @@ -287,7 +287,7 @@ primary key (`id`), CONSTRAINT `x_enum_element_def_FK_defid` FOREIGN KEY (`enum_def_id`) REFERENCES `x_enum_def` (`id`), CONSTRAINT `x_enum_element_def_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_enum_element_def_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_service_config_map`; @@ -305,7 +305,7 @@ primary key (`id`), CONSTRAINT `x_service_config_map_FK_` FOREIGN KEY (`service`) REFERENCES `x_service` (`id`), CONSTRAINT `x_service_config_map_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_service_config_map_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_policy_resource`; @@ -325,7 +325,7 @@ CONSTRAINT `x_policy_resource_FK_policy_id` FOREIGN KEY (`policy_id`) REFERENCES CONSTRAINT `x_policy_resource_FK_res_def_id` FOREIGN KEY (`res_def_id`) REFERENCES `x_resource_def` (`id`), CONSTRAINT `x_policy_resource_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_resource_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_policy_resource_map`; @@ -343,7 +343,7 @@ primary key (`id`), CONSTRAINT `x_policy_resource_map_FK_resource_id` FOREIGN KEY (`resource_id`) REFERENCES `x_policy_resource` (`id`), CONSTRAINT `x_policy_resource_map_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_resource_map_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; @@ -362,7 +362,7 @@ primary key (`id`), CONSTRAINT `x_policy_item_FK_policy_id` FOREIGN KEY (`policy_id`) REFERENCES `x_policy` (`id`), CONSTRAINT `x_policy_item_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_item_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_policy_item_access`; @@ -382,7 +382,7 @@ CONSTRAINT `x_policy_item_access_FK_pi_id` FOREIGN KEY (`policy_item_id`) REFERE CONSTRAINT `x_policy_item_access_FK_atd_id` FOREIGN KEY (`type`) REFERENCES `x_access_type_def` (`id`), CONSTRAINT `x_policy_item_access_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_item_access_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_policy_item_condition`; CREATE TABLE `x_policy_item_condition` ( @@ -401,7 +401,7 @@ CONSTRAINT `x_policy_item_condition_FK_pi_id` FOREIGN KEY (`policy_item_id`) REF CONSTRAINT `x_policy_item_condition_FK_pcd_id` FOREIGN KEY (`type`) REFERENCES `x_policy_condition_def` (`id`), CONSTRAINT `x_policy_item_condition_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_item_condition_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_policy_item_user_perm`; CREATE TABLE `x_policy_item_user_perm` ( @@ -419,7 +419,7 @@ CONSTRAINT `x_policy_item_user_perm_FK_pi_id` FOREIGN KEY (`policy_item_id`) REF CONSTRAINT `x_policy_item_user_perm_FK_user_id` FOREIGN KEY (`user_id`) REFERENCES `x_user` (`id`), CONSTRAINT `x_policy_item_user_perm_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_item_user_perm_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_policy_item_group_perm`; @@ -438,7 +438,7 @@ CONSTRAINT `x_policy_item_group_perm_FK_pi_id` FOREIGN KEY (`policy_item_id`) RE CONSTRAINT `x_policy_item_group_perm_FK_group_id` FOREIGN KEY (`group_id`) REFERENCES `x_group` (`id`), CONSTRAINT `x_policy_item_group_perm_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_item_group_perm_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_data_hist`; CREATE TABLE `x_data_hist` ( @@ -455,5 +455,5 @@ CREATE TABLE `x_data_hist` ( `to_time` datetime DEFAULT NULL, `content` text NOT NULL, primary key (`id`) -); +)ROW_FORMAT=DYNAMIC; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c19ec875/security-admin/db/mysql/patches/013-permissionmodel.sql ---------------------------------------------------------------------- diff --git a/security-admin/db/mysql/patches/013-permissionmodel.sql b/security-admin/db/mysql/patches/013-permissionmodel.sql index ffd261b..381bb6f 100644 --- a/security-admin/db/mysql/patches/013-permissionmodel.sql +++ b/security-admin/db/mysql/patches/013-permissionmodel.sql @@ -23,7 +23,7 @@ CREATE TABLE `x_modules_master` ( `module` varchar(1024) NOT NULL, `url` varchar(1024) NULL DEFAULT NULL, PRIMARY KEY (`id`) -); +)ROW_FORMAT=DYNAMIC; INSERT INTO `x_modules_master` VALUES (1,now(),now(),1,1,'Resource Based Policies',''),(2,now(),now(),1,1,'Users/Groups',''),(3,now(),now(),1,1,'Reports',''),(4,now(),now(),1,1,'Audit',''),(5,now(),now(),1,1,'Key Manager',''); @@ -42,7 +42,7 @@ KEY `x_user_module_perm_idx_module_id` (`module_id`), KEY `x_user_module_perm_idx_user_id` (`user_id`), CONSTRAINT `x_user_module_perm_FK_module_id` FOREIGN KEY (`module_id`) REFERENCES `x_modules_master` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `x_user_module_perm_FK_user_id` FOREIGN KEY (`user_id`) REFERENCES `x_portal_user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ; +)ROW_FORMAT=DYNAMIC; DROP TABLE IF EXISTS `x_group_module_perm`; CREATE TABLE `x_group_module_perm` ( @@ -59,4 +59,4 @@ KEY `x_group_module_perm_idx_group_id` (`group_id`), KEY `x_group_module_perm_idx_module_id` (`module_id`), CONSTRAINT `x_group_module_perm_FK_module_id` FOREIGN KEY (`module_id`) REFERENCES `x_modules_master` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `x_group_module_perm_FK_user_id` FOREIGN KEY (`group_id`) REFERENCES `x_group` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ; +)ROW_FORMAT=DYNAMIC; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c19ec875/security-admin/db/mysql/patches/016-updated-schema-for-tag-based-policy.sql ---------------------------------------------------------------------- diff --git a/security-admin/db/mysql/patches/016-updated-schema-for-tag-based-policy.sql b/security-admin/db/mysql/patches/016-updated-schema-for-tag-based-policy.sql index b86ae10..86b17bc 100644 --- a/security-admin/db/mysql/patches/016-updated-schema-for-tag-based-policy.sql +++ b/security-admin/db/mysql/patches/016-updated-schema-for-tag-based-policy.sql @@ -42,7 +42,7 @@ KEY `x_tag_def_IDX_added_by_id` (`added_by_id`), KEY `x_tag_def_IDX_upd_by_id` (`upd_by_id`), CONSTRAINT `x_tag_def_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_tag_def_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; -- ----------------------------------------------------- -- Table `x_tag` -- ----------------------------------------------------- @@ -63,7 +63,7 @@ KEY `x_tag_IDX_upd_by_id` (`upd_by_id`), CONSTRAINT `x_tag_FK_type` FOREIGN KEY (`type`) REFERENCES `x_tag_def` (`id`), CONSTRAINT `x_tag_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_tag_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; -- ----------------------------------------------------- -- Table `x_service_resource` -- ----------------------------------------------------- @@ -85,7 +85,7 @@ KEY `x_service_res_IDX_upd_by_id` (`upd_by_id`), CONSTRAINT `x_service_res_FK_service_id` FOREIGN KEY (`service_id`) REFERENCES `x_service` (`id`), CONSTRAINT `x_service_res_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_service_res_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; -- ----------------------------------------------------- -- Table `x_service_resource_element` -- ----------------------------------------------------- @@ -106,7 +106,7 @@ CONSTRAINT `x_srvc_res_el_FK_res_def_id` FOREIGN KEY (`res_def_id`) REFERENCES ` CONSTRAINT `x_srvc_res_el_FK_res_id` FOREIGN KEY (`res_id`) REFERENCES `x_service_resource` (`id`), CONSTRAINT `x_srvc_res_el_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_srvc_res_el_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; -- ----------------------------------------------------- -- Table `x_tag_attr_def` -- ----------------------------------------------------- @@ -126,7 +126,7 @@ KEY `x_tag_attr_def_IDX_upd_by_id` (`upd_by_id`), CONSTRAINT `x_tag_attr_def_FK_tag_def_id` FOREIGN KEY (`tag_def_id`) REFERENCES `x_tag_def` (`id`), CONSTRAINT `x_tag_attr_def_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_tag_attr_def_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; -- ----------------------------------------------------- -- Table `x_tag_attr` -- ----------------------------------------------------- @@ -146,7 +146,7 @@ KEY `x_tag_attr_IDX_upd_by_id` (`upd_by_id`), CONSTRAINT `x_tag_attr_FK_tag_id` FOREIGN KEY (`tag_id`) REFERENCES `x_tag` (`id`), CONSTRAINT `x_tag_attr_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_tag_attr_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; -- ----------------------------------------------------- -- Table `x_tag_resource_map` -- ----------------------------------------------------- @@ -169,7 +169,7 @@ CONSTRAINT `x_tag_res_map_FK_tag_id` FOREIGN KEY (`tag_id`) REFERENCES `x_tag` ( CONSTRAINT `x_tag_res_map_FK_res_id` FOREIGN KEY (`res_id`) REFERENCES `x_service_resource` (`id`), CONSTRAINT `x_tag_res_map_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_tag_res_map_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; -- ----------------------------------------------------- -- Table `x_service_resource_element_val` -- ----------------------------------------------------- @@ -189,7 +189,7 @@ KEY `x_srvc_res_el_val_IDX_updby_id` (`upd_by_id`), CONSTRAINT `x_srvc_res_el_val_FK_res_el_id` FOREIGN KEY (`res_element_id`) REFERENCES `x_service_resource_element` (`id`), CONSTRAINT `x_srvc_res_el_val_FK_add_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_srvc_res_el_val_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; INSERT INTO `x_modules_master` VALUES (6,now(),now(),1,1,'Tag Based Policies',''); -- --------------------------------------- -- add column in x_service_def.def_options http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c19ec875/security-admin/db/mysql/patches/020-datamask-policy.sql ---------------------------------------------------------------------- diff --git a/security-admin/db/mysql/patches/020-datamask-policy.sql b/security-admin/db/mysql/patches/020-datamask-policy.sql index ac5f404..87c0a18 100644 --- a/security-admin/db/mysql/patches/020-datamask-policy.sql +++ b/security-admin/db/mysql/patches/020-datamask-policy.sql @@ -73,7 +73,7 @@ primary key (`id`), CONSTRAINT `x_datamask_type_def_FK_def_id` FOREIGN KEY (`def_id`) REFERENCES `x_service_def` (`id`) , CONSTRAINT `x_datamask_type_def_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_datamask_type_def_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; CREATE INDEX x_datamask_type_def_IDX_def_id ON x_datamask_type_def(def_id); DROP TABLE IF EXISTS `x_policy_item_datamask`; @@ -93,7 +93,7 @@ CONSTRAINT `x_policy_item_datamask_FK_policy_item_id` FOREIGN KEY (`policy_item_ CONSTRAINT `x_policy_item_datamask_FK_type` FOREIGN KEY (`type`) REFERENCES `x_datamask_type_def` (`id`), CONSTRAINT `x_policy_item_datamask_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_item_datamask_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; CREATE INDEX x_policy_item_datamask_IDX_policy_item_id ON x_policy_item_datamask(policy_item_id); DROP TABLE IF EXISTS `x_policy_item_rowfilter`; @@ -110,5 +110,5 @@ primary key (id), CONSTRAINT `x_policy_item_rowfilter_FK_policy_item_id` FOREIGN KEY (`policy_item_id`) REFERENCES `x_policy_item` (`id`) , CONSTRAINT `x_policy_item_rowfilter_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_item_rowfilter_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -); +)ROW_FORMAT=DYNAMIC; CREATE INDEX x_policy_item_rowfilter_IDX_policy_item_id ON x_policy_item_rowfilter(policy_item_id); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c19ec875/security-admin/db/mysql/patches/022-split-service-table.sql ---------------------------------------------------------------------- diff --git a/security-admin/db/mysql/patches/022-split-service-table.sql b/security-admin/db/mysql/patches/022-split-service-table.sql index d99bfc1..5b4fc90 100644 --- a/security-admin/db/mysql/patches/022-split-service-table.sql +++ b/security-admin/db/mysql/patches/022-split-service-table.sql @@ -24,6 +24,6 @@ CREATE TABLE `x_service_version_info` ( `tag_update_time` datetime NULL DEFAULT NULL, primary key (`id`), CONSTRAINT `x_service_version_info_FK_service_id` FOREIGN KEY (`service_id`) REFERENCES `x_service` (`id`) -); +)ROW_FORMAT=DYNAMIC; CREATE INDEX x_service_version_info_IDX_service_id ON x_service_version_info(service_id); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c19ec875/security-admin/db/mysql/patches/025-create-schema-for-plugin-info.sql ---------------------------------------------------------------------- diff --git a/security-admin/db/mysql/patches/025-create-schema-for-plugin-info.sql b/security-admin/db/mysql/patches/025-create-schema-for-plugin-info.sql index 85d1f0a..bb46526 100644 --- a/security-admin/db/mysql/patches/025-create-schema-for-plugin-info.sql +++ b/security-admin/db/mysql/patches/025-create-schema-for-plugin-info.sql @@ -29,5 +29,5 @@ CREATE TABLE IF NOT EXISTS `x_plugin_info`( UNIQUE KEY `x_plugin_info_UK`(`service_name`, `host_name`, `app_type`), KEY `x_plugin_info_IDX_service_name`(`service_name`), KEY `x_plugin_info_IDX_host_name`(`host_name`) -); +)ROW_FORMAT=DYNAMIC; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c19ec875/security-admin/db/mysql/xa_core_db.sql ---------------------------------------------------------------------- diff --git a/security-admin/db/mysql/xa_core_db.sql b/security-admin/db/mysql/xa_core_db.sql index dcfce4d..9a22e2c 100644 --- a/security-admin/db/mysql/xa_core_db.sql +++ b/security-admin/db/mysql/xa_core_db.sql @@ -87,7 +87,7 @@ CREATE TABLE `x_asset` ( KEY `x_asset_up_time` (`update_time`), CONSTRAINT `x_asset_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_asset_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -129,7 +129,7 @@ CREATE TABLE `x_audit_map` ( CONSTRAINT `x_audit_map_FK_res_id` FOREIGN KEY (`res_id`) REFERENCES `x_resource` (`id`), CONSTRAINT `x_audit_map_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_audit_map_FK_user_id` FOREIGN KEY (`user_id`) REFERENCES `x_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -173,7 +173,7 @@ CREATE TABLE `x_auth_sess` ( CONSTRAINT `x_auth_sess_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_auth_sess_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_auth_sess_FK_user_id` FOREIGN KEY (`user_id`) REFERENCES `x_portal_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -207,7 +207,7 @@ CREATE TABLE `x_cred_store` ( KEY `x_cred_store_up_time` (`update_time`), CONSTRAINT `x_cred_store_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_cred_store_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -239,7 +239,7 @@ CREATE TABLE `x_db_base` ( KEY `x_db_base_up_time` (`update_time`), CONSTRAINT `x_db_base_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_db_base_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -278,7 +278,7 @@ CREATE TABLE `x_group` ( CONSTRAINT `x_group_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_group_FK_cred_store_id` FOREIGN KEY (`cred_store_id`) REFERENCES `x_cred_store` (`id`), CONSTRAINT `x_group_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -317,7 +317,7 @@ CREATE TABLE `x_group_groups` ( CONSTRAINT `x_group_groups_FK_group_id` FOREIGN KEY (`group_id`) REFERENCES `x_group` (`id`), CONSTRAINT `x_group_groups_FK_p_group_id` FOREIGN KEY (`p_group_id`) REFERENCES `x_group` (`id`), CONSTRAINT `x_group_groups_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -356,7 +356,7 @@ CREATE TABLE `x_group_users` ( CONSTRAINT `x_group_users_FK_p_group_id` FOREIGN KEY (`p_group_id`) REFERENCES `x_group` (`id`), CONSTRAINT `x_group_users_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_group_users_FK_user_id` FOREIGN KEY (`user_id`) REFERENCES `x_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -403,7 +403,7 @@ CREATE TABLE `x_perm_map` ( CONSTRAINT `x_perm_map_FK_res_id` FOREIGN KEY (`res_id`) REFERENCES `x_resource` (`id`), CONSTRAINT `x_perm_map_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_perm_map_FK_user_id` FOREIGN KEY (`user_id`) REFERENCES `x_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -442,7 +442,7 @@ CREATE TABLE `x_policy_export_audit` ( KEY `x_policy_export_audit_up_time` (`update_time`), CONSTRAINT `x_policy_export_audit_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_policy_export_audit_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -487,7 +487,7 @@ CREATE TABLE `x_portal_user` ( KEY `x_portal_user_email` (`email`), CONSTRAINT `x_portal_user_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_portal_user_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -)AUTO_INCREMENT=2 DEFAULT CHARSET=latin1; +)AUTO_INCREMENT=2 ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -525,7 +525,7 @@ CREATE TABLE `x_portal_user_role` ( CONSTRAINT `x_portal_user_role_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_portal_user_role_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_portal_user_role_FK_user_id` FOREIGN KEY (`user_id`) REFERENCES `x_portal_user` (`id`) -)AUTO_INCREMENT=2 DEFAULT CHARSET=latin1; +)AUTO_INCREMENT=2 ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -579,7 +579,7 @@ CREATE TABLE `x_resource` ( CONSTRAINT `x_resource_FK_asset_id` FOREIGN KEY (`asset_id`) REFERENCES `x_asset` (`id`), CONSTRAINT `x_resource_FK_parent_id` FOREIGN KEY (`parent_id`) REFERENCES `x_resource` (`id`), CONSTRAINT `x_resource_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -625,7 +625,7 @@ CREATE TABLE `x_trx_log` ( KEY `x_trx_log_up_time` (`update_time`), CONSTRAINT `x_trx_log_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_trx_log_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -663,7 +663,7 @@ CREATE TABLE `x_user` ( CONSTRAINT `x_user_FK_added_by_id` FOREIGN KEY (`added_by_id`) REFERENCES `x_portal_user` (`id`), CONSTRAINT `x_user_FK_cred_store_id` FOREIGN KEY (`cred_store_id`) REFERENCES `x_cred_store` (`id`), CONSTRAINT `x_user_FK_upd_by_id` FOREIGN KEY (`upd_by_id`) REFERENCES `x_portal_user` (`id`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -712,7 +712,7 @@ CREATE TABLE `xa_access_audit` ( KEY `xa_access_audit_cr_time` (`create_time`), KEY `xa_access_audit_up_time` (`update_time`), KEY `xa_access_audit_event_time` (`event_time`) -)DEFAULT CHARSET=latin1; +)ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -733,9 +733,6 @@ UNLOCK TABLES; /*!50001 SET @saved_cs_client = @@character_set_client */; /*!50001 SET @saved_cs_results = @@character_set_results */; /*!50001 SET @saved_col_connection = @@collation_connection */; -/*!50001 SET character_set_client = latin1 */; -/*!50001 SET character_set_results = latin1 */; -/*!50001 SET collation_connection = latin1_swedish_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50001 VIEW `vx_trx_log` AS select `x_trx_log`.`id` AS `id`,`x_trx_log`.`create_time` AS `create_time`,`x_trx_log`.`update_time` AS `update_time`,`x_trx_log`.`added_by_id` AS `added_by_id`,`x_trx_log`.`upd_by_id` AS `upd_by_id`,`x_trx_log`.`class_type` AS `class_type`,`x_trx_log`.`object_id` AS `object_id`,`x_trx_log`.`parent_object_id` AS `parent_object_id`,`x_trx_log`.`parent_object_class_type` AS `parent_object_class_type`,`x_trx_log`.`attr_name` AS `attr_name`,`x_trx_log`.`parent_object_name` AS `parent_object_name`,`x_trx_log`.`object_name` AS `object_name`,`x_trx_log`.`prev_val` AS `prev_val`,`x_trx_log`.`new_val` AS `new_val`,`x_trx_log`.`trx_id` AS `trx_id`,`x_trx_log`.`action` AS `action`,`x_trx_log`.`sess_id` AS `sess_id`,`x_trx_log`.`req_id` AS `req_id`,`x_trx_log`.`sess_type` AS `sess_type` from `x_trx_log` group by `x_trx_log`.`trx_id` */; /*!50001 SET character_set_client = @saved_cs_client */;