You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/10/06 18:19:56 UTC
svn commit: r1005104 - in /subversion/trunk/subversion:
libsvn_wc/wc-metadata.sql tests/libsvn_wc/db-test.c
tests/libsvn_wc/entries-compat.c
Author: julianfoad
Date: Wed Oct 6 16:19:56 2010
New Revision: 1005104
URL: http://svn.apache.org/viewvc?rev=1005104&view=rev
Log:
Re-order the columns in the NODES table so that they're grouped more
logically. Part 2: move 'checksum'.
* subversion/libsvn_wc/wc-metadata.sql
(NODES): Move a column.
* subversion/tests/libsvn_wc/db-test.c
(TESTING_DATA): Adjust.
* subversion/tests/libsvn_wc/entries-compat.c
(TESTING_DATA, M_TESTING_DATA): Adjust.
Modified:
subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
subversion/trunk/subversion/tests/libsvn_wc/db-test.c
subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=1005104&r1=1005103&r2=1005104&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Wed Oct 6 16:19:56 2010
@@ -802,6 +802,10 @@ CREATE TABLE NODES (
have no information about the properties (a non-present node). */
properties BLOB,
+ /* The SHA-1 checksum of the pristine text, if this node is a file and was
+ moved here or copied here, else NULL. */
+ checksum TEXT,
+
/* Last-Change fields */
@@ -814,10 +818,6 @@ CREATE TABLE NODES (
changed_date INTEGER, /* an APR date/time (usec since 1970) */
changed_author TEXT,
- /* The SHA-1 checksum of the pristine text, if this node is a file and was
- moved here or copied here, else NULL. */
- checksum TEXT,
-
/* Various cache fields */
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=1005104&r1=1005103&r2=1005104&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Wed Oct 6 16:19:56 2010
@@ -193,11 +193,11 @@ static const char * const TESTING_DATA =
/* load the base nodes into the nodes table */
"insert into nodes values ("
" 1, '', 0, null, 1, '', 1, 'normal', 'infinity',"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'A', 0, '', null, null, 1, 'normal', null,"
- " null, null, 'file', '()', 1, " TIME_1s ", '" AUTHOR_1 "', '$md5 $" MD5_1 "',"
+ " null, null, 'file', '()', '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
" 10, null, null, null, null);"
"insert into nodes values ("
" 1, 'B', 0, '', null, null, null, 'excluded', null,"
@@ -217,59 +217,59 @@ static const char * const TESTING_DATA =
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'F', 0, '', null, null, 1, 'normal', null,"
- " null, null, 'file', '()', 1, " TIME_1s ", '" AUTHOR_1 "', '$sha1$" SHA1_1 "',"
+ " null, null, 'file', '()', '$sha1$" SHA1_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
" 15, null, null, null, null);"
"insert into nodes values ("
" 1, 'G', 0, '', 2, 'G-alt', 1, 'normal', null,"
- " null, null, 'file', '()', 2, " TIME_2s ", '" AUTHOR_2 "', '$sha1$" SHA1_1 "',"
+ " null, null, 'file', '()', '$sha1$" SHA1_1 "', 2, " TIME_2s ", '" AUTHOR_2 "',"
" 15, null, null, null, null);"
"insert into nodes values ("
" 1, 'H', 0, '', null, null, 1, 'normal', null,"
- " null, null, 'symlink', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'symlink', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, 'H-target', null);"
"insert into nodes values ("
" 1, 'I', 0, '', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J', 0, '', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e', 0, 'J', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-a', 0, 'J/J-e', null, null, 1, 'normal', null,"
- " null, null, 'file', '()', 1, " TIME_1s ", '" AUTHOR_1 "', '$sha1$" SHA1_1 "',"
+ " null, null, 'file', '()', '$sha1$" SHA1_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
" 15, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-b', 0, 'J/J-e', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-b/Jeba', 0, 'J/J-e/J-e-b', null, null, 1, 'normal', null,"
- " null, null, 'file', '()', 1, " TIME_1s ", '" AUTHOR_1 "', '$sha1$" SHA1_1 "',"
+ " null, null, 'file', '()', '$sha1$" SHA1_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
" 15, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-f', 0, 'J', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-f/J-f-a', 0, 'J/J-f', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'K', 0, '', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'K/K-a', 0, 'K', null, null, 1, 'normal', null,"
- " null, null, 'file', '()', 1, " TIME_1s ", '" AUTHOR_1 "', '$sha1$" SHA1_1 "',"
+ " null, null, 'file', '()', '$sha1$" SHA1_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
" 15, null, null, null, null);"
"insert into nodes values ("
" 1, 'K/K-b', 0, 'K', null, null, 1, 'normal', null,"
- " null, null, 'file', '()', 1, " TIME_1s ", '" AUTHOR_1 "', '$sha1$" SHA1_1 "',"
+ " null, null, 'file', '()', '$sha1$" SHA1_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
" 15, null, null, null, null);"
""
#endif
@@ -387,7 +387,7 @@ static const char * const TESTING_DATA =
the value 1 is just 'good enough' to make the nodes WORKING nodes. */
"insert into nodes values ("
" 1, 'I', 1, '', 2, 'some/dir', 2, 'normal', 'immediates',"
- " 0, null, 'dir', '()', 2, " TIME_2s ", '" AUTHOR_2 "', null,"
+ " 0, null, 'dir', '()', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J', 1, '', null, null, null, 'normal', 'immediates',"
@@ -399,11 +399,11 @@ static const char * const TESTING_DATA =
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-b', 1, 'J', 2, 'some/dir', 2, 'normal', 'infinity',"
- " 0, null, 'dir', '()', 2, " TIME_2s ", '" AUTHOR_2 "', null,"
+ " 0, null, 'dir', '()', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-b/J-b-a', 1, 'J/J-b', 2, 'another/dir', 2, 'normal', 'infinity',"
- " 0, null, 'dir', '()', 2, " TIME_2s ", '" AUTHOR_2 "', null,"
+ " 0, null, 'dir', '()', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-b/J-b-b', 1, 'J/J-b', null, null, null, 'normal', null,"
@@ -419,7 +419,7 @@ static const char * const TESTING_DATA =
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-d', 1, 'J', 2, 'moved/file', 2, 'normal', null,"
- " 1, null, 'file', '()', 2, " TIME_2s ", '" AUTHOR_2 "', '$md5 $" MD5_1 "',"
+ " 1, null, 'file', '()', '$md5 $" MD5_1 "', 2, " TIME_2s ", '" AUTHOR_2 "',"
" 10, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e', 1, 'J', null, null, null, 'not-present', null,"
@@ -489,7 +489,7 @@ static const char * const TESTING_DATA =
#ifdef SVN_WC__NODES
"insert into nodes values ("
" 1, 'M', 0, '', null, null, null, 'normal', null, "
- " 1, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " 1, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'M/M-a', 1, 'M', null, null, null, 'not-present', null, "
Modified: subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c?rev=1005104&r1=1005103&r2=1005104&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c Wed Oct 6 16:19:56 2010
@@ -193,11 +193,11 @@ static const char * const TESTING_DATA =
/* load the base nodes into the nodes table */
"insert into nodes values ("
" 1, '', 0, null, 1, '', 1, 'normal', 'infinity',"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'A', 0, '', null, null, 1, 'normal', null,"
- " null, null, 'file', '()', 1, " TIME_1s ", '" AUTHOR_1 "', '$md5 $" MD5_1 "',"
+ " null, null, 'file', '()', '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
" 10, null, null, null, null);"
"insert into nodes values ("
" 1, 'B', 0, '', null, null, null, 'excluded', null,"
@@ -217,59 +217,59 @@ static const char * const TESTING_DATA =
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'F', 0, '', null, null, 1, 'normal', null,"
- " null, null, 'file', '()', 1, " TIME_1s ", '" AUTHOR_1 "', '$md5 $" MD5_1 "',"
+ " null, null, 'file', '()', '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
" 15, null, null, null, null);"
"insert into nodes values ("
" 1, 'G', 0, '', 2, 'G-alt', 1, 'normal', null,"
- " null, null, 'file', '()', 2, " TIME_2s ", '" AUTHOR_2 "', '$md5 $" MD5_1 "',"
+ " null, null, 'file', '()', '$md5 $" MD5_1 "', 2, " TIME_2s ", '" AUTHOR_2 "',"
" 15, null, null, null, null);"
"insert into nodes values ("
" 1, 'H', 0, '', null, null, 1, 'normal', null,"
- " null, null, 'symlink', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'symlink', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, 'H-target', null);"
"insert into nodes values ("
" 1, 'I', 0, '', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J', 0, '', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e', 0, 'J', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-a', 0, 'J/J-e', null, null, 1, 'normal', null,"
- " null, null, 'file', '()', 1, " TIME_1s ", '" AUTHOR_1 "', '$md5 $" MD5_1 "',"
+ " null, null, 'file', '()', '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
" 15, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-b', 0, 'J/J-e', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e/J-e-b/Jeba', 0, 'J/J-e/J-e-b', null, null, 1, 'normal', null,"
- " null, null, 'file', '()', 1, " TIME_1s ", '" AUTHOR_1 "', '$md5 $" MD5_1 "',"
+ " null, null, 'file', '()', '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
" 15, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-f', 0, 'J', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-f/J-f-a', 0, 'J/J-f', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'K', 0, '', null, null, 1, 'normal', null,"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'K/K-a', 0, 'K', null, null, 1, 'normal', null,"
- " null, null, 'file', '()', 1, " TIME_1s ", '" AUTHOR_1 "', '$md5 $" MD5_1 "',"
+ " null, null, 'file', '()', '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
" 15, null, null, null, null);"
"insert into nodes values ("
" 1, 'K/K-b', 0, 'K', null, null, 1, 'normal', null,"
- " null, null, 'file', '()', 1, " TIME_1s ", '" AUTHOR_1 "', '$md5 $" MD5_1 "',"
+ " null, null, 'file', '()', '$md5 $" MD5_1 "', 1, " TIME_1s ", '" AUTHOR_1 "',"
" 15, null, null, null, null);"
""
#endif
@@ -387,7 +387,7 @@ static const char * const TESTING_DATA =
the value 1 is just 'good enough' to make the nodes WORKING nodes. */
"insert into nodes values ("
" 1, 'I', 1, '', 2, 'some/dir', 2, 'normal', 'immediates',"
- " 0, null, 'dir', '()', 2, " TIME_2s ", '" AUTHOR_2 "', null,"
+ " 0, null, 'dir', '()', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J', 1, '', null, null, null, 'normal', 'immediates',"
@@ -399,11 +399,11 @@ static const char * const TESTING_DATA =
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-b', 1, 'J', 2, 'some/dir', 2, 'normal', 'infinity',"
- " 0, null, 'dir', '()', 2, " TIME_2s ", '" AUTHOR_2 "', null,"
+ " 0, null, 'dir', '()', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-b/J-b-a', 1, 'J/J-b', 2, 'another/dir', 2, 'normal', 'infinity',"
- " 0, null, 'dir', '()', 2, " TIME_2s ", '" AUTHOR_2 "', null,"
+ " 0, null, 'dir', '()', null, 2, " TIME_2s ", '" AUTHOR_2 "',"
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-b/J-b-b', 1, 'J/J-b', null, null, null, 'normal', null,"
@@ -419,7 +419,7 @@ static const char * const TESTING_DATA =
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-d', 1, 'J', 2, 'moved/file', 2, 'normal', null,"
- " 1, null, 'file', '()', 2, " TIME_2s ", '" AUTHOR_2 "', '$md5 $" MD5_1 "',"
+ " 1, null, 'file', '()', '$md5 $" MD5_1 "', 2, " TIME_2s ", '" AUTHOR_2 "',"
" 10, null, null, null, null);"
"insert into nodes values ("
" 1, 'J/J-e', 1, 'J', null, null, null, 'not-present', null,"
@@ -489,11 +489,11 @@ static const char * const TESTING_DATA =
#ifdef SVN_WC__NODES
"insert into nodes values ("
" 1, 'M', 0, '', null, null, 1, 'normal', null, "
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null, "
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "', "
" null, null, null, null, null);"
"insert into nodes values ("
" 1, 'M/M-a', 0, 'M', null, null, 1, 'not-present', null, "
- " null, null, 'file', '()', 1, null, null, null, "
+ " null, null, 'file', '()', null, 1, null, null, "
" null, null, null, null, null);"
#endif
);
@@ -519,7 +519,7 @@ static const char * const M_TESTING_DATA
#ifdef SVN_WC__NODES
"insert into nodes values ("
" 1, '', 0, null, 1, 'M', 1, 'normal', 'infinity',"
- " null, null, 'dir', '()', 1, " TIME_1s ", '" AUTHOR_1 "', null,"
+ " null, null, 'dir', '()', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null, null);"
#endif
);