[5469] Restored (subnet_id, lease_type) composite indexes

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 921e4670f77bfd4bfc234cd756c6ae6ba298ef7d..b1cdd1d05883f60f2ee61d97db4bda20691afa3c 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -514,9 +514,7 @@ ALTER TABLE dhcp6_options ADD COLUMN user_context TEXT NULL;
 CREATE INDEX lease4_by_subnet_id ON lease4 (subnet_id);
 
 # Create for searching leases by subnet identifier and lease type.
-#CREATE INDEX lease6_by_subnet_id_lease_type ON lease6 (subnet_id, lease_type);
-# Create for searching leases by subnet identifier.
-CREATE INDEX lease6_by_subnet_id ON lease6 (subnet_id);
+CREATE INDEX lease6_by_subnet_id_lease_type ON lease6 (subnet_id, lease_type);
 
 # Update the schema version number
 UPDATE schema_version

diff --git a/src/share/database/scripts/mysql/upgrade_5.1_to_6.0.sh.in b/src/share/database/scripts/mysql/upgrade_5.1_to_6.0.sh.in
index 96af0278843df1666b980f38a723b0a6a36d75a1..c4e78091289abf4d3bffdbfb66c9e4f163fa5857 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_5.1_to_6.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_5.1_to_6.0.sh.in
@@ -28,9 +28,7 @@ ALTER TABLE dhcp6_options ADD COLUMN user_context TEXT NULL;
 CREATE INDEX lease4_by_subnet_id ON lease4 (subnet_id);
 
 # Create for searching leases by subnet identifier and lease type.
-#CREATE INDEX lease6_by_subnet_id_lease_type ON lease6 (subnet_id, lease_type);
-# Create for searching leases by subnet identifier.
-CREATE INDEX lease6_by_subnet_id ON lease6 (subnet_id);
+CREATE INDEX lease6_by_subnet_id_lease_type ON lease6 (subnet_id, lease_type);
 
 # Update the schema version number
 UPDATE schema_version

diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index 4414bd6a039d46213193014b958f249ed31ce777..90d1aed7da55cc0eb40bc9b00fe514009d4d0213 100644 (file)
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -541,9 +541,7 @@ ALTER TABLE dhcp6_options ADD COLUMN user_context TEXT;
 CREATE INDEX lease4_by_subnet_id ON lease4 (subnet_id);
 
 -- Create for searching leases by subnet identifier and lease type.
--- CREATE INDEX lease6_by_subnet_id_lease_type ON lease6 (subnet_id, lease_type);
--- Create for searching leases by subnet identifier.
-CREATE INDEX lease6_by_subnet_id ON lease6 (subnet_id);
+CREATE INDEX lease6_by_subnet_id_lease_type ON lease6 (subnet_id, lease_type);
 
 -- Set 4.0 schema version.
 UPDATE schema_version

diff --git a/src/share/database/scripts/pgsql/upgrade_3.2_to_4.0.sh.in b/src/share/database/scripts/pgsql/upgrade_3.2_to_4.0.sh.in
index 236f8e312e4796aa764abee89135ad1c02b246d1..c20e114f2a344cef067ff9a27b80439c4557d793 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_3.2_to_4.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_3.2_to_4.0.sh.in
@@ -30,9 +30,7 @@ ALTER TABLE dhcp6_options ADD COLUMN user_context TEXT;
 CREATE INDEX lease4_by_subnet_id ON lease4 (subnet_id);
 
 -- Create for searching leases by subnet identifier and lease type.
--- CREATE INDEX lease6_by_subnet_id_lease_type ON lease6 (subnet_id, lease_type);
--- Create for searching leases by subnet identifier.
-CREATE INDEX lease6_by_subnet_id ON lease6 (subnet_id);
+CREATE INDEX lease6_by_subnet_id_lease_type ON lease6 (subnet_id, lease_type);
 
 -- Set 4.0 schema version.
 UPDATE schema_version