You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/07/08 22:24:27 UTC
svn commit: r1144488 - in /subversion/trunk: ./ subversion/include/private/
subversion/libsvn_fs_fs/ subversion/libsvn_subr/
Author: danielsh
Date: Fri Jul 8 20:24:27 2011
New Revision: 1144488
URL: http://svn.apache.org/viewvc?rev=1144488&view=rev
Log:
For issue #3952, start disabling FSFS SQLite revprops.db code on trunk.
This merges r1143971 and portions of r1143964, therefore only the former
is reflected by svn:mergeinfo changes.
* subversion/libsvn_fs_fs/fs.h
(SVN_FS_FS__FORMAT_NUMBER): Unbump to 4 from 5.
This disables revprop packing for new filesystems, but doesn't disable
now-bogus code that will run reading filesystems created by 1.8 and later.
(SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT): New.
* subversion/libsvn_fs_fs/structure:
Update documentation of f5 and revprop packing.
Modified:
subversion/trunk/ (props changed)
subversion/trunk/subversion/include/private/svn_adler32.h (props changed)
subversion/trunk/subversion/include/private/svn_string_private.h (props changed)
subversion/trunk/subversion/include/private/svn_temp_serializer.h (props changed)
subversion/trunk/subversion/libsvn_fs_fs/fs.h
subversion/trunk/subversion/libsvn_fs_fs/structure
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c (props changed)
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h (props changed)
subversion/trunk/subversion/libsvn_subr/adler32.c (props changed)
subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c (props changed)
Propchange: subversion/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 20:24:27 2011
@@ -39,7 +39,7 @@
/subversion/branches/py-tests-as-modules:956579-1033052
/subversion/branches/ra_serf-digest-authn:875693-876404
/subversion/branches/reintegrate-improvements:873853-874164
-/subversion/branches/revprop-packing:1144017
+/subversion/branches/revprop-packing:1143971,1144017
/subversion/branches/subtree-mergeinfo:876734-878766
/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
/subversion/branches/svn-patch-improvements:918519-934609
Propchange: subversion/trunk/subversion/include/private/svn_adler32.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 20:24:27 2011
@@ -31,7 +31,7 @@
/subversion/branches/py-tests-as-modules/subversion/libsvn_diff/diff.h:956579-1033052
/subversion/branches/ra_serf-digest-authn/subversion/libsvn_diff/diff.h:875693-876404
/subversion/branches/reintegrate-improvements/subversion/libsvn_diff/diff.h:873853-874164
-/subversion/branches/revprop-packing/subversion/include/private/svn_adler32.h:1144017
+/subversion/branches/revprop-packing/subversion/include/private/svn_adler32.h:1143971,1144017
/subversion/branches/subtree-mergeinfo/subversion/libsvn_diff/diff.h:876734-878766
/subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_diff/diff.h:870119-870195,870197-870288
/subversion/branches/svn-patch-improvements/subversion/libsvn_diff/diff.h:918519-934609
Propchange: subversion/trunk/subversion/include/private/svn_string_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 20:24:27 2011
@@ -39,7 +39,7 @@
/subversion/branches/py-tests-as-modules/subversion/include/svn_string.h:956579-1033052
/subversion/branches/ra_serf-digest-authn/subversion/include/svn_string.h:875693-876404
/subversion/branches/reintegrate-improvements/subversion/include/svn_string.h:873853-874164
-/subversion/branches/revprop-packing/subversion/include/private/svn_string_private.h:1144017
+/subversion/branches/revprop-packing/subversion/include/private/svn_string_private.h:1143971,1144017
/subversion/branches/subtree-mergeinfo/subversion/include/svn_string.h:876734-878766
/subversion/branches/svn-mergeinfo-enhancements/subversion/include/svn_string.h:870119-870195,870197-870288
/subversion/branches/svn-patch-improvements/subversion/include/svn_string.h:918519-934609
Propchange: subversion/trunk/subversion/include/private/svn_temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 20:24:27 2011
@@ -1,2 +1,2 @@
-/subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h:1144017
+/subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h:1143971,1144017
/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.h?rev=1144488&r1=1144487&r2=1144488&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.h Fri Jul 8 20:24:27 2011
@@ -90,7 +90,7 @@ extern "C" {
/* The format number of this filesystem.
This is independent of the repository format number, and
independent of any other FS back ends. */
-#define SVN_FS_FS__FORMAT_NUMBER 5
+#define SVN_FS_FS__FORMAT_NUMBER 4
/* The minimum format number that supports svndiff version 1. */
#define SVN_FS_FS__MIN_SVNDIFF1_FORMAT 2
@@ -122,8 +122,12 @@ extern "C" {
/* The minimum format number that stores node kinds in changed-paths lists. */
#define SVN_FS_FS__MIN_KIND_IN_CHANGED_FORMAT 4
+/* The 1.7-dev format, never released, that packed revprops into SQLite
+ revprops.db . */
+#define SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT 5
+
/* The minimum format number that supports packed revprop shards. */
-#define SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT 5
+#define SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT
/* The minimum format number that supports a configuration file (fsfs.conf) */
#define SVN_FS_FS__MIN_CONFIG_FILE 4
Modified: subversion/trunk/subversion/libsvn_fs_fs/structure
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/structure?rev=1144488&r1=1144487&r2=1144488&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/structure (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/structure Fri Jul 8 20:24:27 2011
@@ -133,7 +133,7 @@ The formats are:
Format 2, understood by Subversion 1.4+
Format 3, understood by Subversion 1.5+
Format 4, understood by Subversion 1.6+
- Format 5, understood by Subversion 1.7+
+ Format 5, understood by Subversion 1.7-dev, never released
The differences between the formats are:
@@ -223,17 +223,14 @@ The manifest file consists of a list of
pack file. The offsets are stored as ASCII decimal, and separated by a newline
character.
-Packing revision properties
+Packing revision properties (format 5: SQLite)
---------------------------
-Revprop shards may be packed too. The packing process moves all revprops from
-a the oldest unpacked shard to the SQLite database "revprops/revprops.db". The
-sequel documents the schema of FSFS format 5, which corresponds to schema
-version USER_VERSION=1:
-
-The database maps revision numbers to serialized "proplist" skels. Every
-packed revision must have a mapping entry (a table row), even if it maps the
-revnum to an empty skel.
+This was supported by 1.7-dev builds but never included in a blessed release.
+
+See r1143829 of this file:
+http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/structure?view=markup&pathrev=1143829
+
Node-revision IDs
-----------------
Propchange: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 20:24:27 2011
@@ -1,2 +1,2 @@
-/subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c:1144017
+/subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c:1143971,1144017
/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301
Propchange: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 20:24:27 2011
@@ -1,2 +1,2 @@
-/subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h:1144017
+/subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h:1143971,1144017
/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301
Propchange: subversion/trunk/subversion/libsvn_subr/adler32.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 20:24:27 2011
@@ -1,4 +1,4 @@
/subversion/branches/diff-optimizations/subversion/libsvn_subr/adler32.c:1031270-1037352
/subversion/branches/diff-optimizations-bytes/subversion/libsvn_subr/adler32.c:1037353-1067789
/subversion/branches/performance/subversion/libsvn_subr/adler32.c:1067697-1078365
-/subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c:1144017
+/subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c:1143971,1144017
Propchange: subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 20:24:27 2011
@@ -1,2 +1,2 @@
-/subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c:1144017
+/subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c:1143971,1144017
/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301