remove dead_node_mask from mtm_get_cluster_state

kelvich · kelvich · commit 910efc6fa74e · 2018-09-21T15:18:24.000+03:00
diff --git a/multimaster--1.0.sql b/multimaster--1.0.sql
@@ -97,7 +97,6 @@ CREATE TYPE mtm.cluster_state AS (
     "config_changes" integer,
     "stalled_node_mask" bigint,
     "stopped_node_mask" bigint,
-    "dead_node_mask" bigint,
     "last_status_change" timestamp
 );
 
diff --git a/multimaster.c b/multimaster.c
@@ -4222,8 +4222,7 @@ mtm_get_cluster_state(PG_FUNCTION_ARGS)
 	values[16] = Int32GetDatum(Mtm->nConfigChanges);
 	values[17] = Int64GetDatum(Mtm->stalledNodeMask);
 	values[18] = Int64GetDatum(Mtm->stoppedNodeMask);
-	values[19] = Int64GetDatum(Mtm->deadNodeMask);
-	values[20] = TimestampTzGetDatum(time_t_to_timestamptz(Mtm->nodes[MtmNodeId-1].lastStatusChangeTime/USECS_PER_SEC));
+	values[19] = TimestampTzGetDatum(time_t_to_timestamptz(Mtm->nodes[MtmNodeId-1].lastStatusChangeTime/USECS_PER_SEC));
 
 	PG_RETURN_DATUM(HeapTupleGetDatum(heap_form_tuple(desc, values, nulls)));
 }
diff --git a/multimaster.h b/multimaster.h
@@ -92,7 +92,7 @@
 
 #define Natts_mtm_trans_state   15
 #define Natts_mtm_nodes_state   17
-#define Natts_mtm_cluster_state 21
+#define Natts_mtm_cluster_state 20
 
 typedef ulong64 csn_t; /* commit serial number */
 #define INVALID_CSN  ((csn_t)-1)

Original file line number	Diff line number	Diff line change
`@@ -4222,8 +4222,7 @@ mtm_get_cluster_state(PG_FUNCTION_ARGS)`
`4222`	`4222`	`values[16] = Int32GetDatum(Mtm->nConfigChanges);`
`4223`	`4223`	`values[17] = Int64GetDatum(Mtm->stalledNodeMask);`
`4224`	`4224`	`values[18] = Int64GetDatum(Mtm->stoppedNodeMask);`
`4225`		`- values[19] = Int64GetDatum(Mtm->deadNodeMask);`
`4226`		`- values[20] = TimestampTzGetDatum(time_t_to_timestamptz(Mtm->nodes[MtmNodeId-1].lastStatusChangeTime/USECS_PER_SEC));`
	`4225`	`+ values[19] = TimestampTzGetDatum(time_t_to_timestamptz(Mtm->nodes[MtmNodeId-1].lastStatusChangeTime/USECS_PER_SEC));`
`4227`	`4226`
`4228`	`4227`	`PG_RETURN_DATUM(HeapTupleGetDatum(heap_form_tuple(desc, values, nulls)));`
`4229`	`4228`	`}`