You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/10/07 15:50:07 UTC
svn commit: r1005444 - in /subversion/trunk/subversion: libsvn_wc/entries.c
libsvn_wc/upgrade.c libsvn_wc/wc.h tests/libsvn_wc/db-test.c
tests/libsvn_wc/entries-compat.c
Author: philip
Date: Thu Oct 7 13:50:06 2010
New Revision: 1005444
URL: http://svn.apache.org/viewvc?rev=1005444&view=rev
Log:
Remove pre-NODES obsolete code.
* subversion/libsvn_wc/wc.h
(SVN_WC__NODES, SVN_WC__NODES_ONLY): Remove.
* subversion/libsvn_wc/entries.c
(read_one_entry, insert_base_node,
insert_working_node, write_entry): Remove conditional code.
* subversion/libsvn_wc/upgrade.c
(get_versioned_files): Remove conditional code.
* subversion/tests/libsvn_wc/entries-compat.c
(TESTING_DATA, M_TESTING_DATA, create_fake_wc): Remove conditional code.
* subversion/tests/libsvn_wc/db-test.c
(TESTING_DATA, create_fake_wc): Remove conditional code.
Modified:
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc.h
subversion/trunk/subversion/tests/libsvn_wc/db-test.c
subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1005444&r1=1005443&r2=1005444&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Thu Oct 7 13:50:06 2010
@@ -609,35 +609,20 @@ read_one_entry(const svn_wc_entry_t **ne
{
svn_sqlite__db_t *sdb;
svn_sqlite__stmt_t *stmt;
-#ifdef SVN_WC__NODES
svn_sqlite__stmt_t *stmt_nodes;
svn_boolean_t have_nodes_row;
-#endif
SVN_ERR(svn_wc__db_temp_borrow_sdb(
&sdb, db, dir_abspath,
svn_wc__db_openmode_readonly,
scratch_pool));
-#ifndef SVN_WC__NODES_ONLY
- SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
- STMT_SELECT_NOT_PRESENT));
- SVN_ERR(svn_sqlite__bindf(stmt, "is", wc_id, entry->name));
- SVN_ERR(svn_sqlite__step(&have_row, stmt));
-#endif
-#ifdef SVN_WC__NODES
SVN_ERR(svn_sqlite__get_statement(&stmt_nodes, sdb,
STMT_SELECT_NOT_PRESENT_1));
SVN_ERR(svn_sqlite__bindf(stmt_nodes, "is", wc_id, entry->name));
SVN_ERR(svn_sqlite__step(&have_nodes_row, stmt_nodes));
-#ifndef SVN_WC__NODES_ONLY
- SVN_ERR_ASSERT(have_row == have_nodes_row);
- SVN_ERR(svn_sqlite__reset(stmt_nodes));
-#else
stmt = stmt_nodes;
have_row = have_nodes_row;
-#endif
-#endif
SVN_ERR(svn_sqlite__reset(stmt));
}
@@ -1535,74 +1520,6 @@ insert_base_node(svn_sqlite__db_t *sdb,
{
svn_sqlite__stmt_t *stmt;
-#ifndef SVN_WC__NODES_ONLY
- /* ### NODE_DATA when switching to NODE_DATA, replace the
- query below with STMT_INSERT_BASE_NODE_DATA_FOR_ENTRY_1
- and adjust the parameters bound. Can't do that yet. */
- SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
- STMT_INSERT_BASE_NODE_FOR_ENTRY));
-
- SVN_ERR(svn_sqlite__bind_int64(stmt, 1, base_node->wc_id));
- SVN_ERR(svn_sqlite__bind_text(stmt, 2, base_node->local_relpath));
-
- if (base_node->repos_id)
- {
- SVN_ERR(svn_sqlite__bind_int64(stmt, 3, base_node->repos_id));
- SVN_ERR(svn_sqlite__bind_text(stmt, 4, base_node->repos_relpath));
- }
-
- if (base_node->parent_relpath)
- SVN_ERR(svn_sqlite__bind_text(stmt, 5, base_node->parent_relpath));
-
- if (base_node->presence == svn_wc__db_status_not_present)
- SVN_ERR(svn_sqlite__bind_text(stmt, 6, "not-present"));
- else if (base_node->presence == svn_wc__db_status_normal)
- SVN_ERR(svn_sqlite__bind_text(stmt, 6, "normal"));
- else if (base_node->presence == svn_wc__db_status_absent)
- SVN_ERR(svn_sqlite__bind_text(stmt, 6, "absent"));
- else if (base_node->presence == svn_wc__db_status_incomplete)
- SVN_ERR(svn_sqlite__bind_text(stmt, 6, "incomplete"));
- else if (base_node->presence == svn_wc__db_status_excluded)
- SVN_ERR(svn_sqlite__bind_text(stmt, 6, "excluded"));
-
- SVN_ERR(svn_sqlite__bind_int64(stmt, 7, base_node->revision));
-
- /* ### kind might be "symlink" or "unknown" */
- if (base_node->kind == svn_node_none)
- SVN_ERR(svn_sqlite__bind_text(stmt, 5, "unknown"));
- else
- SVN_ERR(svn_sqlite__bind_text(stmt, 8,
- svn_node_kind_to_word(base_node->kind)));
-
- if (base_node->checksum)
- SVN_ERR(svn_sqlite__bind_checksum(stmt, 9, base_node->checksum,
- scratch_pool));
-
- if (base_node->translated_size != SVN_INVALID_FILESIZE)
- SVN_ERR(svn_sqlite__bind_int64(stmt, 10, base_node->translated_size));
-
- /* ### strictly speaking, changed_rev should be valid for present nodes. */
- if (SVN_IS_VALID_REVNUM(base_node->changed_rev))
- SVN_ERR(svn_sqlite__bind_int64(stmt, 11, base_node->changed_rev));
- if (base_node->changed_date)
- SVN_ERR(svn_sqlite__bind_int64(stmt, 12, base_node->changed_date));
- if (base_node->changed_author)
- SVN_ERR(svn_sqlite__bind_text(stmt, 13, base_node->changed_author));
-
- SVN_ERR(svn_sqlite__bind_text(stmt, 14, svn_depth_to_word(base_node->depth)));
-
- SVN_ERR(svn_sqlite__bind_int64(stmt, 15, base_node->last_mod_time));
-
- if (base_node->properties)
- SVN_ERR(svn_sqlite__bind_properties(stmt, 16, base_node->properties,
- scratch_pool));
-
- /* Execute and reset the insert clause. */
- SVN_ERR(svn_sqlite__insert(NULL, stmt));
-
-#endif
-#ifdef SVN_WC__NODES
-
SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
STMT_INSERT_BASE_NODE_FOR_ENTRY_1));
@@ -1658,8 +1575,6 @@ insert_base_node(svn_sqlite__db_t *sdb,
/* Execute and reset the insert clause. */
SVN_ERR(svn_sqlite__insert(NULL, stmt));
-
-#endif
return SVN_NO_ERROR;
}
@@ -1671,81 +1586,6 @@ insert_working_node(svn_sqlite__db_t *sd
{
svn_sqlite__stmt_t *stmt;
-#ifndef SVN_WC__NODES_ONLY
- /* ### NODE_DATA when switching to NODE_DATA, replace the
- query below with STMT_INSERT_WORKING_NODE_DATA_2
- and adjust the parameters bound. Can't do that yet. */
- SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_INSERT_WORKING_NODE));
-
- SVN_ERR(svn_sqlite__bind_int64(stmt, 1, working_node->wc_id));
- SVN_ERR(svn_sqlite__bind_text(stmt, 2, working_node->local_relpath));
- SVN_ERR(svn_sqlite__bind_text(stmt, 3, working_node->parent_relpath));
-
- /* ### need rest of values */
- if (working_node->presence == svn_wc__db_status_normal)
- SVN_ERR(svn_sqlite__bind_text(stmt, 4, "normal"));
- else if (working_node->presence == svn_wc__db_status_not_present)
- SVN_ERR(svn_sqlite__bind_text(stmt, 4, "not-present"));
- else if (working_node->presence == svn_wc__db_status_base_deleted)
- SVN_ERR(svn_sqlite__bind_text(stmt, 4, "base-deleted"));
- else if (working_node->presence == svn_wc__db_status_incomplete)
- SVN_ERR(svn_sqlite__bind_text(stmt, 4, "incomplete"));
- else if (working_node->presence == svn_wc__db_status_excluded)
- SVN_ERR(svn_sqlite__bind_text(stmt, 4, "excluded"));
-
- if (working_node->kind == svn_node_none)
- SVN_ERR(svn_sqlite__bind_text(stmt, 5, "unknown"));
- else
- SVN_ERR(svn_sqlite__bind_text(stmt, 5,
- svn_node_kind_to_word(working_node->kind)));
-
- if (working_node->copyfrom_repos_path)
- {
- SVN_ERR(svn_sqlite__bind_int64(stmt, 6,
- working_node->copyfrom_repos_id));
- SVN_ERR(svn_sqlite__bind_text(stmt, 7,
- working_node->copyfrom_repos_path));
- SVN_ERR(svn_sqlite__bind_int64(stmt, 8, working_node->copyfrom_revnum));
- }
-
- if (working_node->moved_here)
- SVN_ERR(svn_sqlite__bind_int(stmt, 9, working_node->moved_here));
-
- if (working_node->moved_to)
- SVN_ERR(svn_sqlite__bind_text(stmt, 10, working_node->moved_to));
-
- if (working_node->checksum)
- SVN_ERR(svn_sqlite__bind_checksum(stmt, 11, working_node->checksum,
- scratch_pool));
-
- if (working_node->translated_size != SVN_INVALID_FILESIZE)
- SVN_ERR(svn_sqlite__bind_int64(stmt, 12, working_node->translated_size));
-
- if (SVN_IS_VALID_REVNUM(working_node->changed_rev))
- SVN_ERR(svn_sqlite__bind_int64(stmt, 13, working_node->changed_rev));
- if (working_node->changed_date)
- SVN_ERR(svn_sqlite__bind_int64(stmt, 14, working_node->changed_date));
- if (working_node->changed_author)
- SVN_ERR(svn_sqlite__bind_text(stmt, 15, working_node->changed_author));
-
- SVN_ERR(svn_sqlite__bind_text(stmt, 16,
- svn_depth_to_word(working_node->depth)));
-
- SVN_ERR(svn_sqlite__bind_int64(stmt, 17, working_node->last_mod_time));
-
- if (working_node->properties)
- SVN_ERR(svn_sqlite__bind_properties(stmt, 18, working_node->properties,
- scratch_pool));
-
- SVN_ERR(svn_sqlite__bind_int64(stmt, 19, working_node->keep_local));
-
- /* ### we should bind 'symlink_target' (20) as appropriate. */
-
- /* Execute and reset the insert clause. */
- SVN_ERR(svn_sqlite__insert(NULL, stmt));
-#endif
-
-#ifdef SVN_WC__NODES
SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_INSERT_NODE));
SVN_ERR(svn_sqlite__bindf(stmt, "isisnnnnsnrisnnni",
working_node->wc_id, working_node->local_relpath,
@@ -1797,7 +1637,6 @@ insert_working_node(svn_sqlite__db_t *sd
SVN_ERR(svn_sqlite__bind_int64(stmt, 16, working_node->translated_size));
SVN_ERR(svn_sqlite__insert(NULL, stmt));
-#endif
return SVN_NO_ERROR;
}
@@ -2160,16 +1999,6 @@ write_entry(svn_wc__db_t *db,
&entry->file_external_rev,
scratch_pool));
-#ifndef SVN_WC__NODES_ONLY
- SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
- STMT_UPDATE_FILE_EXTERNAL));
- SVN_ERR(svn_sqlite__bindf(stmt, "iss",
- (apr_uint64_t)1 /* wc_id */,
- entry->name,
- str));
- SVN_ERR(svn_sqlite__step_done(stmt));
-#endif
-#ifdef SVN_WC__NODES
SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
STMT_UPDATE_FILE_EXTERNAL_1));
SVN_ERR(svn_sqlite__bindf(stmt, "iss",
@@ -2177,7 +2006,6 @@ write_entry(svn_wc__db_t *db,
entry->name,
str));
SVN_ERR(svn_sqlite__step_done(stmt));
-#endif
}
}
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1005444&r1=1005443&r2=1005444&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Thu Oct 7 13:50:06 2010
@@ -346,11 +346,7 @@ get_versioned_files(const apr_array_head
svn_boolean_t have_row;
/* ### just select 'file' children. do we need 'symlink' in the future? */
-#ifndef SVN_WC__NODES_ONLY
- SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_SELECT_ALL_FILES));
-#else
SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_SELECT_ALL_FILES_1));
-#endif
SVN_ERR(svn_sqlite__bindf(stmt, "s", parent_relpath));
/* ### 10 is based on Subversion's average of 8.5 files per versioned
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1005444&r1=1005443&r2=1005444&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Thu Oct 7 13:50:06 2010
@@ -164,11 +164,6 @@ extern "C" {
/* A version < this does not store properties in wc.db. */
#define SVN_WC__PROPS_IN_DB 18
-#if (SVN_WC__VERSION > 19)
-#define SVN_WC__NODES
-#define SVN_WC__NODES_ONLY
-#endif
-
/* Return true iff error E indicates an "is not a working copy" type
of error, either because something wasn't a working copy at all, or
because it's a working copy from a previous version (in need of
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=1005444&r1=1005443&r2=1005444&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Thu Oct 7 13:50:06 2010
@@ -87,109 +87,10 @@ static const char * const TESTING_DATA =
"insert into repository values (2, '" ROOT_TWO "', '" UUID_TWO "'); "
"insert into wcroot values (1, null); "
- /* ### The file_externals column in BASE_NODE is temporary, and will be
+ /* ### The file_externals column in NODES is temporary, and will be
### removed. However, to keep the tests passing, we need to add it
### to the following insert statements. *Be sure to remove it*. */
-#ifndef SVN_WC__NODES_ONLY
- "insert into base_node values ("
- " 1, '', 1, '', null, 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', 'infinity', null, null, '()', null, 0, "
- " null); "
- "insert into base_node values ("
- " 1, 'A', null, null, '', 'normal', 'file', "
- " 1, '$md5 $" MD5_1 "', 10, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'B', null, null, '', 'excluded', 'symlink', "
- " null, null, null, "
- " null, null, null, null, null, null, null, null, null, null); "
- "insert into base_node values ("
- " 1, 'C', null, null, '', 'absent', 'unknown', "
- " null, null, null, "
- " null, null, null, null, null, null, null, null, null, null); "
- "insert into base_node values ("
- " 1, 'D', null, null, '', 'not-present', 'unknown', "
- " null, null, null, "
- " null, null, null, null, null, null, null, null, null, null); "
- "insert into base_node values ("
- " 1, 'E', null, null, '', 'incomplete', 'unknown', "
- " null, null, null, "
- " null, null, null, null, null, null, null, null, null, null); "
- "insert into base_node values ("
- " 1, 'F', null, null, '', 'normal', 'file', "
- " 1, '$sha1$" SHA1_1 "', 15, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'G', 2, 'G-alt', '', 'normal', 'file', "
- " 1, '$sha1$" SHA1_1 "', 15, "
- " 2, " TIME_2s ", '" AUTHOR_2 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'H', null, null, '', 'normal', 'symlink', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, 'H-target', null, '()', null, "
- " null, null); "
- "insert into base_node values ("
- " 1, 'I', null, null, '', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J', null, null, '', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J/J-e', null, null, 'J', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J/J-e/J-e-a', null, null, 'J/J-e', 'normal', 'file', "
- " 1, '$sha1$" SHA1_1 "', 15, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J/J-e/J-e-b', null, null, 'J/J-e', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J/J-e/J-e-b/Jeba', null, null, 'J/J-e/J-e-b', 'normal', 'file', "
- " 1, '$sha1$" SHA1_1 "', 15, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J/J-f', null, null, 'J', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J/J-f/J-f-a', null, null, 'J/J-f', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'K', null, null, '', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'K/K-a', null, null, 'K', 'normal', 'file', "
- " 1, '$sha1$" SHA1_1 "', 15, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'K/K-b', null, null, 'K', 'normal', 'file', "
- " 1, '$sha1$" SHA1_1 "', 15, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- " "
-#endif
-#ifdef SVN_WC__NODES
+
/* load the base nodes into the nodes table */
"insert into nodes values ("
" 1, '', 0, null, 1, '', 1, 'normal',"
@@ -272,116 +173,6 @@ static const char * const TESTING_DATA =
" null, null, 'file', '()', null, '$sha1$" SHA1_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" 15, null, null, null);"
""
-#endif
-#ifndef SVN_WC__NODES_ONLY
- "insert into working_node values ("
- " 1, 'I', '', 'normal', 'dir', "
- " null, null, "
- " 2, " TIME_2s ", '" AUTHOR_2 "', 'immediates', null, "
- " 2, 'some/dir', 2, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J', '', 'normal', 'dir', "
- " null, null, "
- " null, null, null, 'immediates', null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-a', 'J', 'normal', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-b', 'J', 'normal', 'dir', "
- " null, null, "
- " 2, " TIME_2s ", '" AUTHOR_2 "', 'infinity', null, "
- " 2, 'some/dir', 2, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-b/J-b-a', 'J/J-b', 'normal', 'dir', "
- " null, null, "
- " 2, " TIME_2s ", '" AUTHOR_2 "', 'infinity', null, "
- " 2, 'another/dir', 2, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-b/J-b-b', 'J/J-b', 'normal', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-c', 'J', 'not-present', 'dir', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-c/J-c-a', 'J/J-c', 'not-present', 'dir', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-d', 'J', 'normal', 'file', "
- " '$md5 $" MD5_1 "', 10, "
- " 2, " TIME_2s ", '" AUTHOR_2 "', null, null, "
- " 2, 'moved/file', 2, 1, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-e', 'J', 'not-present', 'dir', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, 'other/place', null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-e/J-e-a', 'J/J-e', 'not-present', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-e/J-e-b', 'J/J-e', 'not-present', 'dir', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-e/J-e-b/Jeba', 'J/J-e/J-e-b', 'base-deleted', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-f', 'J', 'normal', 'dir', "
- " null, null, "
- " null, null, null, 'immediates', null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-f/J-f-a', 'J/J-f', 'base-deleted', 'dir', "
- " null, null, "
- " null, null, null, 'immediates', null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'K', '', 'base-deleted', 'dir', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'K/K-a', 'K', 'base-deleted', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'K/K-b', 'K', 'base-deleted', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, 'moved/away', null, '()', 0); "
- "insert into working_node values ("
- " 1, 'L', '', 'normal', 'dir', "
- " null, null, "
- " null, null, null, 'immediates', null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'L/L-a', 'L', 'not-present', 'dir', "
- " null, null, "
- " null, null, null, 'immediates', null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'L/L-a/L-a-a', 'L', 'not-present', 'dir', "
- " null, null, "
- " null, null, null, 'immediates', null, "
- " null, null, null, 0, null, null, '()', 0); "
- " "
-#endif
-#ifdef SVN_WC__NODES
/* Load data into NODES table;
### op_depths have not been calculated by me yet;
the value 1 is just 'good enough' to make the nodes WORKING nodes. */
@@ -469,24 +260,10 @@ static const char * const TESTING_DATA =
" 1, 'L/L-a/L-a-a', 1, 'L', null, null, null, 'not-present',"
" 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
" null, null, null, null);"
-#endif
"insert into actual_node values ("
" 1, 'I', '', null, null, null, null, null, 'changelist', null, "
"'" I_TC_DATA "', null, null, null, null);"
" "
-#ifndef SVN_WC__NODES_ONLY
- "insert into base_node values ("
- " 1, 'M', null, null, '', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into working_node values ("
- " 1, 'M/M-a', 'M', 'not-present', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
-#endif
-#ifdef SVN_WC__NODES
"insert into nodes values ("
" 1, 'M', 0, '', null, null, null, 'normal', "
" 1, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
@@ -495,7 +272,6 @@ static const char * const TESTING_DATA =
" 1, 'M/M-a', 1, 'M', null, null, null, 'not-present', "
" null, null, 'file', '()', null, null, null, null, null, null,"
" null, 0, null, null);"
-#endif
);
WC_QUERIES_SQL_DECLARE_STATEMENTS(statements);
@@ -510,9 +286,7 @@ create_fake_wc(const char *subdir, int f
svn_sqlite__db_t *sdb;
const char * const my_statements[] = {
statements[STMT_CREATE_SCHEMA],
-#ifdef SVN_WC__NODES
statements[STMT_CREATE_NODES],
-#endif
TESTING_DATA,
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=1005444&r1=1005443&r2=1005444&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c Thu Oct 7 13:50:06 2010
@@ -87,109 +87,10 @@ static const char * const TESTING_DATA =
"insert into repository values (2, '" ROOT_TWO "', '" UUID_TWO "'); "
"insert into wcroot values (1, null); "
- /* ### The file_externals column in BASE_NODE is temporary, and will be
+ /* ### The file_externals column in NODES is temporary, and will be
### removed. However, to keep the tests passing, we need to add it
### to the following insert statements. *Be sure to remove it*. */
-#ifndef SVN_WC__NODES_ONLY
- "insert into base_node values ("
- " 1, '', 1, '', null, 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', 'infinity', null, null, '()', null, 0, "
- " null); "
- "insert into base_node values ("
- " 1, 'A', null, null, '', 'normal', 'file', "
- " 1, '$md5 $" MD5_1 "', 10, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'B', null, null, '', 'excluded', 'symlink', "
- " null, null, null, "
- " null, null, null, null, null, null, null, null, null, null); "
- "insert into base_node values ("
- " 1, 'C', null, null, '', 'absent', 'unknown', "
- " null, null, null, "
- " null, null, null, null, null, null, null, null, null, null); "
- "insert into base_node values ("
- " 1, 'D', null, null, '', 'not-present', 'unknown', "
- " null, null, null, "
- " null, null, null, null, null, null, null, null, null, null); "
- "insert into base_node values ("
- " 1, 'E', null, null, '', 'incomplete', 'unknown', "
- " null, null, null, "
- " null, null, null, null, null, null, null, null, null, null); "
- "insert into base_node values ("
- " 1, 'F', null, null, '', 'normal', 'file', "
- " 1, '$md5 $" MD5_1 "', 15, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'G', 2, 'G-alt', '', 'normal', 'file', "
- " 1, '$md5 $" MD5_1 "', 15, "
- " 2, " TIME_2s ", '" AUTHOR_2 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'H', null, null, '', 'normal', 'symlink', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, 'H-target', null, '()', null, "
- " null, null); "
- "insert into base_node values ("
- " 1, 'I', null, null, '', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J', null, null, '', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J/J-e', null, null, 'J', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J/J-e/J-e-a', null, null, 'J/J-e', 'normal', 'file', "
- " 1, '$md5 $" MD5_1 "', 15, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J/J-e/J-e-b', null, null, 'J/J-e', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J/J-e/J-e-b/Jeba', null, null, 'J/J-e/J-e-b', 'normal', 'file', "
- " 1, '$md5 $" MD5_1 "', 15, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J/J-f', null, null, 'J', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'J/J-f/J-f-a', null, null, 'J/J-f', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'K', null, null, '', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'K/K-a', null, null, 'K', 'normal', 'file', "
- " 1, '$md5 $" MD5_1 "', 15, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into base_node values ("
- " 1, 'K/K-b', null, null, 'K', 'normal', 'file', "
- " 1, '$md5 $" MD5_1 "', 15, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- " "
-#endif
-#ifdef SVN_WC__NODES
+
/* load the base nodes into the nodes table */
"insert into nodes values ("
" 1, '', 0, null, 1, '', 1, 'normal',"
@@ -272,116 +173,6 @@ static const char * const TESTING_DATA =
" null, null, 'file', '()', null, '$md5 $" MD5_1 "', null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" 15, null, null, null);"
""
-#endif
-#ifndef SVN_WC__NODES_ONLY
- "insert into working_node values ("
- " 1, 'I', '', 'normal', 'dir', "
- " null, null, "
- " 2, " TIME_2s ", '" AUTHOR_2 "', 'immediates', null, "
- " 2, 'some/dir', 2, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J', '', 'normal', 'dir', "
- " null, null, "
- " null, null, null, 'immediates', null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-a', 'J', 'normal', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-b', 'J', 'normal', 'dir', "
- " null, null, "
- " 2, " TIME_2s ", '" AUTHOR_2 "', 'infinity', null, "
- " 2, 'some/dir', 2, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-b/J-b-a', 'J/J-b', 'normal', 'dir', "
- " null, null, "
- " 2, " TIME_2s ", '" AUTHOR_2 "', 'infinity', null, "
- " 2, 'another/dir', 2, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-b/J-b-b', 'J/J-b', 'normal', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-c', 'J', 'not-present', 'dir', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-c/J-c-a', 'J/J-c', 'not-present', 'dir', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-d', 'J', 'normal', 'file', "
- " '$md5 $" MD5_1 "', 10, "
- " 2, " TIME_2s ", '" AUTHOR_2 "', null, null, "
- " 2, 'moved/file', 2, 1, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-e', 'J', 'not-present', 'dir', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, 'other/place', null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-e/J-e-a', 'J/J-e', 'not-present', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-e/J-e-b', 'J/J-e', 'not-present', 'dir', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-e/J-e-b/Jeba', 'J/J-e/J-e-b', 'base-deleted', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-f', 'J', 'normal', 'dir', "
- " null, null, "
- " null, null, null, 'immediates', null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'J/J-f/J-f-a', 'J/J-f', 'base-deleted', 'dir', "
- " null, null, "
- " null, null, null, 'immediates', null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'K', '', 'base-deleted', 'dir', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'K/K-a', 'K', 'base-deleted', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'K/K-b', 'K', 'base-deleted', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, 'moved/away', null, '()', 0); "
- "insert into working_node values ("
- " 1, 'L', '', 'normal', 'dir', "
- " null, null, "
- " null, null, null, 'immediates', null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'L/L-a', 'L', 'not-present', 'dir', "
- " null, null, "
- " null, null, null, 'immediates', null, "
- " null, null, null, 0, null, null, '()', 0); "
- "insert into working_node values ("
- " 1, 'L/L-a/L-a-a', 'L', 'not-present', 'dir', "
- " null, null, "
- " null, null, null, 'immediates', null, "
- " null, null, null, 0, null, null, '()', 0); "
- " "
-#endif
-#ifdef SVN_WC__NODES
/* Load data into NODES table;
### op_depths have not been calculated by me yet;
the value 1 is just 'good enough' to make the nodes WORKING nodes. */
@@ -469,24 +260,10 @@ static const char * const TESTING_DATA =
" 1, 'L/L-a/L-a-a', 1, 'L', null, null, null, 'not-present',"
" 0, null, 'dir', '()', 'immediates', null, null, null, null, null,"
" null, null, null, null);"
-#endif
"insert into actual_node values ("
" 1, 'I', '', null, null, null, null, null, 'changelist', null, "
"'" I_TC_DATA "', null, null, null, null);"
" "
-#ifndef SVN_WC__NODES_ONLY
- "insert into base_node values ("
- " 1, 'M', null, null, '', 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', null, null, null, '()', null, null, "
- " null); "
- "insert into working_node values ("
- " 1, 'M/M-a', 'M', 'not-present', 'file', "
- " null, null, "
- " null, null, null, null, null, "
- " null, null, null, 0, null, null, '()', 0); "
-#endif
-#ifdef SVN_WC__NODES
"insert into nodes values ("
" 1, 'M', 0, '', null, null, 1, 'normal', "
" null, null, 'dir', '()', null, null, null, 1, " TIME_1s ", '" AUTHOR_1 "', "
@@ -495,7 +272,6 @@ static const char * const TESTING_DATA =
" 1, 'M/M-a', 0, 'M', null, null, 1, 'not-present', "
" null, null, 'file', '()', null, null, null, 1, null, null, "
" null, null, null, null);"
-#endif
);
@@ -509,19 +285,10 @@ static const char * const M_TESTING_DATA
"insert into repository values (2, '" ROOT_TWO "', '" UUID_TWO "'); "
"insert into wcroot values (1, null); "
-#ifndef SVN_WC__NODES_ONLY
- "insert into base_node values ("
- " 1, '', 1, 'M', null, 'normal', 'dir', "
- " 1, null, null, "
- " 1, " TIME_1s ", '" AUTHOR_1 "', 'infinity', null, null, '()', null, 0, "
- " null); "
-#endif
-#ifdef SVN_WC__NODES
"insert into nodes values ("
" 1, '', 0, null, 1, 'M', 1, 'normal',"
" null, null, 'dir', '()', 'infinity', null, null, 1, " TIME_1s ", '" AUTHOR_1 "',"
" null, null, null, null);"
-#endif
);
WC_QUERIES_SQL_DECLARE_STATEMENTS(statements);
@@ -559,17 +326,13 @@ create_fake_wc(const char *subdir, int f
const char *dirpath;
const char * const my_statements[] = {
statements[STMT_CREATE_SCHEMA],
-#ifdef SVN_WC__NODES
statements[STMT_CREATE_NODES],
-#endif
TESTING_DATA,
NULL
};
const char * const M_statements[] = {
statements[STMT_CREATE_SCHEMA],
-#ifdef SVN_WC__NODES
statements[STMT_CREATE_NODES],
-#endif
M_TESTING_DATA,
NULL
};