You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/05/14 18:52:46 UTC
svn commit: r1482452 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_repos/log.c
Author: breser
Date: Tue May 14 16:52:46 2013
New Revision: 1482452
URL: http://svn.apache.org/r1482452
Log:
Merge r1481596 from trunk:
* r1481596
For 'svn log -g', eliminate read requests on directories and mergeinfo
in revisions that are guaranteed to not change any mergeinfo.
Justification:
This simple change combined with r1481594 resulted in a 4x speedup for
'svn log -g' in the FreeBSD repo with cold and 15x with hot caches.
Votes:
+1: stefan2 (for 1.8.1)
+1: rhuijben, stsp
+0: danielsh
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_repos/log.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1481596
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1482452&r1=1482451&r2=1482452&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue May 14 16:52:46 2013
@@ -85,17 +85,6 @@ Approved changes:
# blocking issues. If in doubt see this link for details:
# http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
- * r1481596
- For 'svn log -g', eliminate read requests on directories and mergeinfo
- in revisions that are guaranteed to not change any mergeinfo.
- Justification:
- This simple change combined with r1481594 resulted in a 4x speedup for
- 'svn log -g' in the FreeBSD repo with cold and 15x with hot caches.
- Votes:
- +1: stefan2 (for 1.8.1)
- +1: rhuijben, stsp
- +0: danielsh
-
* r1479320, r1479321, r1479323, r1479326, r1479329
Silence 'make -s clean distclean'.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_repos/log.c?rev=1482452&r1=1482451&r2=1482452&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_repos/log.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_repos/log.c Tue May 14 16:52:46 2013
@@ -838,6 +838,11 @@ get_combined_mergeinfo_changes(svn_merge
}
}
+ /* In most revisions, there will be no mergeinfo change at all. */
+ if ( apr_hash_count(deleted_mergeinfo_catalog) == 0
+ && apr_hash_count(added_mergeinfo_catalog) == 0)
+ return SVN_NO_ERROR;
+
/* Check our PATHS for any changes to their inherited mergeinfo.
(We deal with changes to mergeinfo directly *on* the paths in the
following loop.) */