[Minor] Clickhouse: Fix text returns

diff --git a/lualib/lua_clickhouse.lua b/lualib/lua_clickhouse.lua
index e532cd643c4e53d5df32cf8449d16b83b90c2f37..4e20229b0bcdcdb75d3a8238c343de593e4ba96b 100644 (file)
--- a/lualib/lua_clickhouse.lua
+++ b/lualib/lua_clickhouse.lua
@@ -74,10 +74,13 @@ end
 local function row_to_tsv(row)
 
   for i,elt in ipairs(row) do
-    if type(elt) == 'table' then
+    local t = type(elt)
+    if t == 'table' then
       row[i] = '[' .. array_to_string(elt) .. ']'
-    elseif type(elt) == 'number' then
+    elseif t == 'number' then
       row[i] = ch_number(elt)
+    elseif t == 'userdata' then
+      row[i] = clickhouse_quote(tostring(elt))
     else
       row[i] = clickhouse_quote(elt)
     end

diff --git a/src/plugins/lua/clickhouse.lua b/src/plugins/lua/clickhouse.lua
index c9d0c71cced3b257ac1d9c27897dc69dc5065dc0..3ee4eeb736dd134d6ac5545c6eb4d773ca3038d2 100644 (file)
--- a/src/plugins/lua/clickhouse.lua
+++ b/src/plugins/lua/clickhouse.lua
@@ -851,10 +851,10 @@ local function clickhouse_collect(task)
     table.insert(custom_rows[k], lua_clickhouse.row_to_tsv(rule.get_row(task)))
   end
 
-  nrows = nrows + 1
   local tsv_row = lua_clickhouse.row_to_tsv(row)
   used_memory = used_memory + #tsv_row
   data_rows[#data_rows + 1] = tsv_row
+  nrows = nrows + 1
   lua_util.debugm(N, task,
       "add clickhouse row %s / %s; used memory: %s / %s",
       nrows, settings.limits.max_rows,