You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/04/23 13:24:33 UTC
svn commit: r1470898 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
Author: rhuijben
Date: Tue Apr 23 11:24:33 2013
New Revision: 1470898
URL: http://svn.apache.org/r1470898
Log:
Resolve the most important part of issue #4358, make the db indexes of
upgraded 1.7 working copies match the indexes of new working copies.
In r1421338 I applied the schema change and prepared to do the upgrade
part with the next format bump, but with 1.8 releasing before the next bump
it is better to include the change in the last existing format bump.
For the next bump the change should be moved to the format 32 bump so developer
working copies will also receive the upgrade.
* subversion/libsvn_wc/wc-metadata.sql
(STMT_UPGRADE_TO_31_FINALIZE): Add some parts of STMT_UPGRADE_TO_32.
(STMT_UPGRADE_TO_32): Fix table reference.
Modified:
subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=1470898&r1=1470897&r2=1470898&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Tue Apr 23 11:24:33 2013
@@ -820,6 +820,14 @@ ALTER TABLE NODES ADD COLUMN inherited_p
DROP INDEX IF EXISTS I_ACTUAL_CHANGELIST;
DROP INDEX IF EXISTS I_EXTERNALS_PARENT;
+DROP INDEX I_NODES_PARENT;
+CREATE UNIQUE INDEX I_NODES_PARENT ON NODES (wc_id, parent_relpath,
+ local_relpath, op_depth);
+
+DROP INDEX I_ACTUAL_PARENT;
+CREATE UNIQUE INDEX I_ACTUAL_PARENT ON ACTUAL_NODE (wc_id, parent_relpath,
+ local_relpath);
+
PRAGMA user_version = 31;
-- STMT_UPGRADE_31_SELECT_WCROOT_NODES
@@ -858,8 +866,8 @@ CREATE UNIQUE INDEX I_NODES_PARENT ON NO
local_relpath, op_depth);
DROP INDEX I_ACTUAL_PARENT;
-CREATE UNIQUE INDEX I_ACTUAL_PARENT ON ACTUAL (wc_id, parent_relpath,
- local_relpath);
+CREATE UNIQUE INDEX I_ACTUAL_PARENT ON ACTUAL_NODE (wc_id, parent_relpath,
+ local_relpath);
/* ------------------------------------------------------------------------- */