From: Josef 'Jeff' Sipek <jeff.sipek@open-xchange.com>
Date: Thu, 5 Mar 2020 13:22:53 +0000 (+0200)
Subject: stats: Move group-by value and label getting code into helper functions
X-Git-Tag: 2.3.11.2~535
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f16740d01f1d4f34819ad65e33c5d28957ea581f;p=thirdparty%2Fdovecot%2Fcore.git

stats: Move group-by value and label getting code into helper functions

This avoids some excessive indentation.
---

diff --git a/src/stats/stats-metrics.c b/src/stats/stats-metrics.c
index dcdcb0fd59..09abc91470 100644
--- a/src/stats/stats-metrics.c
+++ b/src/stats/stats-metrics.c
@@ -435,6 +435,41 @@ stats_metric_group_by_quantized_label(const struct event_field *field,
 	return label;
 }
 
+static bool
+stats_metric_group_by_get_value(const struct event_field *field,
+				const struct stats_metric_settings_group_by *group_by,
+				struct metric_value *value)
+{
+	switch (group_by->func) {
+	case STATS_METRIC_GROUPBY_DISCRETE:
+		if (!stats_metric_group_by_discrete(field, value))
+			return FALSE;
+		return TRUE;
+	case STATS_METRIC_GROUPBY_QUANTIZED:
+		if (!stats_metric_group_by_quantized(field, value, group_by))
+			return FALSE;
+		return TRUE;
+	}
+
+	i_panic("unknown group-by function %d", group_by->func);
+}
+
+static const char *
+stats_metric_group_by_get_label(const struct event_field *field,
+				const struct stats_metric_settings_group_by *group_by,
+				const struct metric_value *value)
+{
+	switch (group_by->func) {
+	case STATS_METRIC_GROUPBY_DISCRETE:
+		i_unreached();
+	case STATS_METRIC_GROUPBY_QUANTIZED:
+		return stats_metric_group_by_quantized_label(field, group_by,
+							     value->intmax);
+	}
+
+	i_panic("unknown group-by function %d", group_by->func);
+}
+
 static void
 stats_metric_group_by(struct metric *metric, struct event *event, pool_t pool)
 {
@@ -447,16 +482,8 @@ stats_metric_group_by(struct metric *metric, struct event *event, pool_t pool)
 	if (field == NULL)
 		return;
 
-	switch (group_by->func) {
-	case STATS_METRIC_GROUPBY_DISCRETE:
-		if (!stats_metric_group_by_discrete(field, &value))
-			return;
-		break;
-	case STATS_METRIC_GROUPBY_QUANTIZED:
-		if (!stats_metric_group_by_quantized(field, &value, group_by))
-			return;
-		break;
-	}
+	if (!stats_metric_group_by_get_value(field, group_by, &value))
+		return;
 
 	if (!array_is_created(&metric->sub_metrics))
 		p_array_init(&metric->sub_metrics, pool, 8);
@@ -474,15 +501,9 @@ stats_metric_group_by(struct metric *metric, struct event *event, pool_t pool)
 			value_label = dec2str(field->value.intmax);
 			break;
 		case METRIC_VALUE_TYPE_BUCKET_INDEX:
-			switch (group_by->func) {
-			case STATS_METRIC_GROUPBY_DISCRETE:
-				i_unreached();
-			case STATS_METRIC_GROUPBY_QUANTIZED:
-				value_label = stats_metric_group_by_quantized_label(field,
-										    group_by,
-										    value.intmax);
-				break;
-			}
+			value_label = stats_metric_group_by_get_label(field,
+								      group_by,
+								      &value);
 			break;
 		}