You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by eh...@apache.org on 2010/09/06 23:58:04 UTC
svn commit: r993160 - in /subversion/trunk/subversion/libsvn_wc:
wc-queries.sql wc_db.c
Author: ehu
Date: Mon Sep 6 21:58:04 2010
New Revision: 993160
URL: http://svn.apache.org/viewvc?rev=993160&view=rev
Log:
Convert more to SVN_WC__NODES.
* subversion/libsvn_wc/wc-queries.sql
(STMT_INSERT_BASE_NODE_DATA_INCOMPLETE_DIR): Remove - obsolete.
* subversion/libsvn_wc/wc_db.c
(insert_base_node): Fix format string for 'changed_date'; promoting
a NODES section to SVN_WC__NODES.
(insert_complete_working_children): Convert SVN_WC__NODE_DATA sections
to SVN_WC__NODES. Add SVN_WC__NODES_ONLY sections.
(set_new_dir_to_incomplete_txn): Convert SVN_WC__NODE_DATA sections
to SVN_WC__NODES.
Modified:
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=993160&r1=993159&r2=993160&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Mon Sep 6 21:58:04 2010
@@ -106,11 +106,6 @@ insert or ignore into base_node (
kind, revnum, depth)
values (?1, ?2, ?3, ?4, ?5, 'incomplete', 'dir', ?6, ?7);
--- STMT_INSERT_BASE_NODE_DATA_INCOMPLETE_DIR
-insert or ignore into node_data (
- wc_id, local_relpath, op_depth, parent_relpath, presence, kind, depth)
-values (?1, ?2, 0, ?3, 'incomplete', 'dir', ?4);
-
-- STMT_INSERT_WORKING_NODE_INCOMPLETE
INSERT OR IGNORE INTO WORKING_NODE (
wc_id, local_relpath, parent_relpath, presence, kind)
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=993160&r1=993159&r2=993160&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Sep 6 21:58:04 2010
@@ -646,27 +646,27 @@ insert_base_node(void *baton, svn_sqlite
SVN_ERR(svn_sqlite__insert(NULL, stmt));
#endif
-#ifdef NODES
+#ifdef SVN_WC__NODES
/* the 'r' binding below doesn't work yet...
no idea why; needs more investigation... */
SVN_ERR(svn_sqlite__get_statement(&stmt_node, sdb, STMT_INSERT_NODE));
{ svn_revnum_t rev = pibb->changed_rev;
SVN_ERR(svn_sqlite__bindf(stmt_node, "isisnnn" /* No repos rev, id, path */
- "tstr" /* 5 - 8 */
- "ssnnnnns",
+ "tstr" /* 8 - 11 */
+ "isnnnnns", /* 12 - 19 */
pibb->wc_id, /* 1 */
pibb->local_relpath, /* 2 */
(apr_int64_t)0, /* op_depth is 0 for base */
parent_relpath, /* 4 */
- presence_map, pibb->status, /* 5 */
- (pibb->kind == svn_wc__db_kind_dir) ? /* 6 */
- svn_depth_to_word(pibb->depth) : NULL
- kind_map, pibb->kind, /* 7 */
- rev, /* 8 */
- pibb->changed_date,
- pibb->changed_author,
+ presence_map, pibb->status, /* 8 */
+ (pibb->kind == svn_wc__db_kind_dir) ? /* 9 */
+ svn_depth_to_word(pibb->depth) : NULL,
+ kind_map, pibb->kind, /* 10 */
+ rev, /* 11 */
+ pibb->changed_date, /* 12 */
+ pibb->changed_author, /* 13 */
(pibb->kind == svn_wc__db_kind_symlink) ?
- pibb->target : NULL));
+ pibb->target : NULL)); /* 19 */
}
if (pibb->kind == svn_wc__db_kind_file)
@@ -793,17 +793,21 @@ insert_incomplete_working_children(svn_s
const apr_array_header_t *children,
apr_pool_t *scratch_pool)
{
+#ifndef SVN_WC__NODES_ONLY
svn_sqlite__stmt_t *stmt;
-#ifdef SVN_WC__NODE_DATA
+#endif
+#ifdef SVN_WC__NODES
svn_sqlite__stmt_t *stmt_node;
#endif
int i;
+#ifndef SVN_WC__NODES_ONLY
SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
STMT_INSERT_WORKING_NODE_INCOMPLETE));
-#ifdef SVN_WC__NODE_DATA
+#endif
+#ifdef SVN_WC__NODES
SVN_ERR(svn_sqlite__get_statement(&stmt_node, sdb,
- STMT_INSERT_NODE_DATA_INCOMPLETE));
+ STMT_INSERT_NODE));
#endif
@@ -811,21 +815,25 @@ insert_incomplete_working_children(svn_s
{
const char *name = APR_ARRAY_IDX(children, i, const char *);
+#ifndef SVN_WC__NODES_ONLY
SVN_ERR(svn_sqlite__bindf(stmt, "iss",
wc_id,
svn_relpath_join(local_relpath, name,
scratch_pool),
local_relpath));
SVN_ERR(svn_sqlite__insert(NULL, stmt));
-
-#ifdef SVN_WC__NODE_DATA
- SVN_ERR(svn_sqlite__bindf(stmt_node, "isis",
+#endif
+#ifdef SVN_WC__NODES
+ SVN_ERR(svn_sqlite__bindf(stmt_node, "isisnnnsns",
wc_id,
svn_relpath_join(local_relpath, name,
scratch_pool),
(apr_int64_t) 2, /* ### op_depth
non-THIS_DIR working */
- local_relpath));
+ local_relpath,
+ "incomplete", /* 8, presence */
+ "unknown")); /* 10, kind */
+
SVN_ERR(svn_sqlite__insert(NULL, stmt_node));
#endif
}
@@ -8945,19 +8953,24 @@ set_new_dir_to_incomplete_txn(void *bato
#endif
-#ifdef SVN_WC__NODE_DATA
+#ifdef SVN_WC__NODES
/* Insert the incomplete base node */
SVN_ERR(svn_sqlite__get_statement(&stmt, dtb->pdh->wcroot->sdb,
- STMT_INSERT_BASE_NODE_DATA_INCOMPLETE_DIR));
+ STMT_INSERT_NODE));
- SVN_ERR(svn_sqlite__bindf(stmt, "iss", dtb->pdh->wcroot->wc_id,
- dtb->local_relpath,
- parent_relpath));
+ SVN_ERR(svn_sqlite__bindf(stmt, "isis" /* 1 - 4 */
+ "nnn" "sns", /* 5 - 7(n), 8, 9(n), 10 */
+ dtb->pdh->wcroot->wc_id, /* 1 */
+ dtb->local_relpath, /* 2 */
+ (apr_int64_t)0, /* op_depth == 0; BASE */
+ parent_relpath, /* 4 */
+ "incomplete", /* 8, presence */
+ "dir")); /* 10, kind */
/* If depth is not unknown: record depth */
if (dtb->depth >= svn_depth_empty && dtb->depth <= svn_depth_infinity)
- SVN_ERR(svn_sqlite__bind_text(stmt, 4, svn_depth_to_word(dtb->depth)));
+ SVN_ERR(svn_sqlite__bind_text(stmt, 9, svn_depth_to_word(dtb->depth)));
SVN_ERR(svn_sqlite__step_done(stmt));