svn commit: r1089524 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

[hw...@apache.org]

Author: hwright
Date: Wed Apr  6 16:27:51 2011
New Revision: 1089524

URL: http://svn.apache.org/viewvc?rev=1089524&view=rev
Log:
Followup to r1089257: Add wc_id's to various indicies and queries.

* subversion/libsvn_wc/wc-queries.sql
  (changelist_list_index): Add wc_id as a member.
  (STMT_DELETE_CHANGELIST_LIST_RECURSIVE,
   STMT_SELECT_CHANGELIST_LIST_RECURSIVE): Add wc_id to WHERE clause.

* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_changelist_notify): Bind the wc_id parameter to the above queries.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc-queries.sql
    subversion/trunk/subversion/libsvn_wc/wc_db.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=1089524&r1=1089523&r2=1089524&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Wed Apr  6 16:27:51 2011
@@ -348,7 +348,7 @@ CREATE TEMPORARY TABLE changelist_list (
   notify INTEGER,
   changelist TEXT NOT NULL
   );
-CREATE INDEX changelist_list_index ON changelist_list(local_relpath);
+CREATE INDEX changelist_list_index ON changelist_list(wc_id, local_relpath);
 
 -- STMT_INSERT_CHANGELIST_LIST
 INSERT INTO changelist_list(wc_id, local_relpath, notify, changelist)
@@ -356,12 +356,12 @@ VALUES (?1, ?2, ?3, ?4);
 
 -- STMT_DELETE_CHANGELIST_LIST_RECURSIVE
 DELETE FROM changelist_list
-WHERE local_relpath = ?1 OR local_relpath LIKE ?2 ESCAPE '#'
+WHERE wc_id = ?1 AND local_relpath = ?2 OR local_relpath LIKE ?3 ESCAPE '#'
 
 -- STMT_SELECT_CHANGELIST_LIST_RECURSIVE
 SELECT local_relpath, notify, changelist
 FROM changelist_list
-WHERE local_relpath = ?1 or local_relpath LIKE ?2 ESCAPE '#'
+WHERE wc_id = ?1 AND local_relpath = ?2 or local_relpath LIKE ?3 ESCAPE '#'
 ORDER BY local_relpath
 
 -- STMT_DELETE_ACTUAL_EMPTY

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1089524&r1=1089523&r2=1089524&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Apr  6 16:27:51 2011
@@ -3490,7 +3490,8 @@ svn_wc__db_changelist_list_notify(svn_wc
 
   SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
                                     STMT_SELECT_CHANGELIST_LIST_RECURSIVE));
-  SVN_ERR(svn_sqlite__bindf(stmt, "ss", local_relpath, like_arg));
+  SVN_ERR(svn_sqlite__bindf(stmt, "iss", wcroot->wc_id, local_relpath,
+                            like_arg));
   SVN_ERR(svn_sqlite__step(&have_row, stmt));
   if (!have_row)
     return svn_error_return(svn_sqlite__reset(stmt)); /* optimise for no row */
@@ -3516,7 +3517,8 @@ svn_wc__db_changelist_list_notify(svn_wc
 
   SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
                                     STMT_DELETE_CHANGELIST_LIST_RECURSIVE));
-  SVN_ERR(svn_sqlite__bindf(stmt, "ss", local_relpath, like_arg));
+  SVN_ERR(svn_sqlite__bindf(stmt, "iss", wcroot->wc_id, local_relpath,
+                            like_arg));
   SVN_ERR(svn_sqlite__step_done(stmt));
 
   svn_pool_destroy(iterpool);