Author: rhuijben
Date: Thu May 24 11:31:55 2012
New Revision: 1342201
URL: http://svn.apache.org/viewvc?rev=1342201&view=rev
Log:
* subversion/libsvn_wc/wc-queries.sql
(STMT_SELECT_GE_OP_DEPTH_CHILDREN): Avoid creating a temporary table
by using UNION ALL instead of UNION.
(Without ALL duplicates are filtered by using a temp table)
* subversion/tests/libsvn_wc/wc-queries-test.c
(slow_statements): Remove slow marker.
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=1342201&r1=1342200&r2=1342201&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Thu May 24 11:31:55
2012
@@ -174,7 +174,7 @@ WHERE wc_id = ?1 AND parent_relpath = ?2
SELECT 1 FROM nodes
WHERE wc_id = ?1 AND parent_relpath = ?2
AND (op_depth > ?3 OR (op_depth = ?3 AND presence != 'base-deleted'))
-UNION
+UNION ALL
SELECT 1 FROM ACTUAL_NODE
WHERE wc_id = ?1 AND parent_relpath = ?2
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=1342201&r1=1342200&r2=1342201&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
11:31:55 2012
@@ -115,7 +115,6 @@ static const int slow_statements[] =
/* Create temporary table */
STMT_SELECT_REVERT_LIST_RECURSIVE,
STMT_SELECT_ANCESTOR_WCLOCKS,
- STMT_SELECT_GE_OP_DEPTH_CHILDREN,
/* Designed as slow */
STMT_SELECT_UNREFERENCED_PRISTINES,
