[#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 9187f8710f2f44c39f3f9ba811aec33736309aa3..f24e086a6ef70050e0ec73fb5ebbee45968ddb8d 100644 (file)
--- 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 020edca5fe4ed2486089bff9f75e87c03175057c..bb45b9e732b6eb65cb2acb43777453651eee3dd5 100644 (file)
--- 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.