mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

add setup/commit functions to rdatacallbacks

Browse Source 
because dns_qpmulti_commit() can be time consuming, it's inefficient
to open and commit a qpmulti transaction for each rdataset being loaded
into a database.  we can improve load time by opening a qpmulti
transaction before adding a group of rdatasets and then committing it
afterward.

this commit adds 'setup' and 'commit' functions to dns_rdatacallbacks_t,
which can be called before and after the loops in which 'add' is
called in dns_master_load() and axfr_apply().
This commit is contained in:
Evan Hunt
2024-02-05 16:11:16 -08:00
parent 2e45866715
commit 3512cf5654
8 changed files with 121 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/dns/diff.c
View File

@@ -24,6 +24,7 @@
#include <isc/string.h>
#include <isc/util.h>
#include <dns/callbacks.h>
#include <dns/db.h>
#include <dns/diff.h>
#include <dns/log.h>
@@ -506,13 +507,16 @@ dns_diff_applysilently(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver) {
/* XXX this duplicates lots of code in diff_apply(). */
isc_result_t
dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc,
void *add_private) {
dns_diff_load(dns_diff_t *diff, dns_rdatacallbacks_t *callbacks) {
dns_difftuple_t *t;
isc_result_t result;
REQUIRE(DNS_DIFF_VALID(diff));
if (callbacks->setup != NULL) {
callbacks->setup(callbacks->add_private);
}
t = ISC_LIST_HEAD(diff->tuples);
while (t != NULL) {
dns_name_t *name;
@@ -551,8 +555,8 @@ dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc,
rds.trust = dns_trust_ultimate;
INSIST(op == DNS_DIFFOP_ADD);
result = (*addfunc)(add_private, name,
&rds DNS__DB_FILELINE);
result = callbacks->add(callbacks->add_private, name,
&rds DNS__DB_FILELINE);
if (result == DNS_R_UNCHANGED) {
isc_log_write(DIFF_COMMON_LOGARGS,
ISC_LOG_WARNING,
@@ -570,7 +574,11 @@ dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc,
}
}
result = ISC_R_SUCCESS;
failure:
if (callbacks->commit != NULL) {
callbacks->commit(callbacks->add_private);
}
return (result);
}