Change query formatting

timescale · Oct 18, 2022 · 49003cd · 49003cd
1 parent 98418d5
commit 49003cd
Showing 1 changed file with 30 additions and 30 deletions.
diff --git a/src/telemetry/telemetry.c b/src/telemetry/telemetry.c
@@ -393,25 +393,26 @@ add_job_stats_by_job_type(JsonbParseState *parse_state)
 
 	const char *command_string =
 		"SELECT ("
-		"	case WHEN q.proc_schema = \'_timescaledb_internal\' AND q.proc_name = \'policy_retention\' then q.proc_name::text "
-		"	WHEN q.proc_schema = \'_timescaledb_internal\' AND q.proc_name = \'policy_compression\' then q.proc_name::text "
-		"	WHEN q.proc_schema = \'_timescaledb_internal\' AND q.proc_name = \'policy_reorder\' then q.proc_name::text "
-		"	WHEN q.proc_schema = \'_timescaledb_internal\' AND q.proc_name = \'policy_refresh_continuous_aggregate\' then q.proc_name::text "
-		"	ELSE \'user_defined_action\'::text "
+		"	CASE "
+		"		WHEN j.proc_schema = \'_timescaledb_internal\' AND j.proc_name ~ "
+		"\'^policy_(retention|compression|reorder|refresh_continuous_aggregate)$\' "
+		"		THEN j.proc_name::text "
+		"		ELSE \'user_defined_action\'::text "
 		"	end"
-		") as job_type, sum(total_runs)::bigint as total_runs, sum(total_successes)::bigint as "
-		"total_successes,"
-		"sum(total_failures)::bigint as total_failures, sum(total_crashes)::bigint as "
-		"total_crashes,"
-		"sum(total_duration) as total_duration, sum(total_duration_failures) as total_duration_failures, max(consecutive_failures)::int as "
-		"max_consecutive_failures, max(consecutive_crashes)::int as max_consecutive_crashes "
+		") as job_type, "
+		"	sum(total_runs)::bigint as total_runs, "
+		"	sum(total_successes)::bigint as total_successes, "
+		"	sum(total_failures)::bigint as total_failures, "
+		"	sum(total_crashes)::bigint as total_crashes, "
+		"	sum(total_duration) as total_duration, "
+		"	sum(total_duration_failures) as total_duration_failures, "
+		"	max(consecutive_failures)::int as max_consecutive_failures, "
+		"	max(consecutive_crashes)::int as max_consecutive_crashes "
 		"FROM "
-		"(select j.proc_schema, j.proc_name, s.total_runs, s.total_successes, s.total_failures,"
-		"s.total_crashes, s.total_duration, s.total_duration_failures, s.consecutive_crashes, s.consecutive_failures "
-		"FROM "
-		"_timescaledb_internal.bgw_job_stat s join _timescaledb_config.bgw_job j on j.id = "
-		"s.job_id) q "
-		"GROUP BY job_type";
+		"	_timescaledb_internal.bgw_job_stat s "
+		"	JOIN _timescaledb_config.bgw_job j on j.id = s.job_id "
+		"GROUP BY "
+		"job_type";
 
 	if (SPI_connect() != SPI_OK_CONNECT)
 		elog(ERROR, "could not connect to SPI");
@@ -447,28 +448,27 @@ add_job_stats_by_job_type(JsonbParseState *parse_state)
 		total_failures = SPI_getbinval(tuptable->vals[i], tupdesc, 4, &isnull_failures);
 		total_crashes = SPI_getbinval(tuptable->vals[i], tupdesc, 5, &isnull_crashes);
 		total_duration = SPI_getbinval(tuptable->vals[i], tupdesc, 6, &isnull_duration);
-		total_duration_failures = SPI_getbinval(tuptable->vals[i], tupdesc, 6, &isnull_duration_failures);
+		total_duration_failures =
+			SPI_getbinval(tuptable->vals[i], tupdesc, 6, &isnull_duration_failures);
 		max_consec_fails = SPI_getbinval(tuptable->vals[i], tupdesc, 7, &isnull_consec_fails);
-		max_consec_crashes =
-			SPI_getbinval(tuptable->vals[i], tupdesc, 8, &isnull_consec_crashes);
+		max_consec_crashes = SPI_getbinval(tuptable->vals[i], tupdesc, 8, &isnull_consec_crashes);
 
 		if (isnull_jobtype || isnull_runs || isnull_successes || isnull_failures ||
 			isnull_crashes || isnull_duration || isnull_consec_crashes || isnull_consec_fails)
 		{
 			elog(ERROR, "null record field returned");
 		}
 
-		TelemetryJobStats stats = {
-			.total_runs = DatumGetInt64(total_runs),
-			.total_successes = DatumGetInt64(total_successes),
-			.total_failures = DatumGetInt64(total_failures),
-			.total_crashes = DatumGetInt64(total_crashes),
-			.total_duration = DatumGetIntervalP(total_duration),
-			.total_duration_failures = DatumGetIntervalP(total_duration_failures),
-			.max_consecutive_failures = DatumGetInt32(max_consec_fails),
-			.max_consecutive_crashes = DatumGetInt32(max_consec_crashes)
-		};
 		spi_context = MemoryContextSwitchTo(old_context);
+		TelemetryJobStats stats = { .total_runs = DatumGetInt64(total_runs),
+									.total_successes = DatumGetInt64(total_successes),
+									.total_failures = DatumGetInt64(total_failures),
+									.total_crashes = DatumGetInt64(total_crashes),
+									.max_consecutive_failures = DatumGetInt32(max_consec_fails),
+									.max_consecutive_crashes = DatumGetInt32(max_consec_crashes),
+									.total_duration = DatumGetIntervalP(total_duration),
+									.total_duration_failures =
+										DatumGetIntervalP(total_duration_failures) };
 		add_job_stats_internal(parse_state, TextDatumGetCString(jobtype_datum), &stats);
 		old_context = MemoryContextSwitchTo(spi_context);
 	}