Merge branch 'dev'

Author: cuprumtan

mamonsu/plugins/pgsql/archive_command.py

@@ -13,7 +13,7 @@ class ArchiveCommand(Plugin):
     query_agent_count_files = """
     WITH values AS (
     SELECT
-    4096/(coalesce(pg_settings.setting::bigint/1024/1024, 1)) AS segment_parts_count,
+    4096/(ceil(pg_settings.setting::numeric/1024/1024)) AS segment_parts_count,
     setting::bigint AS segment_size,
     ('x' || substring(pg_stat_archiver.last_archived_wal from 9 for 8))::bit(32)::int AS last_wal_div,
     ('x' || substring(pg_stat_archiver.last_archived_wal from 17 for 8))::bit(32)::int AS last_wal_mod,
@@ -23,13 +23,13 @@ class ArchiveCommand(Plugin):
     ('x' || substring(pg_{1}_name(pg_current_{0}()) from 17 for 8))::bit(32)::int END AS current_wal_mod
     FROM pg_settings, pg_stat_archiver
     WHERE pg_settings.name = 'wal_segment_size')
-    SELECT greatest(coalesce((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1, 0), 0) AS count_files
+    SELECT greatest(coalesce((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1, 0), 0)::bigint AS count_files
     FROM values;
     """
     query_agent_size_files = """
     WITH values AS (
     SELECT
-    4096/(coalesce(pg_settings.setting::bigint/1024/1024, 1)) AS segment_parts_count,
+    4096/(ceil(pg_settings.setting::numeric/1024/1024)) AS segment_parts_count,
     setting::bigint AS segment_size,
     ('x' || substring(pg_stat_archiver.last_archived_wal from 9 for 8))::bit(32)::int AS last_wal_div,
     ('x' || substring(pg_stat_archiver.last_archived_wal from 17 for 8))::bit(32)::int AS last_wal_mod,
@@ -39,7 +39,7 @@ class ArchiveCommand(Plugin):
     ('x' || substring(pg_{1}_name(pg_current_{0}()) from 17 for 8))::bit(32)::int END AS current_wal_mod
     FROM pg_settings, pg_stat_archiver
     WHERE pg_settings.name = 'wal_segment_size')
-    greatest(coalesce(((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1) * segment_size, 0), 0) AS size_files
+    greatest(coalesce(((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1) * segment_size, 0), 0)::bigint AS size_files
     FROM values;
     """
 
@@ -61,7 +61,7 @@ def run(self, zbx):
         query_queue = """
             WITH values AS (
             SELECT
-            4096/(coalesce(pg_settings.setting::bigint/1024/1024, 1)) AS segment_parts_count,
+            4096/(ceil(pg_settings.setting::numeric/1024/1024)) AS segment_parts_count,
             setting::bigint AS segment_size,
             ('x' || substring(pg_stat_archiver.last_archived_wal from 9 for 8))::bit(32)::int AS last_wal_div,
             ('x' || substring(pg_stat_archiver.last_archived_wal from 17 for 8))::bit(32)::int AS last_wal_mod,
@@ -71,8 +71,8 @@ def run(self, zbx):
             ('x' || substring(pg_{1}_name(pg_current_{0}()) from 17 for 8))::bit(32)::int END AS current_wal_mod
             FROM pg_settings, pg_stat_archiver
             WHERE pg_settings.name = 'wal_segment_size')
-            SELECT greatest(coalesce((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1, 0), 0) AS count_files,
-            greatest(coalesce(((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1) * segment_size, 0), 0) AS size_files
+            SELECT greatest(coalesce((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1, 0), 0)::bigint AS count_files,
+            greatest(coalesce(((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1) * segment_size, 0), 0)::bigint AS size_files
             FROM values;
             """
 

mamonsu/tools/bootstrap/sql.py

@@ -113,7 +113,7 @@
 RETURNS TABLE(COUNT_FILES BIGINT, SIZE_FILES BIGINT) AS $$
 WITH values AS (
 SELECT
-4096/(coalesce(pg_settings.setting::bigint/1024/1024, 1)) AS segment_parts_count,
+4096/(ceil(pg_settings.setting::numeric/1024/1024)) AS segment_parts_count,
 setting::bigint AS segment_size,
 ('x' || substring(pg_stat_archiver.last_archived_wal from 9 for 8))::bit(32)::int AS last_wal_div,
 ('x' || substring(pg_stat_archiver.last_archived_wal from 17 for 8))::bit(32)::int AS last_wal_mod,
@@ -123,8 +123,8 @@
 ('x' || substring(pg_{10}_name(pg_current_{4}()) from 17 for 8))::bit(32)::int END AS current_wal_mod
 FROM pg_settings, pg_stat_archiver
 WHERE pg_settings.name = 'wal_segment_size')
-SELECT greatest(coalesce((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1, 0), 0) AS count_files,
-greatest(coalesce(((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1) * segment_size, 0), 0) AS size_files
+SELECT greatest(coalesce((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1, 0), 0)::bigint AS count_files,
+greatest(coalesce(((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1) * segment_size, 0), 0)::bigint AS size_files
 FROM values
 $$ LANGUAGE SQL SECURITY DEFINER;