From: Marek Vavrusa <marek@vavrusa.com>
Date: Tue, 31 May 2016 18:01:29 +0000 (-0700)
Subject: modules/predict: fixup
X-Git-Tag: v1.1.0~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e902b945e3da7a18f5dee0686e48f1cf0e6861c;p=thirdparty%2Fknot-resolver.git

modules/predict: fixup
---

diff --git a/modules/predict/predict.lua b/modules/predict/predict.lua
index 7b2549723..b570d7df0 100644
--- a/modules/predict/predict.lua
+++ b/modules/predict/predict.lua
@@ -30,7 +30,8 @@ end
 function predict.drain(ev)
 	local deleted = 0
 	for key, val in pairs(predict.queue) do
-		worker.resolve(string.sub(key, 2), string.byte(key), 1, kres.query.NO_CACHE)
+		local qname, qtype = key:match('(%S*)%s(.*)')
+		worker.resolve(qname, kres.type[qtype], 1, kres.query.NO_CACHE)
 		predict.queue[key] = nil
 		deleted = deleted + 1
 		if deleted >= predict.batch then
@@ -53,7 +54,7 @@ local function enqueue(queries)
 	local nr_queries = #queries
 	for i = 1, nr_queries do
 		local entry = queries[i]
-		local key = string.char(entry.type)..entry.name
+		local key = string.format('%s %s', entry.type, entry.name)
 		if not predict.queue[key] then
 			predict.queue[key] = 1
 			queued = queued + 1
@@ -85,7 +86,7 @@ function predict.sample(epoch_now)
 	local nr_samples = #queries
 	for i = 1, nr_samples do
 		local entry = queries[i]
-		local key = string.char(entry.type)..entry.name
+		local key = string.format('%s %s', entry.type, entry.name)
 		current[key] = 1
 	end
 	predict.log[epoch_now] = current