You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2009/12/03 02:08:17 UTC
svn commit: r886351 - in /subversion/trunk/subversion: libsvn_wc/upgrade.c
libsvn_wc/wc-metadata.sql libsvn_wc/wc.h libsvn_wc/wc_db.c
tests/libsvn_wc/db-test.c
Author: hwright
Date: Thu Dec 3 01:08:16 2009
New Revision: 886351
URL: http://svn.apache.org/viewvc?rev=886351&view=rev
Log:
Bump the database format to 16, in order to introduce a couple of columns
which will be useful in the future.
* subversion/tests/libsvn_wc/db-test.c
(loading_sql): Add the addition sql for format 16.
* subversion/libsvn_wc/wc.h
(SVN_WC__VERSION): Bump to 16.
* subversion/libsvn_wc/wc-metadata.sql:
Do the sql changes for format 16, as well as defaulting current locks to
depth immediate. Bump previous format 16 to format 17.
* subversion/libsvn_wc/wc_db.c
(upgrade_sql): Add the additional sql for format 16.
* subversion/libsvn_wc/upgrade.c
(svn_wc__upgrade_sdb): Insert a no-op for format 16, bumping subsequent
(and currently unused) formats.
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
subversion/trunk/subversion/libsvn_wc/wc.h
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/tests/libsvn_wc/db-test.c
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=886351&r1=886350&r2=886351&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Thu Dec 3 01:08:16 2009
@@ -933,13 +933,18 @@
++start_format;
case 15:
- SVN_ERR(migrate_props(wcroot_abspath, sdb, scratch_pool));
+ /* Nothing to do here for format 16 */
SVN_ERR(svn_sqlite__set_schema_version(sdb, 16, scratch_pool));
++start_format;
-#if 0
case 16:
- SVN_ERR(bump_to_16(wcroot_abspath, sdb, scratch_pool));
+ SVN_ERR(migrate_props(wcroot_abspath, sdb, scratch_pool));
+ SVN_ERR(svn_sqlite__set_schema_version(sdb, 17, scratch_pool));
+ ++start_format;
+
+#if 0
+ case 17:
+ SVN_ERR(bump_to_17(wcroot_abspath, sdb, scratch_pool));
++start_format;
#endif
Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=886351&r1=886350&r2=886351&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Thu Dec 3 01:08:16 2009
@@ -456,9 +456,27 @@
/* ------------------------------------------------------------------------- */
-/* Format 16 introduces new handling for conflict information. */
+/* Format 16 introduces some new columns for pristines and locks. */
-- format: 16
+/* An md5 column for the pristine table. */
+ALTER TABLE PRISTINE
+ADD COLUMN md5_checksum TEXT;
+
+/* Add the locked_levels column to record the depth of a lock. */
+ALTER TABLE WC_LOCK
+ADD COLUMN locked_levels INTEGER NOT NULL DEFAULT -1;;
+
+/* Default the depth of existing locks to 0. */
+UPDATE wc_lock
+SET locked_levels = 0;
+
+
+/* ------------------------------------------------------------------------- */
+
+/* Format 17 introduces new handling for conflict information. */
+-- format: 17
+
/* ------------------------------------------------------------------------- */
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=886351&r1=886350&r2=886351&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Thu Dec 3 01:08:16 2009
@@ -108,7 +108,7 @@
* Please document any further format changes here.
*/
-#define SVN_WC__VERSION 15
+#define SVN_WC__VERSION 16
/* A version <= this doesn't have property caching in the entries file. */
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=886351&r1=886350&r2=886351&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Dec 3 01:08:16 2009
@@ -211,7 +211,8 @@
WC_METADATA_SQL_12,
WC_METADATA_SQL_13,
WC_METADATA_SQL_14,
- WC_METADATA_SQL_15
+ WC_METADATA_SQL_15,
+ WC_METADATA_SQL_16
};
WC_QUERIES_SQL_DECLARE_STATEMENTS(statements);
Modified: subversion/trunk/subversion/tests/libsvn_wc/db-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/db-test.c?rev=886351&r1=886350&r2=886351&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Thu Dec 3 01:08:16 2009
@@ -306,7 +306,8 @@
WC_METADATA_SQL_13,
WC_METADATA_SQL_14,
- WC_METADATA_SQL_15
+ WC_METADATA_SQL_15,
+ WC_METADATA_SQL_16
};