Skip to content
Snippets Groups Projects
Commit 9ca2589e authored by Grigorii Demidov's avatar Grigorii Demidov Committed by Ondřej Surý
Browse files

tests: sync deckard; cleanup

parent 3ce4474b
Branches
Tags
2 merge requests!2571.2 merge master,!2181.2.4 dev
......@@ -475,7 +475,7 @@ int kr_ranked_rrarray_set_wire(ranked_rr_array_t *array, bool to_wire,
continue;
}
entry->to_wire = to_wire;
if (!check_dups) {
if (!to_wire || !check_dups) {
continue;
}
knot_rrset_t *rr = entry->rr;
......@@ -490,7 +490,7 @@ int kr_ranked_rrarray_set_wire(ranked_rr_array_t *array, bool to_wire,
}
bool is_equal = knot_rrset_equal(rr, stashed->rr,
KNOT_RRSET_COMPARE_WHOLE);
if (is_equal && to_wire) {
if (is_equal) {
stashed->to_wire = false;
}
}
......
......@@ -190,6 +190,14 @@ int kr_rrarray_add(rr_array_t *array, const knot_rrset_t *rr, knot_mm_t *pool);
int kr_ranked_rrarray_add(ranked_rr_array_t *array, const knot_rrset_t *rr,
uint8_t rank, bool to_wire, uint32_t qry_uid, knot_mm_t *pool);
/** @internal Mark the RRSets from particular query as
* "have (not) to be recorded in the final answer".
* @param array RRSet array.
* @param to_wire Records must be\must not be recorded in final answer.
* @param qry_uid Query uid.
* @param check_dups When to_wire is true, try to avoid duplicate RRSets.
* @return 0 or an error
*/
int kr_ranked_rrarray_set_wire(ranked_rr_array_t *array, bool to_wire,
uint32_t qry_uid, bool check_dups);
......
deckard @ b7453577
Subproject commit 23123278300caac55c0cccfeccc96267246b0993
Subproject commit b7453577c57cb837261ca6e21098b8a44a9e8b3d
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment