Skip to content

Commit

Permalink
Fixed Cacti#4531: Remove duplicate index
Browse files Browse the repository at this point in the history
  • Loading branch information
@ddb4github
ddb4github committed Apr 18, 2022
1 parent 0208d3e commit e5c46dc
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 17 deletions.
13 changes: 0 additions & 13 deletions docs/audit_schema.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,6 @@ INSERT INTO `table_indexes` VALUES ('data_local',1,'snmp_index',1,'snmp_index','
INSERT INTO `table_indexes` VALUES ('data_local',1,'snmp_query_id',1,'snmp_query_id','A',2,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('data_source_profiles',1,'name',1,'name','A',3,'171',NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('data_source_profiles',0,'PRIMARY',1,'id','A',3,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('data_source_profiles_cf',1,'data_source_profile_id',1,'data_source_profile_id','A',6,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('data_source_profiles_cf',0,'PRIMARY',1,'data_source_profile_id','A',6,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('data_source_profiles_cf',0,'PRIMARY',2,'consolidation_function_id','A',12,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('data_source_profiles_rra',1,'data_source_profile_id',1,'data_source_profile_id','A',6,NULL,NULL,'','BTREE','');
Expand Down Expand Up @@ -1185,7 +1184,6 @@ INSERT INTO `table_indexes` VALUES ('data_template_rrd',1,'data_template_id',1,'
INSERT INTO `table_indexes` VALUES ('data_template_rrd',0,'duplicate_dsname_contraint',1,'local_data_id','A',12,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('data_template_rrd',0,'duplicate_dsname_contraint',2,'data_source_name','A',123,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('data_template_rrd',0,'duplicate_dsname_contraint',3,'data_template_id','A',123,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('data_template_rrd',1,'local_data_id',1,'local_data_id','A',12,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('data_template_rrd',1,'local_data_template_rrd_id',1,'local_data_template_rrd_id','A',17,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('data_template_rrd',0,'PRIMARY',1,'id','A',123,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('external_links',0,'PRIMARY',1,'id','A',0,NULL,NULL,'','BTREE','');
Expand All @@ -1196,7 +1194,6 @@ INSERT INTO `table_indexes` VALUES ('graph_local',1,'snmp_index',1,'snmp_index',
INSERT INTO `table_indexes` VALUES ('graph_local',1,'snmp_query_graph_id',1,'snmp_query_graph_id','A',2,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('graph_local',1,'snmp_query_id',1,'snmp_query_id','A',2,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('graph_template_input',0,'PRIMARY',1,'id','A',139,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('graph_template_input_defs',1,'graph_template_input_id',1,'graph_template_input_id','A',316,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('graph_template_input_defs',0,'PRIMARY',1,'graph_template_input_id','A',316,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('graph_template_input_defs',0,'PRIMARY',2,'graph_template_item_id','A',633,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('graph_templates',1,'multiple_name',1,'multiple','A',2,NULL,NULL,'','BTREE','');
Expand Down Expand Up @@ -1239,7 +1236,6 @@ INSERT INTO `table_indexes` VALUES ('host',1,'poller_id_disabled',2,'disabled','
INSERT INTO `table_indexes` VALUES ('host',1,'poller_id_last_updated',1,'poller_id','A',1,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host',1,'poller_id_last_updated',2,'last_updated','A',1,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host',0,'PRIMARY',1,'id','A',1,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host',1,'site_id',1,'site_id','A',1,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host',1,'site_id_location',1,'site_id','A',1,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host',1,'site_id_location',2,'location','A',1,NULL,NULL,'YES','BTREE','');
INSERT INTO `table_indexes` VALUES ('host',1,'status',1,'status','A',1,NULL,NULL,'','BTREE','');
Expand All @@ -1257,15 +1253,12 @@ INSERT INTO `table_indexes` VALUES ('host_snmp_cache',0,'PRIMARY',3,'field_name'
INSERT INTO `table_indexes` VALUES ('host_snmp_cache',0,'PRIMARY',4,'snmp_index','A',6,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_snmp_cache',1,'snmp_index',1,'snmp_index','A',6,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_snmp_cache',1,'snmp_query_id',1,'snmp_query_id','A',2,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_snmp_query',1,'host_id',1,'host_id','A',1,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_snmp_query',0,'PRIMARY',1,'host_id','A',1,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_snmp_query',0,'PRIMARY',2,'snmp_query_id','A',1,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_template',1,'name',1,'name','A',6,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_template',0,'PRIMARY',1,'id','A',6,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_template_graph',1,'host_template_id',1,'host_template_id','A',12,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_template_graph',0,'PRIMARY',1,'host_template_id','A',12,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_template_graph',0,'PRIMARY',2,'graph_template_id','A',48,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_template_snmp_query',1,'host_template_id',1,'host_template_id','A',14,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_template_snmp_query',0,'PRIMARY',1,'host_template_id','A',14,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('host_template_snmp_query',0,'PRIMARY',2,'snmp_query_id','A',14,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('plugin_config',1,'directory',1,'directory','A',0,NULL,NULL,'','BTREE','');
Expand Down Expand Up @@ -1328,7 +1321,6 @@ INSERT INTO `table_indexes` VALUES ('poller_time',1,'poller_id_end_time',1,'poll
INSERT INTO `table_indexes` VALUES ('poller_time',1,'poller_id_end_time',2,'end_time','A',0,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('poller_time',0,'PRIMARY',1,'id','A',0,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('processes',1,'id',1,'id',NULL,0,NULL,NULL,'','HASH','');
INSERT INTO `table_indexes` VALUES ('processes',1,'pid',1,'pid',NULL,0,NULL,NULL,'','HASH','');
INSERT INTO `table_indexes` VALUES ('processes',0,'PRIMARY',1,'pid',NULL,NULL,NULL,NULL,'','HASH','');
INSERT INTO `table_indexes` VALUES ('processes',0,'PRIMARY',2,'tasktype',NULL,NULL,NULL,NULL,'','HASH','');
INSERT INTO `table_indexes` VALUES ('processes',0,'PRIMARY',3,'taskname',NULL,NULL,NULL,NULL,'','HASH','');
Expand Down Expand Up @@ -1364,7 +1356,6 @@ INSERT INTO `table_indexes` VALUES ('snmp_query_graph_rrd',1,'data_template_rrd_
INSERT INTO `table_indexes` VALUES ('snmp_query_graph_rrd',0,'PRIMARY',1,'snmp_query_graph_id','A',66,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmp_query_graph_rrd',0,'PRIMARY',2,'data_template_id','A',66,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmp_query_graph_rrd',0,'PRIMARY',3,'data_template_rrd_id','A',66,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmp_query_graph_rrd',1,'snmp_query_graph_id',1,'snmp_query_graph_id','A',66,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmp_query_graph_rrd_sv',1,'data_template_id',1,'data_template_id','A',18,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmp_query_graph_rrd_sv',0,'PRIMARY',1,'id','A',75,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmp_query_graph_rrd_sv',1,'snmp_query_graph_id',1,'snmp_query_graph_id','A',75,NULL,NULL,'','BTREE','');
Expand All @@ -1374,20 +1365,16 @@ INSERT INTO `table_indexes` VALUES ('snmpagent_cache',1,'mib_name',1,'mib','A',6
INSERT INTO `table_indexes` VALUES ('snmpagent_cache',1,'mib_name',2,'name','A',137,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_cache',1,'name',1,'name','A',137,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_cache',0,'PRIMARY',1,'oid','A',137,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_cache_notifications',1,'name',1,'name','A',17,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_cache_notifications',0,'PRIMARY',1,'name','A',17,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_cache_notifications',0,'PRIMARY',2,'mib','A',17,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_cache_notifications',0,'PRIMARY',3,'attribute','A',17,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_cache_notifications',0,'PRIMARY',4,'sequence_id','A',17,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_cache_textual_conventions',1,'mib',1,'mib','A',2,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_cache_textual_conventions',1,'name',1,'name','A',2,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_cache_textual_conventions',0,'PRIMARY',1,'name','A',2,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_cache_textual_conventions',0,'PRIMARY',2,'mib','A',2,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_cache_textual_conventions',0,'PRIMARY',3,'type','A',2,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_managers',1,'hostname',1,'hostname','A',0,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_managers',0,'PRIMARY',1,'id','A',0,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_managers_notifications',1,'manager_id_notification',1,'manager_id','A',0,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_managers_notifications',1,'manager_id_notification',2,'notification','A',0,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_managers_notifications',1,'mib',1,'mib','A',0,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_managers_notifications',0,'PRIMARY',1,'manager_id','A',0,NULL,NULL,'','BTREE','');
INSERT INTO `table_indexes` VALUES ('snmpagent_managers_notifications',0,'PRIMARY',2,'notification','A',0,NULL,NULL,'','BTREE','');
Expand Down
6 changes: 3 additions & 3 deletions install/upgrades/1_1_26.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ function upgrade_to_1_1_26() {
db_install_add_key('poller_output_realtime', 'key', 'time', array('time'));
db_install_add_key('poller_time', 'key', 'poller_id_end_time', array('poller_id', 'end_time'));

if (db_column_exists('poller_time', 'rrd_next_step')) {
db_install_add_key('poller_time', 'key', 'poller_id_rrd_next_step', array('poller_id', 'rrd_next_step'));
if (db_column_exists('poller_item', 'rrd_next_step')) {
db_install_add_key('poller_item', 'key', 'poller_id_rrd_next_step', array('poller_id', 'rrd_next_step'));
}

if (db_column_exists('poller_item', 'rrd_next_step')) {
db_install_add_key('poller_item', 'key', 'rrd_next_step', array('rrd_next_step'));
db_install_drop_key('poller_item', 'key', 'rrd_next_step');
}
}
2 changes: 1 addition & 1 deletion install/upgrades/1_1_28.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ function upgrade_to_1_1_28() {
db_install_add_key('poller', 'index', 'disabled', array('disabled'));
db_install_drop_key('host', 'key', 'poller_id');
db_install_add_key('host', 'index', 'poller_id_disabled', array('poller_id', 'disabled'));
db_install_add_key('poller_item', 'index', 'local_data_id', array('local_data_id'));
db_install_drop_key('poller_item', 'index', 'local_data_id');
db_install_add_key('poller_item', 'index', 'poller_id_action', array('poller_id', 'action'));
}
41 changes: 41 additions & 0 deletions install/upgrades/1_2_21.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php
/*
+-------------------------------------------------------------------------+
| Copyright (C) 2004-2022 The Cacti Group |
| |
| This program is free software; you can redistribute it and/or |
| modify it under the terms of the GNU General Public License |
| as published by the Free Software Foundation; either version 2 |
| of the License, or (at your option) any later version. |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
+-------------------------------------------------------------------------+
| Cacti: The Complete RRDTool-based Graphing Solution |
+-------------------------------------------------------------------------+
| This code is designed, written, and maintained by the Cacti Group. See |
| about.php and/or the AUTHORS file for specific developer information. |
+-------------------------------------------------------------------------+
| http://www.cacti.net/ |
+-------------------------------------------------------------------------+
*/

function upgrade_to_1_2_21() {
global $config;

db_install_drop_key('data_source_profiles_cf', 'index', 'data_source_profile_id');
db_install_drop_key('data_template_rrd', 'index', 'local_data_id');
db_install_drop_key('graph_template_input_defs', 'index', 'graph_template_input_id');
db_install_drop_key('host', 'index', 'site_id');
db_install_drop_key('host_snmp_query', 'index', 'host_id');
db_install_drop_key('host_template_graph', 'index', 'host_template_id');
db_install_drop_key('host_template_snmp_query', 'index', 'host_template_id');
db_install_drop_key('processes', 'index', 'pid');
db_install_drop_key('snmpagent_cache_notifications', 'index', 'name');
db_install_drop_key('snmpagent_cache_textual_conventions', 'index', 'name');
db_install_drop_key('snmpagent_managers_notifications', 'index', 'manager_id_notification');
db_install_drop_key('snmp_query_graph_rrd', 'index', 'snmp_query_graph_id');
}

0 comments on commit e5c46dc

Please sign in to comment.