Resolving compilation failures after cherry-picking of require commits

from the main branch.

hash_query.c

@@ -135,13 +135,13 @@ hash_entry_alloc(pgssSharedState *pgss, pgssHashKey *key, int encoding)
 
 	if (hash_get_num_entries(pgss_hash) >= MAX_BUCKET_ENTRIES)
 	{
-		elog(DEBUG1, "%s", "pg_stat_monitor: out of memory");
+		elog(DEBUG1, "pg_stat_monitor: out of memory");
 		return NULL;
 	}
 	/* Find or create an entry with desired hash code */
 	entry = (pgssEntry *) hash_search(pgss_hash, key, HASH_ENTER_NULL, &found);
 	if (entry == NULL)
-		pgsm_log_error("hash_entry_alloc: OUT OF MEMORY");
+		elog(DEBUG1, "hash_entry_alloc: OUT OF MEMORY");
 	else if (!found)
 	{
 		pgss->bucket_entry[pg_atomic_read_u64(&pgss->current_wbucket)]++;
@@ -216,7 +216,7 @@ hash_entry_dealloc(int new_bucket_id, int old_bucket_id, unsigned char *query_bu
 				pgssEntry *bkp_entry = malloc(sizeof(pgssEntry));
 				if (!bkp_entry)
 				{
-					pgsm_log_error("hash_entry_dealloc: out of memory");
+					elog(DEBUG1, "hash_entry_dealloc: out of memory");
 					/*
 					 * No memory, If the entry has calls > 1 then we change the state to finished,
 					 * as the pending query will likely finish execution during the new bucket

pg_stat_monitor--1.0.13.sql.in

@@ -119,13 +119,12 @@ LANGUAGE SQL PARALLEL SAFE;
 
 CREATE FUNCTION pg_stat_monitor_settings(
     OUT name  text,
-    OUT value text,
+    OUT value INTEGER,
-    OUT default_value text,
+    OUT default_value INTEGER,
     OUT description  text,
     OUT minimum INTEGER,
     OUT maximum INTEGER,
-    OUT options text,
+    OUT restart INTEGER
-    OUT restart text
 )
 RETURNS SETOF record
 AS 'MODULE_PATHNAME', 'pg_stat_monitor_settings'
@@ -138,7 +137,6 @@ CREATE VIEW pg_stat_monitor_settings AS SELECT
     description,
     minimum,
     maximum,
-    options,
     restart
 FROM pg_stat_monitor_settings();
 
@@ -259,40 +257,8 @@ $$ language plpgsql;
 --    ROUND(CAST(total_time / greatest(sum(total_time) OVER(), 0.00000001) * 100 as numeric), 2)::text || '%' as load_comparison
 -- FROM pg_stat_monitor_hook_stats();
 
-CREATE FUNCTION pg_stat_monitor_errors(
-    OUT severity   int,
-    OUT message    text,
-    OUT msgtime    text,
-    OUT calls      int8
-)
-RETURNS SETOF record
-AS 'MODULE_PATHNAME', 'pg_stat_monitor_errors'
-LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
-
-CREATE OR REPLACE FUNCTION pgsm_log_severity_as_text(severity int) RETURNS TEXT AS
-$$
-SELECT
-	CASE
-		WHEN severity = 0 THEN 'INFO'
-		WHEN severity = 1 THEN 'WARNING'
-		WHEN severity = 2 THEN 'ERROR'
-	END
-$$
-LANGUAGE SQL PARALLEL SAFE;
-
-CREATE VIEW pg_stat_monitor_errors AS SELECT
-    pgsm_log_severity_as_text(severity) as severity, message, msgtime, calls
-FROM pg_stat_monitor_errors();
-
-CREATE FUNCTION pg_stat_monitor_reset_errors()
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C PARALLEL SAFE;
-
 GRANT SELECT ON pg_stat_monitor TO PUBLIC;
 GRANT SELECT ON pg_stat_monitor_settings TO PUBLIC;
 
-GRANT SELECT ON pg_stat_monitor_errors TO PUBLIC;
 -- Don't want this to be available to non-superusers.
 REVOKE ALL ON FUNCTION pg_stat_monitor_reset() FROM PUBLIC;
-REVOKE ALL ON FUNCTION pg_stat_monitor_reset_errors() FROM PUBLIC;

pg_stat_monitor--1.0.14.sql.in

@@ -119,13 +119,12 @@ LANGUAGE SQL PARALLEL SAFE;
 
 CREATE FUNCTION pg_stat_monitor_settings(
     OUT name  text,
-    OUT value text,
+    OUT value INTEGER,
-    OUT default_value text,
+    OUT default_value INTEGER,
     OUT description  text,
     OUT minimum INTEGER,
     OUT maximum INTEGER,
-    OUT options text,
+    OUT restart INTEGER
-    OUT restart text
 )
 RETURNS SETOF record
 AS 'MODULE_PATHNAME', 'pg_stat_monitor_settings'
@@ -138,7 +137,6 @@ CREATE VIEW pg_stat_monitor_settings AS SELECT
     description,
     minimum,
     maximum,
-    options,
     restart
 FROM pg_stat_monitor_settings();
 
@@ -260,40 +258,8 @@ $$ language plpgsql;
 --    ROUND(CAST(total_time / greatest(sum(total_time) OVER(), 0.00000001) * 100 as numeric), 2)::text || '%' as load_comparison
 -- FROM pg_stat_monitor_hook_stats();
 
-CREATE FUNCTION pg_stat_monitor_errors(
-    OUT severity   int,
-    OUT message    text,
-    OUT msgtime    text,
-    OUT calls      int8
-)
-RETURNS SETOF record
-AS 'MODULE_PATHNAME', 'pg_stat_monitor_errors'
-LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
-
-CREATE OR REPLACE FUNCTION pgsm_log_severity_as_text(severity int) RETURNS TEXT AS
-$$
-SELECT
-	CASE
-		WHEN severity = 0 THEN 'INFO'
-		WHEN severity = 1 THEN 'WARNING'
-		WHEN severity = 2 THEN 'ERROR'
-	END
-$$
-LANGUAGE SQL PARALLEL SAFE;
-
-CREATE VIEW pg_stat_monitor_errors AS SELECT
-    pgsm_log_severity_as_text(severity) as severity, message, msgtime, calls
-FROM pg_stat_monitor_errors();
-
-CREATE FUNCTION pg_stat_monitor_reset_errors()
-RETURNS void
-AS 'MODULE_PATHNAME'
-LANGUAGE C PARALLEL SAFE;
-
 GRANT SELECT ON pg_stat_monitor TO PUBLIC;
 GRANT SELECT ON pg_stat_monitor_settings TO PUBLIC;
 
-GRANT SELECT ON pg_stat_monitor_errors TO PUBLIC;
 -- Don't want this to be available to non-superusers.
 REVOKE ALL ON FUNCTION pg_stat_monitor_reset() FROM PUBLIC;
-REVOKE ALL ON FUNCTION pg_stat_monitor_reset_errors() FROM PUBLIC;

pg_stat_monitor.c

@@ -485,7 +485,7 @@ static void
 pgss_ExecutorStart(QueryDesc *queryDesc, int eflags)
 {
 	if (getrusage(RUSAGE_SELF, &rusage_start) != 0)
-		pgsm_log_error("pgss_ExecutorStart: failed to execute getrusage");
+		elog(DEBUG1, "pgss_ExecutorStart: failed to execute getrusage");
 
 	if (prev_ExecutorStart)
 		prev_ExecutorStart(queryDesc, eflags);
@@ -980,7 +980,7 @@ static void pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
 		WalUsage    walusage_start = pgWalUsage;
 #endif
 		INSTR_TIME_SET_CURRENT(start);
-		exec_nested_level++;
+		nested_level++;
 		PG_TRY();
 		{
 #if PG_VERSION_NUM >= 140000
@@ -1019,7 +1019,7 @@ static void pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
 										dest,
 									    completionTag);
 #endif
-			exec_nested_level--;
+			nested_level--;
 		}
 		PG_CATCH();
         {
@@ -1514,7 +1514,7 @@ pgss_store(uint64 queryid,
 #if PG_VERSION_NUM < 140000
     key.toplevel = 1;
 #else
-    key.toplevel = ((exec_nested_level + plan_nested_level) == 0);
+    key.toplevel = ((nested_level + plan_nested_level) == 0);
 #endif
 	pgss_hash = pgsm_get_hash();
 
@@ -1553,7 +1553,7 @@ pgss_store(uint64 queryid,
 			LWLockRelease(pgss->lock);
 			if (norm_query)
 				pfree(norm_query);
-			pgsm_log_error("pgss_store: out of memory (pgss_query_hash).");
+			elog(DEBUG1, "pgss_store: out of memory (pgss_query_hash).");
 			return;
 		}
 		else if (!query_found)
@@ -1579,7 +1579,7 @@ pgss_store(uint64 queryid,
 				LWLockRelease(pgss->lock);
 				if (norm_query)
 					pfree(norm_query);
-				pgsm_log_error("pgss_store: insufficient shared space for query.");
+				elog(DEBUG1, "pgss_store: insufficient shared space for query.");
 				return;
 			}
 			/*
@@ -1625,7 +1625,6 @@ pgss_store(uint64 queryid,
 					kind,				/* kind */
 					app_name_ptr,
 					app_name_len);
-	}
 
 	LWLockRelease(pgss->lock);
 	if (norm_query)
@@ -1795,7 +1794,7 @@ pg_stat_monitor_internal(FunctionCallInfo fcinfo,
 		{
 			if (read_query(pgss_qbuf, tmp.info.parentid, parent_query_txt, 0) == 0)
 			{
-				rc = read_query_buffer(bucketid, tmp.info.parentid, parent_query_txt, 0);
+				int rc = read_query_buffer(bucketid, tmp.info.parentid, parent_query_txt, 0);
 				if (rc != 1)
 					snprintf(parent_query_txt, 32, "%s", "<insufficient disk/shared space>");
 			}
@@ -3216,7 +3215,7 @@ SaveQueryText(uint64 bucketid,
 
 				if (pgss->overflow)
 				{
-					pgsm_log_error("query buffer overflowed twice");
+					elog(DEBUG1, "query buffer overflowed twice");
 					return false;
 				}
 

regression/expected/application_name_unique.out

@@ -21,13 +21,14 @@ SELECT 1 AS num;
 
 SELECT query,application_name FROM pg_stat_monitor ORDER BY query, application_name COLLATE "C";
                                               query                                              |          application_name          
---------------------------------+------------------------------------
+-------------------------------------------------------------------------------------------------+------------------------------------
  SELECT $1 AS num                                                                                | naeem
  SELECT $1 AS num                                                                                | psql
  SELECT pg_stat_monitor_reset()                                                                  | pg_regress/application_name_unique
+ SELECT query,application_name FROM pg_stat_monitor ORDER BY query, application_name COLLATE "C" | psql
  Set application_name = 'naeem'                                                                  | naeem
  Set application_name = 'psql'                                                                   | psql
-(5 rows)
+(6 rows)
 
 SELECT pg_stat_monitor_reset();
  pg_stat_monitor_reset 

regression/expected/error_insert.out

@@ -18,12 +18,13 @@ DETAIL:  Key (id)=(1) already exists.
 Drop Table if exists Company;
 SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel;
                                              query                                             | elevel | sqlcode |                            message                            
--------------------------------------------------------+--------+---------+---------------------------------------------------------------
+-----------------------------------------------------------------------------------------------+--------+---------+---------------------------------------------------------------
  Drop Table if exists Company                                                                  |      0 |         | 
  INSERT  INTO Company(ID, Name) VALUES ($1, $2)                                                |      0 |         | 
  INSERT  INTO Company(ID, Name) VALUES (1, 'Percona');                                         |     21 | 23505   | duplicate key value violates unique constraint "company_pkey"
  SELECT pg_stat_monitor_reset()                                                                |      0 |         | 
-(4 rows)
+ SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel |      0 |         | 
+(5 rows)
 
 SELECT pg_stat_monitor_reset();
  pg_stat_monitor_reset 

regression/expected/error_insert_1.out

@@ -18,12 +18,13 @@ DETAIL:  Key (id)=(1) already exists.
 Drop Table if exists Company;
 SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel;
                                              query                                             | elevel | sqlcode |                            message                            
--------------------------------------------------------+--------+---------+---------------------------------------------------------------
+-----------------------------------------------------------------------------------------------+--------+---------+---------------------------------------------------------------
  Drop Table if exists Company                                                                  |      0 |         | 
  INSERT  INTO Company(ID, Name) VALUES ($1, $2)                                                |      0 |         | 
  INSERT  INTO Company(ID, Name) VALUES (1, 'Percona');                                         |     20 | 23505   | duplicate key value violates unique constraint "company_pkey"
  SELECT pg_stat_monitor_reset()                                                                |      0 |         | 
-(4 rows)
+ SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel |      0 |         | 
+(5 rows)
 
 SELECT pg_stat_monitor_reset();
  pg_stat_monitor_reset 

regression/expected/histogram.out

@@ -46,16 +46,17 @@ INFO:  Sleep 5 seconds
 
 SELECT substr(query, 0,50) as query, calls, resp_calls FROM pg_stat_monitor ORDER BY query COLLATE "C";
                        query                       | calls |      resp_calls       
----------------------------------+-------+-----------------------
+---------------------------------------------------+-------+-----------------------
  SELECT pg_sleep(i)                                |     5 | {0,0,0,0,0,0,3,2,0,0}
  SELECT pg_stat_monitor_reset()                    |     1 | {1,0,0,0,0,0,0,0,0,0}
+ SELECT substr(query, $1,$2) as query, calls, resp |     1 | {1,0,0,0,0,0,0,0,0,0}
  Set pg_stat_monitor.track='all'                   |     1 | {1,0,0,0,0,0,0,0,0,0}
  select run_pg_sleep($1)                           |     1 | {0,0,0,0,0,0,0,0,1,0}
-(4 rows)
+(5 rows)
 
 select * from generate_histogram();
        range        | freq |              bar               
---------------------+------+--------------------------------------------------------------------------------------------
+--------------------+------+--------------------------------
  (0 - 3)}           |    0 | 
   (3 - 10)}         |    0 | 
   (10 - 31)}        |    0 |