Author: rhuijben
Date: Thu May 24 12:13:32 2012
New Revision: 1342217
URL: http://svn.apache.org/viewvc?rev=1342217&view=rev
Log:
It is cheaper for us to read a few more Sqlite results that might even have
the answer we looking for than for Sqlite to collect all items and provide
them sorted.
Apply this knowledge on the is_wclocked check + query.
* subversion/libsvn_wc/wc-queries.sql
(STMT_SELECT_ANCESTOR_WCLOCKS): Reorder some checks for sanity and remove
the order by, as Sqlite doesn't know that the passed arguments are related.
* subversion/tests/libsvn_wc/wc-queries-test.c
(STMT_SELECT_ANCESTOR_WCLOCKS): And another 'slow' query gone.
Modified:
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1342217&r1=1342216&r2=1342217&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Thu May 24 12:13:32
2012
@@ -773,9 +773,8 @@ WHERE wc_id = ?1 AND local_dir_relpath =
-- STMT_SELECT_ANCESTOR_WCLOCKS
SELECT local_dir_relpath, locked_levels FROM wc_lock
WHERE wc_id = ?1
- AND ((local_dir_relpath <= ?2 AND local_dir_relpath >= ?3)
+ AND ((local_dir_relpath >= ?3 AND local_dir_relpath <= ?2)
OR local_dir_relpath = '')
-ORDER BY local_dir_relpath DESC
-- STMT_DELETE_WC_LOCK
DELETE FROM wc_lock
Modified: subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c?rev=1342217&r1=1342216&r2=1342217&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c Thu May 24
12:13:32 2012
@@ -114,7 +114,6 @@ static const int slow_statements[] =
/* Create temporary table */
STMT_SELECT_REVERT_LIST_RECURSIVE,
- STMT_SELECT_ANCESTOR_WCLOCKS,
/* Designed as slow */
STMT_SELECT_UNREFERENCED_PRISTINES,
