fix: bootrap query for count wal files and return vacuum for count of longest running queary in transaction

Author: casperr0

mamonsu/plugins/pgsql/driver/pool.py

@@ -18,11 +18,11 @@ class Pool(object):
             'select public.mamonsu_timestamp_get()'
         ),
         'count_xlog_files': (
-            "select count(*) from pg_catalog.pg_ls_dir('pg_xlog')",
+            "WITH list(filename) as (SELECT * FROM pg_catalog.pg_ls_dir('pg_xlog')) SELECT COUNT(*)::BIGINT FROM list WHERE filename similar to [0-9A-F]{24}",
             'select public.mamonsu_count_xlog_files()'
         ),
         'count_wal_files': (
-            "select count(*) from pg_catalog.pg_ls_dir('pg_wal')",
+            "WITH list(filename) as (SELECT * FROM pg_catalog.pg_ls_dir('pg_wal')) SELECT COUNT(*)::BIGINT FROM list WHERE filename similar to [0-9A-F]{24}",
             'select public.mamonsu_count_wal_files()'
         ),
         'count_autovacuum': (

mamonsu/tools/bootstrap/sql.py

@@ -77,8 +77,7 @@
     FROM pg_catalog.pg_stat_activity 
     WHERE 
         pid NOT IN(select pid from pg_stat_replication) AND 
-        pid <> pg_backend_pid() AND 
-        query NOT ilike '%%VACUUM%%'
+        pid <> pg_backend_pid()
 $$ LANGUAGE SQL SECURITY DEFINER;
 
 CREATE OR REPLACE FUNCTION public.mamonsu_count_{3}_files()