![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 99b55f4)
raw | patch | inline | side by side (parent: 99b55f4)
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 14 Feb 2009 16:26:37 +0000 (17:26 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 14 Feb 2009 16:38:13 +0000 (17:38 +0100) |
The old (legacy) features should still be supported.
| src/postgresql.c | patch | blob | history |
diff --git a/src/postgresql.c b/src/postgresql.c
index fce358894cc6dcea5f4d7a384fa2c7e73dd35b21..4e1c1e0c8127bebb693d71fc0b60116a84f1ad35 100644 (file)
--- a/src/postgresql.c
+++ b/src/postgresql.c
/**
* collectd - src/postgresql.c
* Copyright (C) 2008, 2009 Sebastian Harl
+ * Copyright (C) 2009 Florian Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
- * Author:
+ * Authors:
* Sebastian Harl <sh at tokkee.org>
+ * Florian Forster <octo at verplant.org>
**/
/*
#include "configfile.h"
#include "plugin.h"
+#include "utils_db_query.h"
#include "utils_complain.h"
#include <pg_config_manual.h>
C_PSQL_PARAM_INTERVAL,
} c_psql_param_t;
+/* Parameter configuration. Stored as `user data' in the query objects. */
typedef struct {
- char *type;
- char *instance_prefix;
- char **instances_str;
- int *instances;
- int instances_num;
- char **values_str; /* may be NULL, even if values_num != 0 in
- case the "Column" option has been used */
- int *values;
- int *ds_types;
- int values_num;
-} c_psql_result_t;
-
-typedef struct {
- char *name;
- char *stmt;
-
c_psql_param_t *params;
int params_num;
-
- c_psql_result_t *results;
- int results_num;
-
- int min_pg_version;
- int max_pg_version;
-} c_psql_query_t;
+} c_psql_user_data_t;
typedef struct {
PGconn *conn;
c_complain_t conn_complaint;
int proto_version;
+ int server_version;
int max_params_num;
/* user configuration */
- c_psql_query_t **queries;
- int *hidden_queries;
- int queries_num;
+ udb_query_t **queries;
+ size_t queries_num;
char *host;
char *port;
};
static int def_queries_num = STATIC_ARRAY_SIZE (def_queries);
-static c_psql_query_t *queries = NULL;
-static int queries_num = 0;
+static udb_query_t **queries = NULL;
+static size_t queries_num = 0;
static c_psql_database_t *databases = NULL;
static int databases_num = 0;
-static c_psql_result_t *c_psql_result_new (c_psql_query_t *query)
-{
- c_psql_result_t *res;
-
- ++query->results_num;
- if (NULL == (query->results = (c_psql_result_t *)realloc (query->results,
- query->results_num * sizeof (*query->results)))) {
- log_err ("Out of memory.");
- exit (5);
- }
- res = query->results + query->results_num - 1;
-
- res->type = NULL;
-
- res->instance_prefix = NULL;
- res->instances_str = NULL;
- res->instances = NULL;
- res->instances_num = 0;
-
- res->values_str = NULL;
- res->values = NULL;
- res->ds_types = NULL;
- res->values_num = 0;
- return res;
-} /* c_psql_result_new */
-
-static void c_psql_result_delete (c_psql_result_t *res)
-{
- int i;
-
- sfree (res->type);
-
- sfree (res->instance_prefix);
-
- for (i = 0; i < res->instances_num; ++i)
- sfree (res->instances_str[i]);
- sfree (res->instances_str);
- sfree (res->instances);
- res->instances_num = 0;
-
- for (i = 0; (NULL != res->values_str) && (i < res->values_num); ++i)
- sfree (res->values_str[i]);
- sfree (res->values_str);
- sfree (res->values);
- sfree (res->ds_types);
- res->values_num = 0;
-} /* c_psql_result_delete */
-
-static c_psql_query_t *c_psql_query_new (const char *name)
-{
- c_psql_query_t *query;
-
- ++queries_num;
- if (NULL == (queries = (c_psql_query_t *)realloc (queries,
- queries_num * sizeof (*queries)))) {
- log_err ("Out of memory.");
- exit (5);
- }
- query = queries + queries_num - 1;
-
- query->name = sstrdup (name);
- query->stmt = NULL;
-
- query->params = NULL;
- query->params_num = 0;
-
- query->results = NULL;
- query->results_num = 0;
-
- query->min_pg_version = 0;
- query->max_pg_version = INT_MAX;
- return query;
-} /* c_psql_query_new */
-
-static int c_psql_query_init (c_psql_query_t *query)
-{
- int i;
-
- /* Get the data set definitions for each query definition. */
- for (i = 0; i < query->results_num; ++i) {
- c_psql_result_t *res = query->results + i;
- const data_set_t *ds;
-
- int j;
-
- ds = plugin_get_ds (res->type);
- if (NULL == ds) {
- log_err ("Result: Unknown type \"%s\".", res->type);
- return -1;
- }
-
- if (res->values_num != ds->ds_num) {
- log_err ("Result: Invalid type \"%s\" - "
- "expected %i data source%s, got %i.",
- res->type, res->values_num,
- (1 == res->values_num) ? "" : "s",
- ds->ds_num);
- return -1;
- }
-
- for (j = 0; j < res->values_num; ++j)
- res->ds_types[j] = ds->ds[j].type;
- }
- return 0;
-} /* c_psql_query_init */
-
-static void c_psql_query_delete (c_psql_query_t *query)
-{
- int i;
-
- sfree (query->name);
- sfree (query->stmt);
-
- sfree (query->params);
- query->params_num = 0;
-
- for (i = 0; i < query->results_num; ++i)
- c_psql_result_delete (query->results + i);
- sfree (query->results);
- query->results_num = 0;
- return;
-} /* c_psql_query_delete */
-
-static c_psql_query_t *c_psql_query_get (const char *name, int server_version)
-{
- int i;
-
- for (i = 0; i < queries_num; ++i)
- if (0 == strcasecmp (name, queries[i].name)
- && ((-1 == server_version)
- || ((queries[i].min_pg_version <= server_version)
- && (server_version <= queries[i].max_pg_version))))
- return queries + i;
- return NULL;
-} /* c_psql_query_get */
-
static c_psql_database_t *c_psql_database_new (const char *name)
{
c_psql_database_t *db;
C_COMPLAIN_INIT (&db->conn_complaint);
db->proto_version = 0;
+ db->server_version = 0;
db->max_params_num = 0;
db->queries = NULL;
- db->hidden_queries = NULL;
db->queries_num = 0;
db->database = sstrdup (name);
return db;
} /* c_psql_database_new */
-static void c_psql_database_init (c_psql_database_t *db, int server_version)
-{
- int i;
-
- /* Get the right version of each query definition. */
- for (i = 0; i < db->queries_num; ++i) {
- c_psql_query_t *tmp;
-
- tmp = c_psql_query_get (db->queries[i]->name, server_version);
-
- if (tmp == db->queries[i])
- continue;
-
- if (NULL == tmp) {
- log_err ("Query \"%s\" not found for server version %i - "
- "please check your configuration.",
- db->queries[i]->name, server_version);
- /* By hiding the query (rather than removing it from the list) we
- * don't lose it in case a reconnect to an available version
- * happens at a later time. */
- db->hidden_queries[i] = 1;
- continue;
- }
-
- db->hidden_queries[i] = 0;
- db->queries[i] = tmp;
- }
-} /* c_psql_database_init */
-
static void c_psql_database_delete (c_psql_database_t *db)
{
PQfinish (db->conn);
db->conn = NULL;
sfree (db->queries);
- sfree (db->hidden_queries);
db->queries_num = 0;
sfree (db->database);
return;
} /* c_psql_database_delete */
-static void submit (const c_psql_database_t *db, const c_psql_result_t *res,
- char **instances, value_t *values)
-{
- value_list_t vl = VALUE_LIST_INIT;
-
- int instances_num = res->instances_num;
-
- if (NULL != res->instance_prefix)
- ++instances_num;
-
- vl.values = values;
- vl.values_len = res->values_num;
-
- if (C_PSQL_IS_UNIX_DOMAIN_SOCKET (db->host)
- || (0 == strcmp (db->host, "localhost")))
- sstrncpy (vl.host, hostname_g, sizeof (vl.host));
- else
- sstrncpy (vl.host, db->host, sizeof (vl.host));
-
- sstrncpy (vl.plugin, "postgresql", sizeof (vl.plugin));
- sstrncpy (vl.plugin_instance, db->database, sizeof (vl.plugin_instance));
-
- sstrncpy (vl.type, res->type, sizeof (vl.type));
-
- if (0 < instances_num) {
- vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
- strjoin (vl.type_instance, sizeof (vl.type_instance),
- instances, instances_num, "-");
-
- if ('\0' != vl.type_instance[sizeof (vl.type_instance) - 1]) {
- vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
- log_warn ("Truncated type instance: %s.", vl.type_instance);
- }
- }
-
- plugin_dispatch_values (&vl);
- return;
-} /* submit */
-
-static int c_psql_get_colnum (PGresult *pgres,
- char **strings, int *numbers, int idx)
-{
- int colnum;
-
- if (0 <= numbers[idx])
- return numbers[idx];
-
- colnum = PQfnumber (pgres, strings[idx]);
- if (0 > colnum)
- log_err ("No such column: %s.", strings[idx]);
-
- numbers[idx] = colnum;
- return colnum;
-} /* c_psql_get_colnum */
-
-static void c_psql_dispatch_row (c_psql_database_t *db, c_psql_query_t *query,
- PGresult *pgres, int row)
-{
- int i;
-
- for (i = 0; i < query->results_num; ++i) {
- c_psql_result_t *res = query->results + i;
-
- char *instances[res->instances_num + 1];
- value_t values[res->values_num];
-
- int offset = 0, status = 0, j;
-
- /* get the instance name */
- if (NULL != res->instance_prefix) {
- instances[0] = res->instance_prefix;
- offset = 1;
- }
-
- for (j = 0; (0 == status) && (j < res->instances_num); ++j) {
- int col = c_psql_get_colnum (pgres,
- res->instances_str, res->instances, j);
-
- if (0 > col) {
- status = -1;
- break;
- }
-
- instances[j + offset] = PQgetvalue (pgres, row, col);
- if (NULL == instances[j + offset])
- instances[j + offset] = "";
- }
-
- /* get the values */
- for (j = 0; (0 == status) && (j < res->values_num); ++j) {
- int col = c_psql_get_colnum (pgres,
- res->values_str, res->values, j);
-
- char *value_str;
- char *endptr = NULL;
-
- if (0 > col) {
- status = -1;
- break;
- }
-
- value_str = PQgetvalue (pgres, row, col);
- if ((NULL == value_str) || ('\0' == *value_str))
- value_str = "0";
-
- if (res->ds_types[j] == DS_TYPE_COUNTER)
- values[j].counter = (counter_t)strtoll (value_str, &endptr, 0);
- else if (res->ds_types[j] == DS_TYPE_GAUGE)
- values[j].gauge = (gauge_t)strtod (value_str, &endptr);
- else {
- log_err ("Invalid type \"%s\" (%i).",
- res->type, res->ds_types[j]);
- }
-
- if (value_str == endptr) {
- log_err ("Failed to parse string as number: %s.", value_str);
- status = -1;
- break;
- }
- else if ((NULL != endptr) && ('\0' != *endptr))
- log_warn ("Ignoring trailing garbage after number: %s.",
- endptr);
- }
-
- if (0 != status)
- continue;
-
- submit (db, res, instances, values);
- }
-} /* c_psql_dispatch_row */
-
static int c_psql_check_connection (c_psql_database_t *db)
{
/* "ping" */
db->proto_version);
}
- /* We might have connected to a different PostgreSQL version, so we
- * need to reinitialize stuff. */
- if (c_would_release (&db->conn_complaint))
- c_psql_database_init (db, PQserverVersion (db->conn));
+ db->server_version = PQserverVersion (db->conn);
c_release (LOG_INFO, &db->conn_complaint,
"Successfully reconnected to database %s", PQdb (db->conn));
return 0;
} /* c_psql_check_connection */
+static PGresult *c_psql_exec_query_noparams (c_psql_database_t *db,
+ udb_query_t *q)
+{
+ return PQexec (db->conn, udb_query_get_statement (q));
+} /* c_psql_exec_query_noparams */
+
static PGresult *c_psql_exec_query_params (c_psql_database_t *db,
- c_psql_query_t *query)
+ udb_query_t *q, c_psql_user_data_t *data)
{
char *params[db->max_params_num];
char interval[64];
int i;
- assert (db->max_params_num >= query->params_num);
+ if ((data == NULL) || (data->params_num == 0))
+ return (c_psql_exec_query_noparams (db, q));
- for (i = 0; i < query->params_num; ++i) {
- switch (query->params[i]) {
+ assert (db->max_params_num >= data->params_num);
+
+ for (i = 0; i < data->params_num; ++i) {
+ switch (data->params[i]) {
case C_PSQL_PARAM_HOST:
params[i] = C_PSQL_IS_UNIX_DOMAIN_SOCKET (db->host)
? "localhost" : db->host;
}
}
- return PQexecParams (db->conn, query->stmt, query->params_num, NULL,
- (const char *const *)((0 == query->params_num) ? NULL : params),
+ return PQexecParams (db->conn, udb_query_get_statement (q),
+ data->params_num, NULL,
+ (const char *const *) params,
NULL, NULL, /* return text data */ 0);
} /* c_psql_exec_query_params */
-static PGresult *c_psql_exec_query_noparams (c_psql_database_t *db,
- c_psql_query_t *query)
+static int c_psql_exec_query (c_psql_database_t *db, udb_query_t *q)
{
- return PQexec (db->conn, query->stmt);
-} /* c_psql_exec_query_noparams */
+ PGresult *res;
-static int c_psql_exec_query (c_psql_database_t *db, int idx)
-{
- c_psql_query_t *query;
- PGresult *res;
+ c_psql_user_data_t *data;
- int rows, cols;
- int i;
+ const char *host;
- if (idx >= db->queries_num)
- return -1;
+ char **column_names;
+ char **column_values;
+ int column_num;
- if (0 != db->hidden_queries[idx])
- return 0;
+ int rows_num;
+ int status;
+ int i;
- query = db->queries[idx];
+ /* The user data may hold parameter information */
+ data = udb_query_get_user_data (q);
+ /* Versions up to `3' don't know how to handle parameters. */
if (3 <= db->proto_version)
- res = c_psql_exec_query_params (db, query);
- else if (0 == query->params_num)
- res = c_psql_exec_query_noparams (db, query);
+ res = c_psql_exec_query_params (db, q, data);
+ else if ((NULL == data) || (0 == data->params_num))
+ res = c_psql_exec_query_noparams (db, q);
else {
log_err ("Connection to database \"%s\" does not support parameters "
"(protocol version %d) - cannot execute query \"%s\".",
- db->database, db->proto_version, query->name);
+ db->database, db->proto_version,
+ udb_query_get_name (q));
return -1;
}
+ column_names = NULL;
+ column_values = NULL;
+
+#define BAIL_OUT(status) \
+ sfree (column_names); \
+ sfree (column_values); \
+ PQclear (res); \
+ return status
+
if (PGRES_TUPLES_OK != PQresultStatus (res)) {
log_err ("Failed to execute SQL query: %s",
PQerrorMessage (db->conn));
- log_info ("SQL query was: %s", query->stmt);
- PQclear (res);
- return -1;
+ log_info ("SQL query was: %s",
+ udb_query_get_statement (q));
+ BAIL_OUT (-1);
}
- rows = PQntuples (res);
- if (1 > rows) {
- PQclear (res);
- return 0;
+ rows_num = PQntuples (res);
+ if (1 > rows_num) {
+ BAIL_OUT (0);
}
- cols = PQnfields (res);
+ column_num = PQnfields (res);
+ column_names = (char **) calloc (column_num, sizeof (char *));
+ if (NULL == column_names) {
+ log_err ("calloc failed.");
+ BAIL_OUT (-1);
+ }
- for (i = 0; i < rows; ++i)
- c_psql_dispatch_row (db, query, res, i);
- PQclear (res);
- return 0;
+ column_values = (char **) calloc (column_num, sizeof (char *));
+ if (NULL == column_values) {
+ log_err ("calloc failed.");
+ BAIL_OUT (-1);
+ }
+
+ for (i = 0; i < column_num; i++) {
+ /* Pointers returned by `PQfname' are freed by `PQclear' via
+ * `BAIL_OUT'. */
+ column_names[i] = PQfname (res, i);
+ if (NULL == column_names[i]) {
+ log_err ("PQfname (%i) failed.", i);
+ BAIL_OUT (-1);
+ }
+ }
+
+ if (C_PSQL_IS_UNIX_DOMAIN_SOCKET (db->host)
+ || (0 == strcmp (db->host, "localhost")))
+ host = hostname_g;
+ else
+ host = db->host;
+
+ status = udb_query_prepare_result (q, host, "postgresql",
+ db->database, column_names, (size_t) column_num);
+ if (0 != status) {
+ log_err ("udb_query_prepare_result failed with status %i.",
+ status);
+ BAIL_OUT (-1);
+ }
+
+ for (i = 0; i < rows_num; ++i) {
+ int j;
+
+ for (j = 0; j < column_num; j++) {
+ /* Pointers returned by `PQgetvalue' are freed by `PQclear' via
+ * `BAIL_OUT'. */
+ column_values[j] = PQgetvalue (res, /* row = */ i, /* col = */ j);
+ if (NULL == column_values[j]) {
+ log_err ("PQgetvalue (%i, %i) failed.", i, j);
+ break;
+ }
+ }
+
+ /* check for an error */
+ if (j < column_num)
+ continue;
+
+ status = udb_query_handle_result (q, column_values);
+ if (status != 0) {
+ log_err ("udb_query_handle_result failed with status %i.",
+ status);
+ }
+ } /* for (i = 0; i < rows_num; ++i) */
+
+ BAIL_OUT (0);
+#undef BAIL_OUT
} /* c_psql_exec_query */
static int c_psql_read (void)
continue;
for (j = 0; j < db->queries_num; ++j)
- c_psql_exec_query (db, j);
+ {
+ udb_query_t *q;
+
+ q = db->queries[j];
+
+ if ((0 != db->server_version)
+ && (udb_query_check_version (q, db->server_version) <= 0))
+ continue;
+
+ c_psql_exec_query (db, q);
+ }
++success;
}
plugin_unregister_read ("postgresql");
plugin_unregister_shutdown ("postgresql");
- for (i = 0; i < databases_num; ++i) {
- c_psql_database_t *db = databases + i;
- c_psql_database_delete (db);
- }
+ for (i = 0; i < databases_num; ++i)
+ c_psql_database_delete (databases + i);
sfree (databases);
databases_num = 0;
- for (i = 0; i < queries_num; ++i) {
- c_psql_query_t *query = queries + i;
- c_psql_query_delete (query);
- }
-
- sfree (queries);
+ udb_query_free (queries, queries_num);
+ queries = NULL;
queries_num = 0;
+
return 0;
} /* c_psql_shutdown */
if ((NULL == databases) || (0 == databases_num))
return 0;
- for (i = 0; i < queries_num; ++i)
- if (0 != c_psql_query_init (queries + i)) {
- c_psql_shutdown ();
- return -1;
- }
-
for (i = 0; i < databases_num; ++i) {
c_psql_database_t *db = databases + i;
if (3 > db->proto_version)
log_warn ("Protocol version %d does not support parameters.",
db->proto_version);
-
- c_psql_database_init (db, server_version);
}
plugin_register_read ("postgresql", c_psql_read);
return 0;
} /* config_set_s */
-static int config_set_i (char *name, int *var, const oconfig_item_t *ci)
-{
- if ((0 != ci->children_num) || (1 != ci->values_num)
- || (OCONFIG_TYPE_NUMBER != ci->values[0].type)) {
- log_err ("%s expects a single number argument.", name);
- return 1;
- }
-
- *var = (int)ci->values[0].value.number;
- return 0;
-} /* config_set_i */
-
-static int config_append_array_s (char *name, char ***var, int *len,
- const oconfig_item_t *ci)
+static int config_query_param_add (udb_query_t *q, oconfig_item_t *ci)
{
- int i;
+ c_psql_user_data_t *data;
+ const char *param_str;
- if ((0 != ci->children_num) || (1 > ci->values_num)) {
- log_err ("%s expects at least one argument.", name);
- return 1;
- }
+ c_psql_param_t *tmp;
- for (i = 0; i < ci->values_num; ++i) {
- if (OCONFIG_TYPE_STRING != ci->values[i].type) {
- log_err ("%s expects string arguments.", name);
- return 1;
+ data = udb_query_get_user_data (q);
+ if (NULL == data) {
+ data = (c_psql_user_data_t *) smalloc (sizeof (*data));
+ if (NULL == data) {
+ log_err ("Out of memory.");
+ return -1;
}
+ memset (data, 0, sizeof (*data));
+ data->params = NULL;
}
- *len += ci->values_num;
- if (NULL == (*var = (char **)realloc (*var, *len * sizeof (**var)))) {
+ tmp = (c_psql_param_t *) realloc (data->params,
+ (data->params_num + 1) * sizeof (c_psql_param_t));
+ if (NULL == tmp) {
log_err ("Out of memory.");
- exit (5);
- }
-
- for (i = *len - ci->values_num; i < *len; ++i)
- (*var)[i] = sstrdup (ci->values[i].value.string);
- return 0;
-} /* config_append_array_s */
-
-static int config_set_param (c_psql_query_t *query, const oconfig_item_t *ci)
-{
- c_psql_param_t param;
- char *param_str;
-
- if ((0 != ci->children_num) || (1 != ci->values_num)
- || (OCONFIG_TYPE_STRING != ci->values[0].type)) {
- log_err ("Param expects a single string argument.");
- return 1;
+ return -1;
}
+ data->params = tmp;
param_str = ci->values[0].value.string;
if (0 == strcasecmp (param_str, "hostname"))
- param = C_PSQL_PARAM_HOST;
+ data->params[data->params_num] = C_PSQL_PARAM_HOST;
else if (0 == strcasecmp (param_str, "database"))
- param = C_PSQL_PARAM_DB;
+ data->params[data->params_num] = C_PSQL_PARAM_DB;
else if (0 == strcasecmp (param_str, "username"))
- param = C_PSQL_PARAM_USER;
+ data->params[data->params_num] = C_PSQL_PARAM_USER;
else if (0 == strcasecmp (param_str, "interval"))
- param = C_PSQL_PARAM_INTERVAL;
+ data->params[data->params_num] = C_PSQL_PARAM_INTERVAL;
else {
log_err ("Invalid parameter \"%s\".", param_str);
return 1;
}
- ++query->params_num;
- if (NULL == (query->params = (c_psql_param_t *)realloc (query->params,
- query->params_num * sizeof (*query->params)))) {
- log_err ("Out of memory.");
- exit (5);
- }
+ data->params_num++;
+ udb_query_set_user_data (q, data);
- query->params[query->params_num - 1] = param;
- return 0;
-} /* config_set_param */
+ return (0);
+} /* config_query_param_add */
-static int config_set_result (c_psql_query_t *query, const oconfig_item_t *ci)
+static int config_query_callback (udb_query_t *q, oconfig_item_t *ci)
{
- c_psql_result_t *res;
-
- int status = 0, i;
-
- if (0 != ci->values_num) {
- log_err ("<Result> does not expect any arguments.");
- return 1;
- }
-
- res = c_psql_result_new (query);
-
- for (i = 0; i < ci->children_num; ++i) {
- oconfig_item_t *c = ci->children + i;
+ if (0 == strcasecmp ("Param", ci->key))
+ return config_query_param_add (q, ci);
- if (0 == strcasecmp (c->key, "Type"))
- config_set_s ("Type", &res->type, c);
- else if (0 == strcasecmp (c->key, "InstancePrefix"))
- config_set_s ("InstancePrefix", &res->instance_prefix, c);
- else if (0 == strcasecmp (c->key, "InstancesFrom"))
- config_append_array_s ("InstancesFrom",
- &res->instances_str, &res->instances_num, c);
- else if (0 == strcasecmp (c->key, "ValuesFrom"))
- config_append_array_s ("ValuesFrom",
- &res->values_str, &res->values_num, c);
- else
- log_warn ("Ignoring unknown config key \"%s\".", c->key);
- }
-
- if (NULL == res->type) {
- log_warn ("Query \"%s\": Missing Type option in <Result> block.",
- query->name);
- status = 1;
- }
+ log_err ("Option not allowed within a Query block: `%s'", ci->key);
- if (NULL == res->values_str) {
- log_warn ("Query \"%s\": Missing ValuesFrom option in <Result> block.",
- query->name);
- status = 1;
- }
-
- if (0 != status) {
- c_psql_result_delete (res);
- --query->results_num;
- return status;
- }
-
- /* preallocate memory to cache the column numbers and data types */
- res->values = (int *)smalloc (res->values_num * sizeof (*res->values));
- for (i = 0; i < res->values_num; ++i)
- res->values[i] = -1;
-
- res->instances = (int *)smalloc (res->instances_num
- * sizeof (*res->instances));
- for (i = 0; i < res->instances_num; ++i)
- res->instances[i] = -1;
-
- res->ds_types = (int *)smalloc (res->values_num
- * sizeof (*res->ds_types));
- for (i = 0; i < res->values_num; ++i)
- res->ds_types[i] = -1;
- return 0;
-} /* config_set_result */
-
-static int config_set_column (c_psql_query_t *query, int col_num,
- const oconfig_item_t *ci)
-{
- c_psql_result_t *res;
-
- int i;
-
- if ((0 != ci->children_num)
- || (1 > ci->values_num) || (2 < ci->values_num)) {
- log_err ("Column expects either one or two arguments.");
- return 1;
- }
-
- for (i = 0; i < ci->values_num; ++i) {
- if (OCONFIG_TYPE_STRING != ci->values[i].type) {
- log_err ("Column expects either one or two string arguments.");
- return 1;
- }
- }
-
- res = c_psql_result_new (query);
-
- res->type = sstrdup (ci->values[0].value.string);
-
- if (2 == ci->values_num)
- res->instance_prefix = sstrdup (ci->values[1].value.string);
-
- res->values = (int *)smalloc (sizeof (*res->values));
- res->values[0] = col_num;
- res->ds_types = (int *)smalloc (sizeof (*res->ds_types));
- res->values_num = 1;
- return 0;
-} /* config_set_column */
-
-static int set_query (c_psql_database_t *db, const char *name)
-{
- c_psql_query_t *query;
-
- query = c_psql_query_get (name, -1);
- if (NULL == query) {
- log_err ("Query \"%s\" not found - please check your configuration.",
- name);
- return 1;
- }
-
- ++db->queries_num;
- if (NULL == (db->queries = (c_psql_query_t **)realloc (db->queries,
- db->queries_num * sizeof (*db->queries)))) {
- log_err ("Out of memory.");
- exit (5);
- }
-
- if (query->params_num > db->max_params_num)
- db->max_params_num = query->params_num;
-
- db->queries[db->queries_num - 1] = query;
- return 0;
-} /* set_query */
-
-static int config_set_query (c_psql_database_t *db, const oconfig_item_t *ci)
-{
- if ((0 != ci->children_num) || (1 != ci->values_num)
- || (OCONFIG_TYPE_STRING != ci->values[0].type)) {
- log_err ("Query expects a single string argument.");
- return 1;
- }
- return set_query (db, ci->values[0].value.string);
-} /* config_set_query */
-
-static int c_psql_config_query (oconfig_item_t *ci)
-{
- c_psql_query_t *query;
-
- int status = 0, col_num = 0, i;
-
- if ((1 != ci->values_num)
- || (OCONFIG_TYPE_STRING != ci->values[0].type)) {
- log_err ("<Query> expects a single string argument.");
- return 1;
- }
-
- query = c_psql_query_new (ci->values[0].value.string);
-
- for (i = 0; i < ci->children_num; ++i) {
- oconfig_item_t *c = ci->children + i;
-
- if (0 == strcasecmp (c->key, "Statement"))
- config_set_s ("Statement", &query->stmt, c);
- /* backwards compat for versions < 4.6 */
- else if (0 == strcasecmp (c->key, "Query")) {
- log_warn ("<Query>: 'Query' is deprecated - use 'Statement' instead.");
- config_set_s ("Query", &query->stmt, c);
- }
- else if (0 == strcasecmp (c->key, "Param"))
- config_set_param (query, c);
- else if (0 == strcasecmp (c->key, "Result"))
- config_set_result (query, c);
- /* backwards compat for versions < 4.6 */
- else if (0 == strcasecmp (c->key, "Column")) {
- log_warn ("<Query>: 'Column' is deprecated - "
- "use a <Result> block instead.");
- config_set_column (query, col_num, c);
- ++col_num;
- }
- else if (0 == strcasecmp (c->key, "MinPGVersion"))
- config_set_i ("MinPGVersion", &query->min_pg_version, c);
- else if (0 == strcasecmp (c->key, "MaxPGVersion"))
- config_set_i ("MaxPGVersion", &query->max_pg_version, c);
- else
- log_warn ("Ignoring unknown config key \"%s\".", c->key);
- }
-
- for (i = 0; i < queries_num - 1; ++i) {
- c_psql_query_t *q = queries + i;
-
- if ((0 == strcasecmp (q->name, query->name))
- && (q->min_pg_version <= query->max_pg_version)
- && (query->min_pg_version <= q->max_pg_version)) {
- log_err ("Ignoring redefinition (with overlapping version ranges) "
- "of query \"%s\".", query->name);
- status = 1;
- break;
- }
- }
-
- if (query->min_pg_version > query->max_pg_version) {
- log_err ("Query \"%s\": MinPGVersion > MaxPGVersion.",
- query->name);
- status = 1;
- }
-
- if (NULL == query->stmt) {
- log_err ("Query \"%s\" does not include an SQL query statement - "
- "please check your configuration.", query->name);
- status = 1;
- }
-
- if (0 != status) {
- c_psql_query_delete (query);
- --queries_num;
- return status;
- }
- return 0;
-} /* c_psql_config_query */
+ return (-1);
+} /* config_query_callback */
static int c_psql_config_database (oconfig_item_t *ci)
{
else if (0 == strcasecmp (c->key, "Service"))
config_set_s ("Service", &db->service, c);
else if (0 == strcasecmp (c->key, "Query"))
- config_set_query (db, c);
+ udb_query_pick_from_list (c, queries, queries_num,
+ &db->queries, &db->queries_num);
else
log_warn ("Ignoring unknown config key \"%s\".", c->key);
}
- if (NULL == db->queries) {
- for (i = 0; i < def_queries_num; ++i)
- set_query (db, def_queries[i]);
+ /* If no `Query' options were given, add the default queries.. */
+ if (db->queries_num == 0)
+ {
+ for (i = 0; i < def_queries_num; i++)
+ udb_query_pick_from_list_by_name (def_queries[i],
+ queries, queries_num,
+ &db->queries, &db->queries_num);
}
- db->hidden_queries = (int *)calloc (db->queries_num,
- sizeof (*db->hidden_queries));
- if (NULL == db->hidden_queries) {
- log_err ("Out of memory.");
- exit (5);
- }
return 0;
} /* c_psql_config_database */
oconfig_item_t *c = ci->children + i;
if (0 == strcasecmp (c->key, "Query"))
- c_psql_config_query (c);
+ udb_query_create (&queries, &queries_num, c,
+ /* callback = */ config_query_callback,
+ /* legacy mode = */ 1);
else if (0 == strcasecmp (c->key, "Database"))
c_psql_config_database (c);
else
} /* module_register */
/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
-