diff --git a/src/core/ext/census/grpc_filter.c b/src/core/ext/census/grpc_filter.c
index 5008879512c5afc6777b379d7a9f7c810649b39e..c1a883b6f8d2e9cee3bafb7eceb780fc14af82fe 100644
--- a/src/core/ext/census/grpc_filter.c
+++ b/src/core/ext/census/grpc_filter.c
@@ -67,7 +67,7 @@ static void extract_and_annotate_method_tag(grpc_metadata_batch *md,
channel_data *chand) {
grpc_linked_mdelem *m;
for (m = md->list.head; m != NULL; m = m->next) {
- if (grpc_slice_cmp(m->md->key, GRPC_MDSTR_PATH) == 0) {
+ if (grpc_slice_cmp(GRPC_MDKEY(m->md), GRPC_MDSTR_PATH) == 0) {
/* Add method tag here */
}
}
diff --git a/test/core/compression/algorithm_test.c b/test/core/compression/algorithm_test.c
index 1f666b85bb0e287c9f184fda13ba0e53280473a2..fa0bdb8c1995c626abad1f5f4e0fdff1b0e65809 100644
--- a/test/core/compression/algorithm_test.c
+++ b/test/core/compression/algorithm_test.c
@@ -65,16 +65,17 @@ static void test_algorithm_mesh(void) {
grpc_slice_cmp(mdstr, grpc_compression_algorithm_slice(parsed)));
GPR_ASSERT(parsed == grpc_compression_algorithm_from_slice(mdstr));
mdelem = grpc_compression_encoding_mdelem(parsed);
- GPR_ASSERT(0 == grpc_slice_cmp(mdelem->value, mdstr));
- GPR_ASSERT(0 == grpc_slice_cmp(mdelem->key, GRPC_MDSTR_GRPC_ENCODING));
+ GPR_ASSERT(0 == grpc_slice_cmp(GRPC_MDVALUE(mdelem), mdstr));
+ GPR_ASSERT(0 ==
+ grpc_slice_cmp(GRPC_MDKEY(mdelem), GRPC_MDSTR_GRPC_ENCODING));
grpc_slice_unref_internal(&exec_ctx, mdstr);
GRPC_MDELEM_UNREF(&exec_ctx, mdelem);
grpc_exec_ctx_finish(&exec_ctx);
}
/* test failure */
- GPR_ASSERT(NULL ==
- grpc_compression_encoding_mdelem(GRPC_COMPRESS_ALGORITHMS_COUNT));
+ GPR_ASSERT(GRPC_MDISNULL(
+ grpc_compression_encoding_mdelem(GRPC_COMPRESS_ALGORITHMS_COUNT)));
}
static void test_algorithm_failure(void) {
diff --git a/test/core/transport/chttp2/hpack_parser_test.c b/test/core/transport/chttp2/hpack_parser_test.c
index 14c5de24406b0915aebd452177478756eaa3e063..b7f35a5e44578b2d60ac7d951dbf9dbde11de379 100644
--- a/test/core/transport/chttp2/hpack_parser_test.c
+++ b/test/core/transport/chttp2/hpack_parser_test.c
@@ -52,8 +52,8 @@ static void onhdr(grpc_exec_ctx *exec_ctx, void *ud, grpc_mdelem md) {
GPR_ASSERT(ekey);
evalue = va_arg(chk->args, char *);
GPR_ASSERT(evalue);
- GPR_ASSERT(grpc_slice_str_cmp(md->key, ekey) == 0);
- GPR_ASSERT(grpc_slice_str_cmp(md->value, evalue) == 0);
+ GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDKEY(md), ekey) == 0);
+ GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(md), evalue) == 0);
GRPC_MDELEM_UNREF(exec_ctx, md);
}
diff --git a/test/core/transport/chttp2/hpack_table_test.c b/test/core/transport/chttp2/hpack_table_test.c
index 0de1e2729abb2dfea6928e008f340701bc9d11eb..d2f6d5dc5bc31b88470a195f5efe4a520f9268a4 100644
--- a/test/core/transport/chttp2/hpack_table_test.c
+++ b/test/core/transport/chttp2/hpack_table_test.c
@@ -54,8 +54,8 @@ static void assert_str(const grpc_chttp2_hptbl *tbl, grpc_slice mdstr,
static void assert_index(const grpc_chttp2_hptbl *tbl, uint32_t idx,
const char *key, const char *value) {
grpc_mdelem md = grpc_chttp2_hptbl_lookup(tbl, idx);
- assert_str(tbl, md->key, key);
- assert_str(tbl, md->value, value);
+ assert_str(tbl, GRPC_MDKEY(md), key);
+ assert_str(tbl, GRPC_MDVALUE(md), value);
}
static void test_static_lookup(void) {
diff --git a/test/core/transport/metadata_test.c b/test/core/transport/metadata_test.c
index 59b5edce0ac17452ae1b1caee08a9538b032af87..d31bc1eedf523185b4cecf9d663cd7fa132f7cb8 100644
--- a/test/core/transport/metadata_test.c
+++ b/test/core/transport/metadata_test.c
@@ -69,7 +69,7 @@ static grpc_slice maybe_dup(grpc_slice in, bool dup) {
}
static void test_create_metadata(bool intern_keys, bool intern_values) {
- grpc_mdelem m1, *m2, *m3;
+ grpc_mdelem m1, m2, m3;
gpr_log(GPR_INFO, "test_create_metadata: intern_keys=%d intern_values=%d",
intern_keys, intern_values);
@@ -85,13 +85,13 @@ static void test_create_metadata(bool intern_keys, bool intern_values) {
m3 = grpc_mdelem_from_slices(
&exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys),
maybe_intern(grpc_slice_from_static_string("c"), intern_values));
- GPR_ASSERT(m1 == m2);
- GPR_ASSERT(m3 != m1);
- GPR_ASSERT(grpc_slice_cmp(m3->key, m1->key) == 0);
- GPR_ASSERT(grpc_slice_cmp(m3->value, m1->value) != 0);
- GPR_ASSERT(grpc_slice_str_cmp(m1->key, "a") == 0);
- GPR_ASSERT(grpc_slice_str_cmp(m1->value, "b") == 0);
- GPR_ASSERT(grpc_slice_str_cmp(m3->value, "c") == 0);
+ GPR_ASSERT(grpc_mdelem_eq(m1, m2));
+ GPR_ASSERT(!grpc_mdelem_eq(m3, m1));
+ GPR_ASSERT(grpc_slice_cmp(GRPC_MDKEY(m3), GRPC_MDKEY(m1)) == 0);
+ GPR_ASSERT(grpc_slice_cmp(GRPC_MDVALUE(m3), GRPC_MDVALUE(m1)) != 0);
+ GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDKEY(m1), "a") == 0);
+ GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(m1), "b") == 0);
+ GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(m3), "c") == 0);
GRPC_MDELEM_UNREF(&exec_ctx, m1);
GRPC_MDELEM_UNREF(&exec_ctx, m2);
GRPC_MDELEM_UNREF(&exec_ctx, m3);
@@ -149,7 +149,7 @@ static void test_create_many_persistant_metadata(void) {
md = grpc_mdelem_from_slices(
&exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("a")),
grpc_slice_intern(grpc_slice_from_copied_string(buffer)));
- GPR_ASSERT(md == created[i]);
+ GPR_ASSERT(grpc_mdelem_eq(md, created[i]));
GRPC_MDELEM_UNREF(&exec_ctx, md);
}
/* cleanup phase */
@@ -170,7 +170,7 @@ static void test_spin_creating_the_same_thing(bool intern_keys,
grpc_init();
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
- grpc_mdelem a, *b, *c;
+ grpc_mdelem a, b, c;
GRPC_MDELEM_UNREF(
&exec_ctx,
a = grpc_mdelem_from_slices(
@@ -189,14 +189,15 @@ static void test_spin_creating_the_same_thing(bool intern_keys,
&exec_ctx,
maybe_intern(grpc_slice_from_static_string("a"), intern_keys),
maybe_intern(grpc_slice_from_static_string("b"), intern_values)));
+ GPR_ASSERT(grpc_mdelem_eq(a, b));
+ GPR_ASSERT(grpc_mdelem_eq(a, c));
if (intern_keys && intern_values) {
- GPR_ASSERT(a == b);
- GPR_ASSERT(a == c);
+ GPR_ASSERT(a.payload == b.payload);
+ GPR_ASSERT(a.payload == c.payload);
} else {
- // TODO(ctiller): make this true
- // GPR_ASSERT(a != b);
- // GPR_ASSERT(a != c);
- // GPR_ASSERT(b != c);
+ GPR_ASSERT(a.payload != b.payload);
+ GPR_ASSERT(a.payload != c.payload);
+ GPR_ASSERT(b.payload != c.payload);
}
grpc_exec_ctx_finish(&exec_ctx);
grpc_shutdown();
@@ -295,7 +296,7 @@ static void verify_binary_header_size(grpc_exec_ctx *exec_ctx, const char *key,
exec_ctx, maybe_intern(grpc_slice_from_static_string(key), intern_key),
maybe_intern(grpc_slice_from_static_buffer(value, value_len),
intern_value));
- GPR_ASSERT(grpc_is_binary_header(elem->key));
+ GPR_ASSERT(grpc_is_binary_header(GRPC_MDKEY(elem)));
size_t elem_size = grpc_mdelem_get_size_in_hpack_table(elem);
grpc_slice value_slice =
grpc_slice_from_copied_buffer((const char *)value, value_len);
@@ -343,10 +344,16 @@ static void test_copied_static_metadata(bool dup_key, bool dup_value) {
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
for (size_t i = 0; i < GRPC_STATIC_MDELEM_COUNT; i++) {
- grpc_mdelem p = &grpc_static_mdelem_table[i];
- grpc_mdelem q = grpc_mdelem_from_slices(
- &exec_ctx, maybe_dup(p->key, dup_key), maybe_dup(p->value, dup_value));
- GPR_ASSERT(p == q);
+ grpc_mdelem p = (grpc_mdelem){&grpc_static_mdelem_table[i]};
+ grpc_mdelem q =
+ grpc_mdelem_from_slices(&exec_ctx, maybe_dup(GRPC_MDKEY(p), dup_key),
+ maybe_dup(GRPC_MDVALUE(p), dup_value));
+ GPR_ASSERT(grpc_mdelem_eq(p, q));
+ if (dup_key || dup_value) {
+ GPR_ASSERT(p.payload != q.payload);
+ } else {
+ GPR_ASSERT(p.payload == q.payload);
+ }
}
grpc_exec_ctx_finish(&exec_ctx);