[Feature] Clickhouse: Add extra columns support

diff --git a/src/plugins/lua/clickhouse.lua b/src/plugins/lua/clickhouse.lua
index ab1693b48886ff5327a3f3dce5f14f8f655483c6..a5067d014f4fad0038369cd710a0812bdc6f48c5 100644 (file)
--- a/src/plugins/lua/clickhouse.lua
+++ b/src/plugins/lua/clickhouse.lua
@@ -843,7 +843,7 @@ local function clickhouse_collect(task)
   -- Extra columns
   if #settings.extra_columns > 0 then
     for _,col in ipairs(settings.extra_columns) do
-      local elts = col.selector(task)
+      local elts = col.real_selector(task)
 
       if elts then
         table.insert(row, elts)
@@ -1337,12 +1337,13 @@ if opts then
             settings.extra_columns[col_name] = nil
           else
             if not col_data.default_value then
-              if col_data.type:lower():match('Array') then
+              if col_data.type:lower():match('^array') then
                 col_data.default_value = {}
               else
                 col_data.default_value = ''
               end
             end
+            col_data.real_selector = selector
           end
         end
       end