svn commit: r1431270 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db_update_move.c

[ph...@apache.org]

Author: philip
Date: Thu Jan 10 10:54:59 2013
New Revision: 1431270

URL: http://svn.apache.org/viewvc?rev=1431270&view=rev
Log:
Select a smaller set of candidate move pairs.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_MOVED_PAIR3): Make op-depth a parameter.

* subversion/libsvn_wc/wc_db_update_move.c
  (bump_moved_away): Bind additional parameter.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc-queries.sql
    subversion/trunk/subversion/libsvn_wc/wc_db_update_move.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=1431270&r1=1431269&r2=1431270&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Thu Jan 10 10:54:59 2013
@@ -1423,7 +1423,7 @@ WHERE wc_id = ?1
 SELECT local_relpath, moved_to, op_depth FROM nodes
 WHERE wc_id = ?1
   AND (local_relpath = ?2 OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
-  AND op_depth > 0
+  AND op_depth > ?3
   AND moved_to IS NOT NULL
 
 -- STMT_HAS_LAYER_BETWEEN

Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1431270&r1=1431269&r2=1431270&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Thu Jan 10 10:54:59 2013
@@ -1375,7 +1375,8 @@ bump_moved_away(svn_wc__db_wcroot_t *wcr
 
   SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
                                     STMT_SELECT_MOVED_PAIR3));
-  SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
+  SVN_ERR(svn_sqlite__bindf(stmt, "isd", wcroot->wc_id, local_relpath,
+                            op_depth));
   SVN_ERR(svn_sqlite__step(&have_row, stmt));
   while(have_row)
     {