Author: kgiusti
Date: Wed Mar 4 20:09:52 2015
New Revision: 1664131
URL: http://svn.apache.org/r1664131
Log:
DISPATCH-122: use symbol types to index message and delivery annotations
Modified:
qpid/dispatch/trunk/src/python_embedded.c
qpid/dispatch/trunk/src/router_node.c
qpid/dispatch/trunk/tests/compose_test.c
Modified: qpid/dispatch/trunk/src/python_embedded.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/python_embedded.c?rev=1664131&r1=1664130&r2=1664131&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/python_embedded.c (original)
+++ qpid/dispatch/trunk/src/python_embedded.c Wed Mar 4 20:09:52 2015
@@ -562,10 +562,10 @@ static qd_error_t compose_python_message
*field = qd_compose(QD_PERFORMATIVE_MESSAGE_ANNOTATIONS, *field);
qd_compose_start_map(*field);
- qd_compose_insert_string(*field, QD_MA_INGRESS);
+ qd_compose_insert_symbol(*field, QD_MA_INGRESS);
qd_compose_insert_string(*field, qd_router_id(qd));
- qd_compose_insert_string(*field, QD_MA_TRACE);
+ qd_compose_insert_symbol(*field, QD_MA_TRACE);
qd_compose_start_list(*field);
qd_compose_insert_string(*field, qd_router_id(qd));
qd_compose_end_list(*field);
Modified: qpid/dispatch/trunk/src/router_node.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/router_node.c?rev=1664131&r1=1664130&r2=1664131&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/router_node.c (original)
+++ qpid/dispatch/trunk/src/router_node.c Wed Mar 4 20:09:52 2015
@@ -560,17 +560,17 @@ static qd_field_iterator_t *router_annot
// If there is a to_override provided, insert a TO field.
//
if (to_override) {
- qd_compose_insert_string(out_ma, QD_MA_TO);
+ qd_compose_insert_symbol(out_ma, QD_MA_TO);
qd_compose_insert_string(out_ma, to_override);
} else if (to) {
- qd_compose_insert_string(out_ma, QD_MA_TO);
+ qd_compose_insert_symbol(out_ma, QD_MA_TO);
qd_compose_insert_string_iterator(out_ma, qd_parse_raw(to));
}
//
// If there is a trace field, append this router's ID to the trace.
//
- qd_compose_insert_string(out_ma, QD_MA_TRACE);
+ qd_compose_insert_symbol(out_ma, QD_MA_TRACE);
qd_compose_start_list(out_ma);
if (trace) {
if (qd_parse_is_list(trace)) {
@@ -595,7 +595,7 @@ static qd_field_iterator_t *router_annot
// If there is no ingress field, annotate the ingress as this router else
// keep the original field.
//
- qd_compose_insert_string(out_ma, QD_MA_INGRESS);
+ qd_compose_insert_symbol(out_ma, QD_MA_INGRESS);
if (ingress && qd_parse_is_scalar(ingress)) {
ingress_iter = qd_parse_raw(ingress);
qd_compose_insert_string_iterator(out_ma, ingress_iter);
Modified: qpid/dispatch/trunk/tests/compose_test.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/compose_test.c?rev=1664131&r1=1664130&r2=1664131&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/compose_test.c (original)
+++ qpid/dispatch/trunk/tests/compose_test.c Wed Mar 4 20:09:52 2015
@@ -129,9 +129,9 @@ static char *test_compose_list_of_maps(v
static char *vector1 =
"\x00\x53\x71" // delivery annotations
"\xd1\x00\x00\x00\x3d\x00\x00\x00\x04" // map32 with two item pairs
- "\xa1\x06key001" // str8-utf8
+ "\xa3\x06key001" // sym8
"\x52\x0a" // smalluint
- "\xa1\x06key002" // str8-utf8
+ "\xa3\x06key002" // sym8
"\xd0\x00\x00\x00\x22\x00\x00\x00\x04" // list32 with four items
"\xa1\x05item1" // str8-utf8
"\xa1\x05item2" // str8-utf8
@@ -147,10 +147,10 @@ static char *test_compose_nested_composi
qd_compose_start_map(field);
- qd_compose_insert_string(field, "key001");
+ qd_compose_insert_symbol(field, "key001");
qd_compose_insert_uint(field, 10);
- qd_compose_insert_string(field, "key002");
+ qd_compose_insert_symbol(field, "key002");
qd_compose_start_list(field);
qd_compose_insert_string(field, "item1");
@@ -159,7 +159,7 @@ static char *test_compose_nested_composi
qd_compose_start_list(field);
qd_compose_end_list(field);
-
+
qd_compose_end_list(field);
qd_compose_end_map(field);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
