From: Petr Špaček <petr.spacek@nic.cz>
Date: Thu, 16 Aug 2018 14:26:53 +0000 (+0200)
Subject: cache.clear: clarify chunk size limit
X-Git-Tag: v3.0.0~1^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3273cce151b82e3136296329431c9e1088db46e4;p=thirdparty%2Fknot-resolver.git

cache.clear: clarify chunk size limit
---

diff --git a/daemon/README.rst b/daemon/README.rst
index 090c88bf0..935a4f360 100644
--- a/daemon/README.rst
+++ b/daemon/README.rst
@@ -864,7 +864,7 @@ daemons or manipulated from other processes, making for example synchronised loa
          [AAAA] => true
      }
 
-.. function:: cache.clear([name], [exact_name], [rr_type], [maxcount], [callback])
+.. function:: cache.clear([name], [exact_name], [rr_type], [chunk_size], [callback])
 
   Purge cache records.
 
@@ -873,16 +873,17 @@ daemons or manipulated from other processes, making for example synchronised loa
   :param string name: if the name isn't provided, whole cache is purged
         (and any other parameters are disregarded).
         Otherwise only records in that subtree are removed.
-  :param bool exact_name: if set to ``true``, only records with *the same* name are removed.
+  :param bool exact_name: if set to ``true``, only records with *the same* name are removed;
+                          default: false.
   :param kres.type rr_type: you may additionally specify the type to remove,
-        but that is only supported with ``exact_name == true``.
-  :param integer maxcount: the number of records to remove at one go, default: 100.
-        The purpose is not to block the resolver for long;
-        the ``callback`` parameter by default handles this by asynchronous repetition.
+        but that is only supported with ``exact_name == true``; default: nil;
+  :param integer chunk_size: the number of records to remove at one go; default: 100.
+        The purpose is not to block the resolver for long.
+        The default ``callback`` repeats the command after one millisecond
+        until all matching data are cleared.
   :param function callback: custom code to handle result of the underlying C call.
         As the first parameter it gets the return code from :func:`kr_cache_remove_subtree()`,
         and the following parameters are copies of those passed to `cache.clear()`.
-        The default callback repeats the command after one millisecond (if successful).
 
   Examples:
 
diff --git a/daemon/lua/sandbox.lua b/daemon/lua/sandbox.lua
index af5b10dc4..732d1d50d 100644
--- a/daemon/lua/sandbox.lua
+++ b/daemon/lua/sandbox.lua
@@ -158,7 +158,7 @@ setmetatable(modules, {
 })
 
 
-cache.clear = function (name, exact_name, rr_type, maxcount, callback)
+cache.clear = function (name, exact_name, rr_type, chunk_size, callback)
 	if name == nil then return cache.clear_everything() end
 	-- Check parameters, in order, and set defaults if missing.
 	local dname = kres.str2dname(name)
@@ -190,39 +190,39 @@ cache.clear = function (name, exact_name, rr_type, maxcount, callback)
 		-- Special case, without any subtree searching.
 		if not exact_name
 			then error('cache.clear(): specifying rr_type only supported with exact_name') end
-		if maxcount or callback
-			then error('cache.clear(): maxcount and callback parameters not supported with rr_type') end
+		if chunk_size or callback
+			then error('cache.clear(): chunk_size and callback parameters not supported with rr_type') end
 		local ret = ffi.C.kr_cache_remove(cach, dname, rr_type)
 		if ret < 0 then error(ffi.string(ffi.C.knot_strerror(ret))) end
 		return true
 	end
 
-	if maxcount == nil then maxcount = 100 end
-	if type(maxcount) ~= 'number' or maxcount <= 0
-		then error('cache.clear(): maxcount has to be a positive integer') end
+	if chunk_size == nil then chunk_size = 100 end
+	if type(chunk_size) ~= 'number' or chunk_size <= 0
+		then error('cache.clear(): chunk_size has to be a positive integer') end
 
-	-- Do the C call, and add maxcount warning.
-	errors.count = ffi.C.kr_cache_remove_subtree(cach, dname, exact_name, maxcount)
-	if errors.count == maxcount then
+	-- Do the C call, and add chunk_size warning.
+	errors.count = ffi.C.kr_cache_remove_subtree(cach, dname, exact_name, chunk_size)
+	if errors.count == chunk_size then
 		local msg_extra = ''
 		if callback == nil then
 			msg_extra = '; the default callback will continue asynchronously'
 		end
-		errors.count_limit = 'Limit of ' .. tostring(maxcount) .. ' entries reached'
-							.. msg_extra .. '.'
+		errors.chunk_limit = 'chunk size limit of ' .. tostring(chunk_size)
+				     .. ' entries reached' .. msg_extra
 	end
 
 	-- Default callback function: repeat after 1ms
 	if callback == nil then callback =
-		function (cberrors, cbname, cbexact_name, cbrr_type, cbmaxcount, cbself)
+		function (cberrors, cbname, cbexact_name, cbrr_type, cbchunk_size, cbself)
 			if errors.count < 0 then error(ffi.string(ffi.C.knot_strerror(errors.count))) end
-			if (errors.count ~= cbmaxcount) then return end
+			if (errors.count ~= cbchunk_size) then return end
 			event.after(1, function ()
-					cache.clear(cbname, cbexact_name, cbrr_type, cbmaxcount, cbself)
+					cache.clear(cbname, cbexact_name, cbrr_type, cbchunk_size, cbself)
 				end)
 		end
 	end
-	callback(errors, name, exact_name, rr_type, maxcount, callback)
+	callback(errors, name, exact_name, rr_type, chunk_size, callback)
 	return errors
 end
 -- Syntactic sugar for cache