[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bacula-commits
Subject:    [Bacula-commits] git: Bacula branch, 3.0.3,
From:       "Eric Bollengier" <ricozz () users ! sourceforge ! net>
Date:       2009-09-29 19:26:27
Message-ID: E1MsiLE-0000bj-KE () fxgxhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula".

The branch, 3.0.3 has been updated
       via  e0292fc2be6b3abc78f23cbe9ab068e5a976b3e6 (commit)
       via  f3f472daae4da8860968870b1c3c604de66bcf10 (commit)
      from  7d2d17bc51282523b21b2603d936edd8d89e65bf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e0292fc2be6b3abc78f23cbe9ab068e5a976b3e6
Author: Marco van Wieringen <mvw@planets.elm.net>
Date:   Tue Sep 29 20:02:12 2009 +0200

    Change grep -e to egrep and use -c instead of using wc.
    
    Signed-off-by: Eric Bollengier <eric@eb.homelinux.org>

commit f3f472daae4da8860968870b1c3c604de66bcf10
Author: Eric Bollengier <eric@eb.homelinux.org>
Date:   Tue Sep 29 14:44:17 2009 +0200

    Remove the inx4 index for SQLite2/3 (FilenameId, PathId) on
    File table. Replace it by an index over (JobId, PathId, FilenameId).
    
    It is useless for common usage, and causes performance issues.
    This index fragments over the time and the update cost grows
    very quickly. (This index is not present on Mysql schema)

-----------------------------------------------------------------------

Summary of changes:
diff --git a/bacula/src/cats/make_sqlite3_tables.in b/bacula/src/cats/make_sqlite3_tables.in
index 8f1ce00..98b037d 100644
--- a/bacula/src/cats/make_sqlite3_tables.in
+++ b/bacula/src/cats/make_sqlite3_tables.in
@@ -38,14 +38,13 @@ CREATE TABLE File (
    );
 
 CREATE INDEX inx3 ON File (JobId);
-CREATE INDEX inx4 ON File (FilenameId, PathId);
+CREATE INDEX file_jpf_idx ON File (JobId, PathId, FilenameId);
 --
 -- Possibly add one or more of the following indexes
 --  if your Verifies are too slow.
 --
 -- CREATE INDEX inx4 ON File (PathId);
 -- CREATE INDEX inx5 ON File (FileNameId);
--- CREATE INDEX inx9 ON File (JobId, PathId, FilenameId);
 
 CREATE TABLE Job (
    JobId INTEGER,
diff --git a/bacula/src/cats/make_sqlite_tables.in b/bacula/src/cats/make_sqlite_tables.in
index 9bd0a48..e8693f0 100644
--- a/bacula/src/cats/make_sqlite_tables.in
+++ b/bacula/src/cats/make_sqlite_tables.in
@@ -38,14 +38,13 @@ CREATE TABLE File (
    );
 
 CREATE INDEX inx3 ON File (JobId);
-CREATE INDEX inx4 ON File (FilenameId, PathId);
+CREATE INDEX file_jpf_idx ON File (JobId, PathId, FilenameId);
 --
 -- Possibly add one or more of the following indexes
 --  if your Verifies are too slow.
 --
 -- CREATE INDEX inx4 ON File (PathId);
 -- CREATE INDEX inx5 ON File (FileNameId);
--- CREATE INDEX inx9 ON File (JobId, PathId, FilenameId);
 
 CREATE TABLE Job (
    JobId INTEGER,
diff --git a/regress/tests/exclude-dir-test b/regress/tests/exclude-dir-test
index 6dce2fc..e437206 100755
--- a/regress/tests/exclude-dir-test
+++ b/regress/tests/exclude-dir-test
@@ -79,7 +79,7 @@ fi
 
 # build/po is included 2 times with a different exclude file
 # we shouldn't see scripts and bin
-nb=`grep -e 'build/po/fr.po$' $tmp/log3.out | wc -l`
+nb=`egrep -c 'build/po/fr.po$' $tmp/log3.out`
 if [ $nb != 2 ]; then
     print_debug "ERROR: Should see fr.po two times"
     bstat=2


hooks/post-receive
-- 
Bacula

------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits
[prev in list] [next in list] [prev in thread] [next in thread]