Author: svn-role
Date: Wed Jun 13 12:59:06 2012
New Revision: 1349817
URL: http://svn.apache.org/viewvc?rev=1349817&view=rev
Log:
Merge r1342984 from trunk:
* r1342984
Avoid a full table scan on every directory during 'svn upgrade'
Justification:
Makes svn upgrade unnecessary slow. Trivial fix.
Votes:
+1: rhuijben, steveking, gstein
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1342984
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1349817&r1=1349816&r2=1349817&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Jun 13 12:59:06 2012
@@ -140,13 +140,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1342984
- Avoid a full table scan on every directory during 'svn upgrade'
- Justification:
- Makes svn upgrade unnecessary slow. Trivial fix.
- Votes:
- +1: rhuijben, steveking, gstein
-
* r1340556
Avoid a stat per working copy find operation by statting .svn instead of two
nodes inside .svn, per wc-directory that doesn't have a .svn directory.
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql?rev=1349817&r1=1349816&r2=1349817&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql Wed Jun 13
12:59:06 2012
@@ -1025,7 +1025,7 @@ WHERE tree_conflict_data IS NOT NULL
UPDATE actual_node SET tree_conflict_data = NULL
-- STMT_SELECT_ALL_FILES
-SELECT DISTINCT local_relpath FROM nodes
+SELECT local_relpath FROM nodes_current
WHERE wc_id = ?1 AND parent_relpath = ?2 AND kind = 'file'
-- STMT_UPDATE_NODE_PROPS
