You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/05/20 18:24:05 UTC
svn commit: r1125450 - /subversion/trunk/subversion/libsvn_wc/wc-queries.sql

Author: philip
Date: Fri May 20 16:24:05 2011
New Revision: 1125450

URL: http://svn.apache.org/viewvc?rev=1125450&view=rev
Log:
Keep the local_relpath checks grouped together for consistency.
This doesn't look any less effecient in SQLite's query plan 

* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_BASE_NODE_LOCK_TOKENS_RECURSIVE,
   STMT_CLEAR_BASE_NODE_RECURSIVE_DAV_CACHE,
   STMT_RECURSIVE_UPDATE_NODE_REPO,
   STMT_DELETE_NODES_RECURSIVE): Do the special case path check 
    before, rather than between, the local_relpath checks.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc-queries.sql

Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1125450&r1=1125449&r2=1125450&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Fri May 20 16:24:05 2011
@@ -261,8 +261,8 @@ FROM nodes
 LEFT JOIN lock ON nodes.repos_id = lock.repos_id
   AND nodes.repos_path = lock.repos_relpath
 WHERE wc_id = ?1 AND op_depth = 0
-  AND (local_relpath = ?2
-       OR ?2 = ''
+  AND (?2 = ''
+       OR local_relpath = ?2
        OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
 
 -- STMT_INSERT_WCROOT
@@ -296,16 +296,16 @@ WHERE repos_id = ?1 AND repos_relpath = 
 -- STMT_CLEAR_BASE_NODE_RECURSIVE_DAV_CACHE
 UPDATE nodes SET dav_cache = NULL
 WHERE dav_cache IS NOT NULL AND wc_id = ?1 AND op_depth = 0
-  AND (local_relpath = ?2
-       OR ?2 = ''
+  AND (?2 = ''
+       OR local_relpath = ?2
        OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
 
 -- STMT_RECURSIVE_UPDATE_NODE_REPO
 UPDATE nodes SET repos_id = ?4, dav_cache = NULL
 WHERE wc_id = ?1
   AND repos_id = ?3
-  AND (local_relpath = ?2
-       OR ?2 = ''
+  AND (?2 = ''
+       OR local_relpath = ?2
        OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
 
 -- STMT_UPDATE_LOCK_REPOS_ID
@@ -566,8 +566,8 @@ WHERE wc_id = ?1 AND local_relpath = ?2
 -- STMT_DELETE_NODES_RECURSIVE
 DELETE FROM nodes
 WHERE wc_id = ?1
-  AND (local_relpath = ?2
-       OR ?2 = ''
+  AND (?2 = ''
+       OR local_relpath = ?2
        OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0'))
   AND op_depth >= ?3