From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 22 Jul 2022 13:28:43 +0000 (-0400)
Subject: [#2452] Addressed review comments
X-Git-Tag: Kea-2.2.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31e1f836e714c3da56f99cdadb6c8340b08c8b08;p=thirdparty%2Fkea.git

[#2452] Addressed review comments

share/database/scripts/pgsql/dhcpdb_create.pgsql
share/database/scripts/pgsql/upgrade_012_to_013.sh.in
    Removed extraneous index
---

diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index 9187f8710f..f24e086a6e 100644
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -5605,10 +5605,8 @@ END;
 $$ LANGUAGE plpgsql;
 
 -- Improve hosts indexes for better performance of global reservations
--- Create new index that uses only dhcp4_identifier.
-CREATE INDEX key_dhcp4_identifier on hosts (dhcp_identifier, dhcp_identifier_type);
--- Create new index that uses only dhcp4_identifier.
-CREATE INDEX key_dhcp6_identifier on hosts (dhcp_identifier, dhcp_identifier_type);
+-- Create new index that uses only dhcp_identifier.
+CREATE INDEX key_dhcp_identifier on hosts (dhcp_identifier, dhcp_identifier_type);
 
 -- Modify existing indexes to include subnet_id values of 0, so index is also used
 -- for global reservations.
diff --git a/src/share/database/scripts/pgsql/upgrade_012_to_013.sh.in b/src/share/database/scripts/pgsql/upgrade_012_to_013.sh.in
index 020edca5fe..bb45b9e732 100644
--- a/src/share/database/scripts/pgsql/upgrade_012_to_013.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_012_to_013.sh.in
@@ -654,10 +654,8 @@ END;
 \$\$ LANGUAGE plpgsql;
 
 -- Improve hosts indexes for better performance of global reservations
--- Create new index that uses only dhcp4_identifier.
-CREATE INDEX key_dhcp4_identifier on hosts (dhcp_identifier, dhcp_identifier_type);
--- Create new index that uses only dhcp4_identifier.
-CREATE INDEX key_dhcp6_identifier on hosts (dhcp_identifier, dhcp_identifier_type);
+-- Create new index that uses only dhcp_identifier.
+CREATE INDEX key_dhcp_identifier on hosts (dhcp_identifier, dhcp_identifier_type);
 
 -- Modify existing indexes to include subnet_id values of 0, so index is also used
 -- for global reservations.