Author: svn-role
Date: Sun Mar 9 04:00:32 2014
New Revision: 1575659
URL: http://svn.apache.org/r1575659
Log:
Merge r1571214 from trunk:
* r1571214
Avoid adding duplicated rows in an sqlite hint table when calling
'svn upgrade' repeatedly on a working copy.
Justification:
Adding the same information multiple times is not a problem for sqlite,
but it adds unnecessary information to wc.db, which will be slightly
bigger than necessary in this corner case.
Votes:
+1: rhuijben, ivan, brane
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_wc/wc-metadata.sql
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1571214
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1575659&r1=1575658&r2=1575659&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sun Mar 9 04:00:32 2014
@@ -254,13 +254,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1571214
- Avoid adding duplicated rows in an sqlite hint table when calling
- 'svn upgrade' repeatedly on a working copy.
- Justification:
- Adding the same information multiple times is not a problem for sqlite,
- but it adds unnecessary information to wc.db, which will be slightly
- bigger than necessary in this corner case.
- Votes:
- +1: rhuijben, ivan, brane
Modified: subversion/branches/1.8.x/subversion/libsvn_wc/wc-metadata.sql
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_wc/wc-metadata.sql?rev=1575659&r1=1575658&r2=1575659&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/branches/1.8.x/subversion/libsvn_wc/wc-metadata.sql Sun Mar 9
04:00:32 2014
@@ -597,6 +597,9 @@ CREATE UNIQUE INDEX I_EXTERNALS_DEFINED
-- STMT_INSTALL_SCHEMA_STATISTICS
ANALYZE sqlite_master; /* Creates empty sqlite_stat1 if necessary */
+DELETE FROM sqlite_stat1
+WHERE tbl in ('NODES', 'ACTUAL_NODE', 'LOCK', 'WC_LOCK');
+
INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
('NODES', 'sqlite_autoindex_NODES_1', '8000 8000 2 1');
INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
