Remove a redundant and quite big index on exif_info.

diff --git a/sql/pr0n.sql b/sql/pr0n.sql
index 860fd475bf55fd9f2004bd535213907cacbb8b3e..4729a37cdd9e9b71dbf2b922bd19fee46e66469e 100644 (file)
--- a/sql/pr0n.sql
+++ b/sql/pr0n.sql
@@ -77,11 +77,10 @@ CREATE TABLE exif_info (
     key varchar NOT NULL,
     value varchar NOT NULL,
 
-    PRIMARY KEY ( image, key )
+    PRIMARY KEY ( key, image )
 );
 
-CREATE INDEX exif_info_key ON exif_info ( key );
-CLUSTER exif_info_key ON exif_info;
+CLUSTER exif_info_pkey ON exif_info;
 
 GRANT INSERT ON TABLE deleted_images TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE events TO pr0n;

diff --git a/sql/upgrade-v3.11.sql b/sql/upgrade-v3.11.sql
index 7996fead4ea8a3143058b31e2523c9064ce7c5ea..8f066aa1752b0ff98945d61212846d9e0c8414e1 100644 (file)
--- a/sql/upgrade-v3.11.sql
+++ b/sql/upgrade-v3.11.sql
@@ -1,3 +1,5 @@
+set work_mem to 1048576;
+
 alter table images add column is_render boolean NOT NULL DEFAULT false;
 alter table images add column render_id integer;
 CREATE UNIQUE INDEX unique_id_for_render ON images USING btree (vhost, event, id);
@@ -6,3 +8,8 @@ alter table images add check (NOT (is_render AND (render_id IS NOT NULL)));
 
 alter table deleted_images add column is_render boolean NOT NULL DEFAULT false;
 alter table deleted_images add column render_id integer;
+
+drop index exif_info_key;
+alter table exif_info drop constraint exif_info_pkey;
+alter table exif_info create primary key ( key, image );
+cluster exif_info_pkey on exif_info;