Add index modification in update_sqlite/sqlite3/postgresql scripts

diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in
index 87381c29f26cc4cd42466460b1c7f05c5b61134c..756c4412d6f4dfa721effe27c0e02ba2db559b10 100644 (file)
--- a/bacula/src/cats/update_postgresql_tables.in
+++ b/bacula/src/cats/update_postgresql_tables.in
@@ -29,6 +29,13 @@ CREATE INDEX jobhisto_idx ON JobHisto ( starttime );
 UPDATE Version SET VersionId=11;
 COMMIT;
 
+BEGIN;
+-- Replace the broken file_fp_idx by a better one
+DROP INDEX file_fp_idx;
+CREATE INDEX file_jpfid_idx on file (jobid, pathid, filenameid);
+ANALYSE;
+COMMIT;
+
 -- If you have already this table, you can remove it with:
 -- DROP TABLE JobHistory;
 

diff --git a/bacula/src/cats/update_sqlite3_tables.in b/bacula/src/cats/update_sqlite3_tables.in
index 54a407d26f307bbf2c02f09e2f1f155cc57ba9ae..f07f7ba0cb7d80be7d9355efbe346afb9c649547 100644 (file)
--- a/bacula/src/cats/update_sqlite3_tables.in
+++ b/bacula/src/cats/update_sqlite3_tables.in
@@ -224,4 +224,9 @@ CREATE TABLE JobHisto (
    );
 CREATE INDEX inx61 ON JobHisto (StartTime);
 
+-- Replace the index on (FilenameId, PathId) by (JobId, PathId, FilenameId);
+DROP INDEX IF EXISTS inx4;
+CREATE INDEX IF NOT EXISTS file_jpf_idx ON File (JobId, PathId, FilenameId);
+
+
 END-OF-DATA

diff --git a/bacula/src/cats/update_sqlite_tables.in b/bacula/src/cats/update_sqlite_tables.in
index 10a88753a49e12c9e0e60d4b4d83431c9cd24599..e9fb72a21408645b3b83472cc1cc2e116efc5663 100644 (file)
--- a/bacula/src/cats/update_sqlite_tables.in
+++ b/bacula/src/cats/update_sqlite_tables.in
@@ -224,4 +224,8 @@ CREATE TABLE JobHisto (
    );
 CREATE INDEX inx61 ON JobHisto (StartTime);
 
+-- Replace the index on (FilenameId, PathId) by (JobId, PathId, FilenameId);
+DROP INDEX inx4;
+CREATE INDEX file_jpf_idx ON File (JobId, PathId, FilenameId);
+
 END-OF-DATA