From: Evan Hunt <each@isc.org>
Date: Mon, 4 Aug 2025 23:24:09 +0000 (-0700)
Subject: remove obsolete dns_db_hashsize()
X-Git-Tag: v9.21.14~44^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e14fcd2592d741e63c82fbffc5e5964603a8241;p=thirdparty%2Fbind9.git

remove obsolete dns_db_hashsize()

this function's purpose was to populate the "CacheBuckets" statistic,
but there are no databases left that implemented it, so the return
value was always 0. "CacheBuckets" has now been removed from the
statistics, and the dns_db_hashsize() API call has been removed.
---

diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index 83a8e494a90..69267ea4d41 100644
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -622,8 +622,6 @@ dns_cache_dumpstats(dns_cache_t *cache, FILE *fp) {
 		"cache database nodes");
 	fprintf(fp, "%20u %s\n", dns_db_nodecount(cache->db, dns_dbtree_nsec),
 		"cache NSEC auxiliary database nodes");
-	fprintf(fp, "%20" PRIu64 " %s\n", (uint64_t)dns_db_hashsize(cache->db),
-		"cache database hash buckets");
 
 	fprintf(fp, "%20" PRIu64 " %s\n", (uint64_t)isc_mem_inuse(cache->tmctx),
 		"cache tree memory in use");
@@ -683,7 +681,6 @@ dns_cache_renderxml(dns_cache_t *cache, void *writer0) {
 			dns_db_nodecount(cache->db, dns_dbtree_main), writer));
 	TRY0(renderstat("CacheNSECNodes",
 			dns_db_nodecount(cache->db, dns_dbtree_nsec), writer));
-	TRY0(renderstat("CacheBuckets", dns_db_hashsize(cache->db), writer));
 
 	TRY0(renderstat("TreeMemInUse", isc_mem_inuse(cache->tmctx), writer));
 
@@ -753,10 +750,6 @@ dns_cache_renderjson(dns_cache_t *cache, void *cstats0) {
 	CHECKMEM(obj);
 	json_object_object_add(cstats, "CacheNSECNodes", obj);
 
-	obj = json_object_new_int64(dns_db_hashsize(cache->db));
-	CHECKMEM(obj);
-	json_object_object_add(cstats, "CacheBuckets", obj);
-
 	obj = json_object_new_int64(isc_mem_inuse(cache->tmctx));
 	CHECKMEM(obj);
 	json_object_object_add(cstats, "TreeMemInUse", obj);
diff --git a/lib/dns/db.c b/lib/dns/db.c
index c9f3363a342..6ffcdca7d46 100644
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -800,17 +800,6 @@ dns_db_nodecount(dns_db_t *db, dns_dbtree_t tree) {
 	return 0;
 }
 
-size_t
-dns_db_hashsize(dns_db_t *db) {
-	REQUIRE(DNS_DB_VALID(db));
-
-	if (db->methods->hashsize == NULL) {
-		return 0;
-	}
-
-	return (db->methods->hashsize)(db);
-}
-
 isc_result_t
 dns_db_register(const char *name, dns_dbcreatefunc_t create, void *driverarg,
 		isc_mem_t *mctx, dns_dbimplementation_t **dbimp) {
diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 6b6f7427539..91a43e2c13f 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -173,7 +173,6 @@ typedef struct dns_db_methods {
 				dns_rdataset_t		   *rdataset,
 				dns_rdataset_t *sigrdataset DNS__DB_FLARG);
 	isc_result_t (*setcachestats)(dns_db_t *db, isc_stats_t *stats);
-	size_t (*hashsize)(dns_db_t *db);
 	isc_result_t (*getsize)(dns_db_t *db, dns_dbversion_t *version,
 				uint64_t *records, uint64_t *bytes);
 	isc_result_t (*setservestalettl)(dns_db_t *db, dns_ttl_t ttl);