diff options
author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2023-12-30 21:06:46 +0000 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@rspamd.com> | 2023-12-31 07:08:18 +0000 |
commit | 38244b721b4ee82431c95cad69bac97dd54d44cc (patch) | |
tree | 7f61e058fc2f58ccfe6fd6f5aff1b33b05246236 /lualib/redis_scripts | |
parent | 33d3295d80519c38aa70c34a78465925f4c8b7ff (diff) | |
download | rspamd-38244b721b4ee82431c95cad69bac97dd54d44cc.tar.gz rspamd-38244b721b4ee82431c95cad69bac97dd54d44cc.zip |
[Project] Add store tokens support in new bayes learn
Diffstat (limited to 'lualib/redis_scripts')
-rw-r--r-- | lualib/redis_scripts/bayes_learn.lua | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/lualib/redis_scripts/bayes_learn.lua b/lualib/redis_scripts/bayes_learn.lua index 244be43f6..b0ed1dd4b 100644 --- a/lualib/redis_scripts/bayes_learn.lua +++ b/lualib/redis_scripts/bayes_learn.lua @@ -5,12 +5,18 @@ -- key3 - string symbol -- key4 - boolean is_unlearn -- key5 - set of tokens encoded in messagepack array of strings +-- key6 - set of text tokens (if any) encoded in messagepack array of strings (size must be twice of `KEYS[5]`) local prefix = KEYS[1] local is_spam = KEYS[2] == 'true' and true or false local symbol = KEYS[3] local is_unlearn = KEYS[4] == 'true' and true or false local input_tokens = cmsgpack.unpack(KEYS[5]) +local text_tokens + +if KEYS[6] then + text_tokens = cmsgpack.unpack(KEYS[6]) +end local hash_key = is_spam and 'S' or 'H' local learned_key = is_spam and 'learns_spam' or 'learns_ham' @@ -19,6 +25,18 @@ redis.call('SADD', symbol .. '_keys', prefix) redis.call('HSET', prefix, 'version', '2') -- new schema redis.call('HINCRBY', prefix, learned_key, is_unlearn and -1 or 1) -- increase or decrease learned count -for _, token in ipairs(input_tokens) do +for i, token in ipairs(input_tokens) do redis.call('HINCRBY', token, hash_key, 1) + if text_tokens then + local tok1 = text_tokens[i * 2 - 1] + local tok2 = text_tokens[i * 2] + + if tok2 then + redis.call('HSET', token, 'tokens', string.format('%s:%s', tok1, tok2)) + else + redis.call('HSET', token, 'tokens', tok1) + end + + redis.call('ZINCRBY', prefix .. '_z', token, is_unlearn and -1 or 1) + end end
\ No newline at end of file |