You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2012/10/12 23:07:15 UTC
svn commit: r1397722 - in
/subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf:
commit.c ra_serf.h xml.c
Author: cmpilato
Date: Fri Oct 12 21:07:14 2012
New Revision: 1397722
URL: http://svn.apache.org/viewvc?rev=1397722&view=rev
Log:
On the 'http-dynamic-prop-namespaces' branch:
Ugh. Simplify, simplify, simplify.
Ditch the whole scan-ahead, namespace-mapping complexity in favor of
simplicity: properties in the "svn" and "custom" namespaces use
prefixes, oddball others use xmlns="" attributes.
"I don't plan to spend much time here," I said. Heh...
* subversion/libsvn_ra_serf/commit.c
(commit_context_t): Remove 'propname_to_xmlname' and
'xmlprefix_to_xmlns' hashes.
(populate_prop_maps): Remove as unused.
(walker_baton_t): Remove 'propname_to_xmlname' hash.
(proppatch_walker): Don't use mapping hashes. Just use predefined
prefixes for namespaces that have them, and "xmlns=" attributes
otherwise.
(create_proppatch_body): Revert all the dynamic prefix definition
stuff.
(open_root): Use svn_ra_serf__wirename_from_svnname() to properly
determine the property's name and namespace.
(change_dir_prop, change_file_prop): Don't mess with property maps
any longer.
(svn_ra_serf__get_commit_editor): Don't populate removed baton
members.
(svn_ra_serf__change_rev_prop): Populate the commit context's
'use_ext_prop_ns' member. Use svn_ra_serf__wirename_from_svnname()
to property determine the property's name and namespace.
* subversion/libsvn_ra_serf/ra_serf.h,
* subversion/libsvn_ra_serf/xml.c
(svn_ra_serf__add_open_tag_attrs_buckets): Remove as unused.
Modified:
subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/commit.c
subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/xml.c
Modified: subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/commit.c?rev=1397722&r1=1397721&r2=1397722&view=diff
==============================================================================
--- subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/commit.c Fri Oct 12 21:07:14 2012
@@ -63,8 +63,6 @@ typedef struct commit_context_t {
/* Stuff for extensible property XML namespaces. */
svn_boolean_t use_ext_prop_ns;
- apr_hash_t *propname_to_xmlname; /* svn propname -> xml tag name */
- apr_hash_t *xmlprefix_to_xmlns; /* xml prefix -> xml namespace */
/* HTTP v2 stuff */
const char *txn_url; /* txn URL (!svn/txn/TXN_NAME) */
@@ -204,54 +202,6 @@ typedef struct file_context_t {
} file_context_t;
-/* Property name/XML name/namespace map management. */
-
-
-/* Examine Subversion property name SVNNAME and its wire components NS
- and NAME, adding them as necessary to the mapping hashes associated
- with COMMIT_CTX. */
-static void
-populate_prop_maps(commit_context_t *commit_ctx,
- const char *svnname,
- const char *ns,
- const char *name)
-{
- apr_pool_t *p2x_pool = apr_hash_pool_get(commit_ctx->propname_to_xmlname);
- apr_pool_t *x2x_pool = apr_hash_pool_get(commit_ctx->xmlprefix_to_xmlns);
-
- /* If we've already mapped this property name, don't do it
- again. */
- if (apr_hash_get(commit_ctx->propname_to_xmlname, svnname,
- APR_HASH_KEY_STRING))
- return;
-
- if (strncmp(ns, SVN_DAV_PROP_NS_EXTENSIBLE,
- sizeof(SVN_DAV_PROP_NS_EXTENSIBLE) - 1) == 0)
- {
- const char *xmlprefix =
- apr_psprintf(x2x_pool, "svn%d",
- apr_hash_count(commit_ctx->xmlprefix_to_xmlns));
- apr_hash_set(commit_ctx->xmlprefix_to_xmlns, xmlprefix,
- APR_HASH_KEY_STRING, apr_pstrdup(x2x_pool, ns));
- apr_hash_set(commit_ctx->propname_to_xmlname,
- apr_pstrdup(p2x_pool, svnname), APR_HASH_KEY_STRING,
- apr_pstrcat(p2x_pool, xmlprefix, name, NULL));
- }
- else if (strcmp(ns, SVN_DAV_PROP_NS_SVN) == 0)
- {
- apr_hash_set(commit_ctx->propname_to_xmlname,
- apr_pstrdup(p2x_pool, svnname), APR_HASH_KEY_STRING,
- apr_pstrcat(p2x_pool, "S:", name, NULL));
- }
- else
- {
- apr_hash_set(commit_ctx->propname_to_xmlname,
- apr_pstrdup(p2x_pool, svnname), APR_HASH_KEY_STRING,
- apr_pstrcat(p2x_pool, "C:", name, NULL));
- }
-}
-
-
/* Setup routines and handlers for various requests we'll invoke. */
static svn_error_t *
@@ -667,10 +617,6 @@ typedef struct walker_baton_t {
/* Is the property being deleted? */
svn_boolean_t deleting;
-
- /* Mapping of actual property name to XML property name. */
- apr_hash_t *propname_to_xmlname;
-
} walker_baton_t;
/* If we have (recorded in WB) the old value of the property named NS:NAME,
@@ -727,7 +673,7 @@ proppatch_walker(void *baton,
svn_boolean_t have_old_val;
const svn_string_t *old_val;
const svn_string_t *encoded_value;
- const char *prop_name;
+ const char *prop_name, *xmlns = NULL;
SVN_ERR(derive_old_val(&have_old_val, &old_val, wb, ns, name));
@@ -758,16 +704,31 @@ proppatch_walker(void *baton,
cdata_bkt = NULL;
}
- /* Use the namespace prefix instead of adding the xmlns attribute to support
- property names containing ':' */
- prop_name = apr_hash_get(wb->propname_to_xmlname, name, APR_HASH_KEY_STRING);
+ /* To reduce the wire transfer size, use prefixes for property
+ namespace for which we've predefined them. */
+ if (strcmp(ns, SVN_DAV_PROP_NS_SVN) == 0)
+ {
+ prop_name = apr_pstrcat(wb->body_pool, "S:", name, (char *)NULL);
+ }
+ else if (strcmp(ns, SVN_DAV_PROP_NS_CUSTOM) == 0)
+ {
+ prop_name = apr_pstrcat(wb->body_pool, "C:", name, (char *)NULL);
+ }
+ else if (strncmp(ns, SVN_DAV_PROP_NS_EXTENSIBLE,
+ sizeof(SVN_DAV_PROP_NS_EXTENSIBLE) - 1) == 0)
+ {
+ prop_name = name;
+ xmlns = ns;
+ }
if (cdata_bkt)
svn_ra_serf__add_open_tag_buckets(body_bkt, alloc, prop_name,
+ "xmlns", xmlns,
"V:encoding", encoding,
NULL);
else
svn_ra_serf__add_open_tag_buckets(body_bkt, alloc, prop_name,
+ "xmlns", xmlns,
"V:" SVN_DAV__OLD_VALUE__ABSENT, "1",
NULL);
@@ -895,44 +856,22 @@ create_proppatch_body(serf_bucket_t **bk
proppatch_context_t *ctx = pbb->proppatch;
serf_bucket_t *body_bkt;
walker_baton_t wb = { 0 };
- apr_hash_t *xmlns_attrs = apr_hash_make(scratch_pool);
- apr_hash_index_t *hi;
body_bkt = serf_bucket_aggregate_create(alloc);
- /* Add our four stock xmlns prefix mappings. */
- apr_hash_set(xmlns_attrs, "xmlns:D", APR_HASH_KEY_STRING,
- "DAV:");
- apr_hash_set(xmlns_attrs, "xmlns:V", APR_HASH_KEY_STRING,
- SVN_DAV_PROP_NS_DAV);
- apr_hash_set(xmlns_attrs, "xmlns:C", APR_HASH_KEY_STRING,
- SVN_DAV_PROP_NS_CUSTOM);
- apr_hash_set(xmlns_attrs, "xmlns:S", APR_HASH_KEY_STRING,
- SVN_DAV_PROP_NS_SVN);
- for (hi = apr_hash_first(scratch_pool,
- ctx->commit->xmlprefix_to_xmlns);
- hi; hi = apr_hash_next(hi))
- {
- const void *key;
- apr_ssize_t klen;
- void *val;
-
- apr_hash_this(hi, &key, &klen, &val);
- apr_hash_set(xmlns_attrs,
- apr_pstrcat(scratch_pool, "xmlns:", key, NULL),
- klen + 6, val);
- }
-
svn_ra_serf__add_xml_header_buckets(body_bkt, alloc);
- svn_ra_serf__add_open_tag_attrs_buckets(body_bkt, alloc, "D:propertyupdate",
- xmlns_attrs);
+ svn_ra_serf__add_open_tag_buckets(body_bkt, alloc, "D:propertyupdate",
+ "xmlns:D", "DAV:",
+ "xmlns:V", SVN_DAV_PROP_NS_DAV,
+ "xmlns:C", SVN_DAV_PROP_NS_CUSTOM,
+ "xmlns:S", SVN_DAV_PROP_NS_SVN,
+ NULL);
wb.body_bkt = body_bkt;
wb.body_pool = pbb->body_pool;
wb.previous_changed_props = ctx->previous_changed_props;
wb.previous_removed_props = ctx->previous_removed_props;
wb.path = ctx->path;
- wb.propname_to_xmlname = ctx->commit->propname_to_xmlname;
if (apr_hash_count(ctx->changed_props) > 0)
{
@@ -1544,23 +1483,18 @@ open_root(void *edit_baton,
{
const void *key;
void *val;
- const char *name;
+ const char *propname;
svn_string_t *value;
- const char *ns;
+ const char *ns, *name;
apr_hash_this(hi, &key, NULL, &val);
- name = key;
+ propname = key;
value = val;
- if (strncmp(name, SVN_PROP_PREFIX, sizeof(SVN_PROP_PREFIX) - 1) == 0)
- {
- ns = SVN_DAV_PROP_NS_SVN;
- name += sizeof(SVN_PROP_PREFIX) - 1;
- }
- else
- {
- ns = SVN_DAV_PROP_NS_CUSTOM;
- }
+ /* Calculate the wirename bits for this property name. */
+ svn_ra_serf__wirename_from_svnname(&ns, &name, propname,
+ dir->commit->use_ext_prop_ns,
+ ctx->pool);
svn_ra_serf__set_prop(proppatch_ctx->changed_props,
proppatch_ctx->path,
@@ -1841,9 +1775,6 @@ change_dir_prop(void *dir_baton,
dir->commit->use_ext_prop_ns,
dir->pool);
- /* Register this property name with the mapping system. */
- populate_prop_maps(dir->commit, propname, ns, name);
-
if (value)
{
value = svn_string_dup(value, dir->pool);
@@ -2078,9 +2009,6 @@ change_file_prop(void *file_baton,
file->commit->use_ext_prop_ns,
file->pool);
- /* Register this property name with the mapping system. */
- populate_prop_maps(file->commit, propname, ns, name);
-
if (value)
{
value = svn_string_dup(value, file->pool);
@@ -2378,15 +2306,10 @@ svn_ra_serf__get_commit_editor(svn_ra_se
ctx->callback = callback;
ctx->callback_baton = callback_baton;
-
ctx->lock_tokens = lock_tokens;
ctx->keep_locks = keep_locks;
-
- ctx->deleted_entries = apr_hash_make(ctx->pool);
-
ctx->use_ext_prop_ns = session->use_ext_prop_ns;
- ctx->propname_to_xmlname = apr_hash_make(ctx->pool);
- ctx->xmlprefix_to_xmlns = apr_hash_make(ctx->pool);
+ ctx->deleted_entries = apr_hash_make(ctx->pool);
editor = svn_delta_default_editor(pool);
editor->open_root = open_root;
@@ -2420,7 +2343,7 @@ svn_ra_serf__get_commit_editor(svn_ra_se
svn_error_t *
svn_ra_serf__change_rev_prop(svn_ra_session_t *ra_session,
svn_revnum_t rev,
- const char *name,
+ const char *propname,
const svn_string_t *const *old_value_p,
const svn_string_t *value,
apr_pool_t *pool)
@@ -2429,7 +2352,7 @@ svn_ra_serf__change_rev_prop(svn_ra_sess
proppatch_context_t *proppatch_ctx;
commit_context_t *commit;
const char *proppatch_target;
- const char *ns;
+ const char *ns, *name;
svn_error_t *err;
if (old_value_p)
@@ -2449,6 +2372,7 @@ svn_ra_serf__change_rev_prop(svn_ra_sess
commit->session = session;
commit->conn = session->conns[0];
+ commit->use_ext_prop_ns = session->use_ext_prop_ns;
if (SVN_RA_SERF__HAVE_HTTPV2_SUPPORT(session))
{
@@ -2467,15 +2391,9 @@ svn_ra_serf__change_rev_prop(svn_ra_sess
pool, pool));
}
- if (strncmp(name, SVN_PROP_PREFIX, sizeof(SVN_PROP_PREFIX) - 1) == 0)
- {
- ns = SVN_DAV_PROP_NS_SVN;
- name += sizeof(SVN_PROP_PREFIX) - 1;
- }
- else
- {
- ns = SVN_DAV_PROP_NS_CUSTOM;
- }
+ /* Calculate the wirename bits for this property name. */
+ svn_ra_serf__wirename_from_svnname(&ns, &name, propname,
+ commit->use_ext_prop_ns, pool);
/* PROPPATCH our log message and pass it along. */
proppatch_ctx = apr_pcalloc(pool, sizeof(*proppatch_ctx));
Modified: subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/ra_serf.h?rev=1397722&r1=1397721&r2=1397722&view=diff
==============================================================================
--- subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/ra_serf.h Fri Oct 12 21:07:14 2012
@@ -1001,21 +1001,6 @@ svn_ra_serf__add_open_tag_buckets(serf_b
...);
/*
- * Add the appropriate serf buckets to AGG_BUCKET representing the XML
- * open tag with name TAG and attributes ATTRS.
- *
- * NOTE: Callers are responsible for XML-escaping attribute values as
- * necessary.
- *
- * The bucket will be allocated from BKT_ALLOC.
- */
-void
-svn_ra_serf__add_open_tag_attrs_buckets(serf_bucket_t *agg_bucket,
- serf_bucket_alloc_t *bkt_alloc,
- const char *tag,
- apr_hash_t *attrs);
-
-/*
* Add the appropriate serf buckets to AGG_BUCKET representing xml tag close
* with name TAG.
*
Modified: subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/xml.c
URL: http://svn.apache.org/viewvc/subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/xml.c?rev=1397722&r1=1397721&r2=1397722&view=diff
==============================================================================
--- subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/xml.c (original)
+++ subversion/branches/http-dynamic-prop-namespaces/subversion/libsvn_ra_serf/xml.c Fri Oct 12 21:07:14 2012
@@ -284,49 +284,6 @@ svn_ra_serf__add_open_tag_buckets(serf_b
}
void
-svn_ra_serf__add_open_tag_attrs_buckets(serf_bucket_t *agg_bucket,
- serf_bucket_alloc_t *bkt_alloc,
- const char *tag,
- apr_hash_t *attrs)
-{
- apr_hash_index_t *hi;
- serf_bucket_t *tmp;
-
- tmp = SERF_BUCKET_SIMPLE_STRING_LEN("<", 1, bkt_alloc);
- serf_bucket_aggregate_append(agg_bucket, tmp);
-
- tmp = SERF_BUCKET_SIMPLE_STRING(tag, bkt_alloc);
- serf_bucket_aggregate_append(agg_bucket, tmp);
-
- for (hi = apr_hash_first(NULL, attrs); hi; hi = apr_hash_next(hi))
- {
- const void *key;
- apr_ssize_t klen;
- void *val;
-
- apr_hash_this(hi, &key, &klen, &val);
-
- tmp = SERF_BUCKET_SIMPLE_STRING_LEN(" ", 1, bkt_alloc);
- serf_bucket_aggregate_append(agg_bucket, tmp);
-
- tmp = SERF_BUCKET_SIMPLE_STRING_LEN(key, klen, bkt_alloc);
- serf_bucket_aggregate_append(agg_bucket, tmp);
-
- tmp = SERF_BUCKET_SIMPLE_STRING_LEN("=\"", 2, bkt_alloc);
- serf_bucket_aggregate_append(agg_bucket, tmp);
-
- tmp = SERF_BUCKET_SIMPLE_STRING(val, bkt_alloc);
- serf_bucket_aggregate_append(agg_bucket, tmp);
-
- tmp = SERF_BUCKET_SIMPLE_STRING_LEN("\"", 1, bkt_alloc);
- serf_bucket_aggregate_append(agg_bucket, tmp);
- }
-
- tmp = SERF_BUCKET_SIMPLE_STRING_LEN(">", 1, bkt_alloc);
- serf_bucket_aggregate_append(agg_bucket, tmp);
-}
-
-void
svn_ra_serf__add_close_tag_buckets(serf_bucket_t *agg_bucket,
serf_bucket_alloc_t *bkt_alloc,
const char *tag)