X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Foracle.c;h=86643ca3b09d608ca9272eec0b9d462c063d8f1f;hb=e44afcf744af2337983b41c6e7a3617595692ddd;hp=12e6287d4d21fbd17b628b23843c2badf9a8f90d;hpb=5b3501f518402d731014dad4d9ff10668e6fd5c6;p=collectd.git

diff --git a/src/oracle.c b/src/oracle.c
index 12e6287d..86643ca3 100644
--- a/src/oracle.c
+++ b/src/oracle.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/oracle.c
- * Copyright (C) 2008,2009  Florian octo Forster
+ * Copyright (C) 2008,2009  noris network AG
+ * Copyright (C) 2012       Florian octo 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
@@ -41,50 +42,31 @@
  * affiliates. Other names may be trademarks of their respective owners.
  *
  * Authors:
- *   Florian octo Forster <octo at noris.net>
+ *   Florian octo Forster <octo at collectd.org>
  **/
 
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
+#include "configfile.h"
+#include "utils_db_query.h"
 
 #include <oci.h>
 
 /*
  * Data types
  */
-struct o_result_s;
-typedef struct o_result_s o_result_t;
-struct o_result_s
-{
-  char    *type;
-  char   **instances;
-  size_t   instances_num;
-  char   **values;
-  size_t   values_num;
-
-  o_result_t *next;
-};
-
-struct o_query_s
-{
-  char    *name;
-  char    *statement;
-  OCIStmt *oci_statement;
-
-  o_result_t *results;
-};
-typedef struct o_query_s o_query_t;
-
 struct o_database_s
 {
   char *name;
+  char *host;
   char *connect_id;
   char *username;
   char *password;
 
-  o_query_t **queries;
-  size_t      queries_num;
+  udb_query_preparation_area_t **q_prep_areas;
+  udb_query_t **queries;
+  size_t        queries_num;
 
   OCISvcCtx *oci_service_context;
 };
@@ -93,7 +75,7 @@ typedef struct o_database_s o_database_t;
 /*
  * Global variables
  */
-static o_query_t    **queries       = NULL;
+static udb_query_t  **queries       = NULL;
 static size_t         queries_num   = 0;
 static o_database_t **databases     = NULL;
 static size_t         databases_num = 0;
@@ -110,73 +92,52 @@ static void o_report_error (const char *where, /* {{{ */
   char buffer[2048];
   sb4 error_code;
   int status;
+  unsigned int record_number;
 
-  status = OCIErrorGet (eh, /* record number = */ 1,
-      /* sqlstate = */ NULL,
-      &error_code,
-      (text *) &buffer[0],
-      (ub4) sizeof (buffer),
-      OCI_HTYPE_ERROR);
-  buffer[sizeof (buffer) - 1] = 0;
-
-  if (status == OCI_SUCCESS)
+  /* An operation may cause / return multiple errors. Loop until we have
+   * handled all errors available (with a fail-save limit of 16). */
+  for (record_number = 1; record_number <= 16; record_number++)
   {
-    size_t buffer_length;
+    memset (buffer, 0, sizeof (buffer));
+    error_code = -1;
+
+    status = OCIErrorGet (eh, (ub4) record_number,
+        /* sqlstate = */ NULL,
+        &error_code,
+        (text *) &buffer[0],
+        (ub4) sizeof (buffer),
+        OCI_HTYPE_ERROR);
+    buffer[sizeof (buffer) - 1] = 0;
 
-    buffer_length = strlen (buffer);
-    while ((buffer_length > 0) && (buffer[buffer_length - 1] < 32))
+    if (status == OCI_NO_DATA)
+      return;
+
+    if (status == OCI_SUCCESS)
     {
-      buffer_length--;
-      buffer[buffer_length] = 0;
-    }
+      size_t buffer_length;
 
-    ERROR ("oracle plugin: %s: %s failed: %s",
-        where, what, buffer);
-  }
-  else
-  {
-    ERROR ("oracle plugin: %s: %s failed. Additionally, OCIErrorGet failed with status %i.",
-        where, what, status);
+      buffer_length = strlen (buffer);
+      while ((buffer_length > 0) && (buffer[buffer_length - 1] < 32))
+      {
+        buffer_length--;
+        buffer[buffer_length] = 0;
+      }
+
+      ERROR ("oracle plugin: %s: %s failed: %s", where, what, buffer);
+    }
+    else
+    {
+      ERROR ("oracle plugin: %s: %s failed. Additionally, OCIErrorGet failed with status %i.",
+          where, what, status);
+      return;
+    }
   }
 } /* }}} void o_report_error */
 
-static void o_result_free (o_result_t *r) /* {{{ */
+static void o_database_free (o_database_t *db) /* {{{ */
 {
   size_t i;
 
-  if (r == NULL)
-    return;
-
-  sfree (r->type);
-
-  for (i = 0; i < r->instances_num; i++)
-    sfree (r->instances[i]);
-  sfree (r->instances);
-
-  for (i = 0; i < r->values_num; i++)
-    sfree (r->values[i]);
-  sfree (r->values);
-
-  o_result_free (r->next);
-
-  sfree (r);
-} /* }}} void o_result_free */
-
-static void o_query_free (o_query_t *q) /* {{{ */
-{
-  if (q == NULL)
-    return;
-
-  sfree (q->name);
-  sfree (q->statement);
-
-  o_result_free (q->results);
-
-  sfree (q);
-} /* }}} void o_query_free */
-
-static void o_database_free (o_database_t *db) /* {{{ */
-{
   if (db == NULL)
     return;
 
@@ -186,6 +147,11 @@ static void o_database_free (o_database_t *db) /* {{{ */
   sfree (db->password);
   sfree (db->queries);
 
+  if (db->q_prep_areas != NULL)
+    for (i = 0; i < db->queries_num; ++i)
+      udb_query_delete_preparation_area (db->q_prep_areas[i]);
+  free (db->q_prep_areas);
+
   sfree (db);
 } /* }}} void o_database_free */
 
@@ -210,334 +176,6 @@ static void o_database_free (o_database_t *db) /* {{{ */
  * </Plugin>
  */
 
-static int o_config_set_string (char **ret_string, /* {{{ */
-    oconfig_item_t *ci)
-{
-  char *string;
-
-  if ((ci->values_num != 1)
-      || (ci->values[0].type != OCONFIG_TYPE_STRING))
-  {
-    WARNING ("oracle plugin: The `%s' config option "
-        "needs exactly one string argument.", ci->key);
-    return (-1);
-  }
-
-  string = strdup (ci->values[0].value.string);
-  if (string == NULL)
-  {
-    ERROR ("oracle plugin: strdup failed.");
-    return (-1);
-  }
-
-  if (*ret_string != NULL)
-    free (*ret_string);
-  *ret_string = string;
-
-  return (0);
-} /* }}} int o_config_set_string */
-
-static int o_config_add_string (char ***ret_array, /* {{{ */
-    size_t *ret_array_len, oconfig_item_t *ci)
-{
-  char **array;
-  size_t array_len;
-  int i;
-
-  if (ci->values_num < 1)
-  {
-    WARNING ("oracle plugin: The `%s' config option "
-        "needs at least one argument.", ci->key);
-    return (-1);
-  }
-
-  for (i = 0; i < ci->values_num; i++)
-  {
-    if (ci->values[i].type != OCONFIG_TYPE_STRING)
-    {
-      WARNING ("oracle plugin: Argument %i to the `%s' option "
-          "is not a string.", i + 1, ci->key);
-      return (-1);
-    }
-  }
-
-  array_len = *ret_array_len;
-  array = (char **) realloc (*ret_array,
-      sizeof (char *) * (array_len + ci->values_num));
-  if (array == NULL)
-  {
-    ERROR ("oracle plugin: realloc failed.");
-    return (-1);
-  }
-  *ret_array = array;
-
-  for (i = 0; i < ci->values_num; i++)
-  {
-    array[array_len] = strdup (ci->values[i].value.string);
-    if (array[array_len] == NULL)
-    {
-      ERROR ("oracle plugin: strdup failed.");
-      *ret_array_len = array_len;
-      return (-1);
-    }
-    array_len++;
-  }
-
-  *ret_array_len = array_len;
-  return (0);
-} /* }}} int o_config_add_string */
-
-static int o_config_add_query_result (o_query_t *q, /* {{{ */
-    oconfig_item_t *ci)
-{
-  o_result_t *r;
-  int status;
-  int i;
-
-  if (ci->values_num != 0)
-  {
-    WARNING ("oracle plugin: The `Result' block doesn't accept any arguments. "
-        "Ignoring %i argument%s.",
-        ci->values_num, (ci->values_num == 1) ? "" : "s");
-  }
-
-  r = (o_result_t *) malloc (sizeof (*r));
-  if (r == NULL)
-  {
-    ERROR ("oracle plugin: malloc failed.");
-    return (-1);
-  }
-  memset (r, 0, sizeof (*r));
-  r->type = NULL;
-  r->instances = NULL;
-  r->values = NULL;
-  r->next = NULL;
-
-  /* Fill the `o_result_t' structure.. */
-  status = 0;
-  for (i = 0; i < ci->children_num; i++)
-  {
-    oconfig_item_t *child = ci->children + i;
-
-    if (strcasecmp ("Type", child->key) == 0)
-      status = o_config_set_string (&r->type, child);
-    else if (strcasecmp ("InstancesFrom", child->key) == 0)
-      status = o_config_add_string (&r->instances, &r->instances_num, child);
-    else if (strcasecmp ("ValuesFrom", child->key) == 0)
-      status = o_config_add_string (&r->values, &r->values_num, child);
-    else
-    {
-      WARNING ("oracle plugin: Query `%s': Option `%s' not allowed here.",
-          q->name, child->key);
-      status = -1;
-    }
-
-    if (status != 0)
-      break;
-  }
-
-  /* Check that all necessary options have been given. */
-  while (status == 0)
-  {
-    if (r->type == NULL)
-    {
-      WARNING ("oracle plugin: `Type' not given for "
-          "result in query `%s'", q->name);
-      status = -1;
-    }
-    if (r->instances == NULL)
-    {
-      WARNING ("oracle plugin: `InstancesFrom' not given for "
-          "result in query `%s'", q->name);
-      status = -1;
-    }
-    if (r->values == NULL)
-    {
-      WARNING ("oracle plugin: `ValuesFrom' not given for "
-          "result in query `%s'", q->name);
-      status = -1;
-    }
-
-    break;
-  } /* while (status == 0) */
-
-  /* If all went well, add this result to the list of results within the
-   * query structure. */
-  if (status == 0)
-  {
-    if (q->results == NULL)
-    {
-      q->results = r;
-    }
-    else
-    {
-      o_result_t *last;
-
-      last = q->results;
-      while (last->next != NULL)
-        last = last->next;
-
-      last->next = r;
-    }
-  }
-
-  if (status != 0)
-  {
-    o_result_free (r);
-    return (-1);
-  }
-
-  return (0);
-} /* }}} int o_config_add_query_result */
-
-static int o_config_add_query (oconfig_item_t *ci) /* {{{ */
-{
-  o_query_t *q;
-  int status;
-  int i;
-
-  if ((ci->values_num != 1)
-      || (ci->values[0].type != OCONFIG_TYPE_STRING))
-  {
-    WARNING ("oracle plugin: The `Query' block "
-        "needs exactly one string argument.");
-    return (-1);
-  }
-
-  q = (o_query_t *) malloc (sizeof (*q));
-  if (q == NULL)
-  {
-    ERROR ("oracle plugin: malloc failed.");
-    return (-1);
-  }
-  memset (q, 0, sizeof (*q));
-
-  status = o_config_set_string (&q->name, ci);
-  if (status != 0)
-  {
-    sfree (q);
-    return (status);
-  }
-
-  /* Fill the `o_query_t' structure.. */
-  for (i = 0; i < ci->children_num; i++)
-  {
-    oconfig_item_t *child = ci->children + i;
-
-    if (strcasecmp ("Statement", child->key) == 0)
-      status = o_config_set_string (&q->statement, child);
-    else if (strcasecmp ("Result", child->key) == 0)
-      status = o_config_add_query_result (q, child);
-    else
-    {
-      WARNING ("oracle plugin: Option `%s' not allowed here.", child->key);
-      status = -1;
-    }
-
-    if (status != 0)
-      break;
-  }
-
-  /* Check that all necessary options have been given. */
-  while (status == 0)
-  {
-    if (q->statement == NULL)
-    {
-      WARNING ("oracle plugin: `Statement' not given for query `%s'", q->name);
-      status = -1;
-    }
-    if (q->results == NULL)
-    {
-      WARNING ("oracle plugin: No (valid) `Result' block given for query `%s'",
-          q->name);
-      status = -1;
-    }
-
-    break;
-  } /* while (status == 0) */
-
-  /* If all went well, add this query to the list of queries within the
-   * database structure. */
-  if (status == 0)
-  {
-    o_query_t **temp;
-
-    temp = (o_query_t **) realloc (queries,
-        sizeof (*queries) * (queries_num + 1));
-    if (temp == NULL)
-    {
-      ERROR ("oracle plugin: realloc failed");
-      status = -1;
-    }
-    else
-    {
-      queries = temp;
-      queries[queries_num] = q;
-      queries_num++;
-    }
-  }
-
-  if (status != 0)
-  {
-    o_query_free (q);
-    return (-1);
-  }
-
-  return (0);
-} /* }}} int o_config_add_query */
-
-static int o_config_add_database_query (o_database_t *db, /* {{{ */
-    oconfig_item_t *ci)
-{
-  o_query_t *q;
-  o_query_t **temp;
-  size_t i;
-
-  if ((ci->values_num != 1)
-      || (ci->values[0].type != OCONFIG_TYPE_STRING))
-  {
-    WARNING ("oracle plugin: The `Query' config option "
-        "needs exactly one string argument.");
-    return (-1);
-  }
-
-  q = NULL;
-  for (i = 0; i < queries_num; i++)
-  {
-    if (strcasecmp (queries[i]->name, ci->values[0].value.string) == 0)
-    {
-      q = queries[i];
-      break;
-    }
-  }
-
-  if (q == NULL)
-  {
-    WARNING ("oracle plugin: Database `%s': Unknown query `%s'. "
-        "Please make sure that the <Query \"%s\"> block comes before "
-        "the <Database \"%s\"> block.",
-        db->name, ci->values[0].value.string,
-        ci->values[0].value.string, db->name);
-    return (-1);
-  }
-
-  temp = (o_query_t **) realloc (db->queries,
-      sizeof (*db->queries) * (db->queries_num + 1));
-  if (temp == NULL)
-  {
-    ERROR ("oracle plugin: realloc failed");
-    return (-1);
-  }
-  else
-  {
-    db->queries = temp;
-    db->queries[db->queries_num] = q;
-    db->queries_num++;
-  }
-
-  return (0);
-} /* }}} int o_config_add_database_query */
-
 static int o_config_add_database (oconfig_item_t *ci) /* {{{ */
 {
   o_database_t *db;
@@ -559,8 +197,13 @@ static int o_config_add_database (oconfig_item_t *ci) /* {{{ */
     return (-1);
   }
   memset (db, 0, sizeof (*db));
+  db->name = NULL;
+  db->host = NULL;
+  db->connect_id = NULL;
+  db->username = NULL;
+  db->password = NULL;
 
-  status = o_config_set_string (&db->name, ci);
+  status = cf_util_get_string (ci, &db->name);
   if (status != 0)
   {
     sfree (db);
@@ -573,13 +216,16 @@ static int o_config_add_database (oconfig_item_t *ci) /* {{{ */
     oconfig_item_t *child = ci->children + i;
 
     if (strcasecmp ("ConnectID", child->key) == 0)
-      status = o_config_set_string (&db->connect_id, child);
+      status = cf_util_get_string (child, &db->connect_id);
+    else if (strcasecmp ("Host", child->key) == 0)
+      status = cf_util_get_string (child, &db->host);
     else if (strcasecmp ("Username", child->key) == 0)
-      status = o_config_set_string (&db->username, child);
+      status = cf_util_get_string (child, &db->username);
     else if (strcasecmp ("Password", child->key) == 0)
-      status = o_config_set_string (&db->password, child);
+      status = cf_util_get_string (child, &db->password);
     else if (strcasecmp ("Query", child->key) == 0)
-      status = o_config_add_database_query (db, child);
+      status = udb_query_pick_from_list (child, queries, queries_num,
+          &db->queries, &db->queries_num);
     else
     {
       WARNING ("oracle plugin: Option `%s' not allowed here.", child->key);
@@ -612,6 +258,34 @@ static int o_config_add_database (oconfig_item_t *ci) /* {{{ */
     break;
   } /* while (status == 0) */
 
+  while ((status == 0) && (db->queries_num > 0))
+  {
+    db->q_prep_areas = (udb_query_preparation_area_t **) calloc (
+        db->queries_num, sizeof (*db->q_prep_areas));
+
+    if (db->q_prep_areas == NULL)
+    {
+      WARNING ("oracle plugin: malloc failed");
+      status = -1;
+      break;
+    }
+
+    for (i = 0; i < db->queries_num; ++i)
+    {
+      db->q_prep_areas[i]
+        = udb_query_allocate_preparation_area (db->queries[i]);
+
+      if (db->q_prep_areas[i] == NULL)
+      {
+        WARNING ("oracle plugin: udb_query_allocate_preparation_area failed");
+        status = -1;
+        break;
+      }
+    }
+
+    break;
+  }
+
   /* If all went well, add this query to the list of queries within the
    * database structure. */
   if (status == 0)
@@ -650,12 +324,19 @@ static int o_config (oconfig_item_t *ci) /* {{{ */
   {
     oconfig_item_t *child = ci->children + i;
     if (strcasecmp ("Query", child->key) == 0)
-      o_config_add_query (child);
+      udb_query_create (&queries, &queries_num, child,
+          /* callback = */ NULL);
     else if (strcasecmp ("Database", child->key) == 0)
       o_config_add_database (child);
     else
     {
-      WARNING ("snmp plugin: Ignoring unknown config option `%s'.", child->key);
+      WARNING ("oracle plugin: Ignoring unknown config option `%s'.", child->key);
+    }
+
+    if (queries_num > 0)
+    {
+      DEBUG ("oracle plugin: o_config: queries_num = %zu; queries[0] = %p; udb_query_get_user_data (queries[0]) = %p;",
+          queries_num, (void *) queries[0], udb_query_get_user_data (queries[0]));
     }
   } /* for (ci->children) */
 
@@ -697,177 +378,15 @@ static int o_init (void) /* {{{ */
   return (0);
 } /* }}} int o_init */
 
-static void o_submit (o_database_t *db, o_result_t *r, /* {{{ */
-    const data_set_t *ds, char **buffer_instances, char **buffer_values)
-{
-  value_list_t vl = VALUE_LIST_INIT;
-  size_t i;
-
-  assert (((size_t) ds->ds_num) == r->values_num);
-
-  vl.values = (value_t *) malloc (sizeof (value_t) * r->values_num);
-  if (vl.values == NULL)
-  {
-    ERROR ("oracle plugin: malloc failed.");
-    return;
-  }
-  vl.values_len = ds->ds_num;
-
-  for (i = 0; i < r->values_num; i++)
-  {
-    char *endptr;
-
-    endptr = NULL;
-    errno = 0;
-    if (ds->ds[i].type == DS_TYPE_COUNTER)
-      vl.values[i].counter = (counter_t) strtoll (buffer_values[i],
-          &endptr, /* base = */ 0);
-    else if (ds->ds[i].type == DS_TYPE_GAUGE)
-      vl.values[i].gauge = (gauge_t) strtod (buffer_values[i], &endptr);
-    else
-      errno = EINVAL;
-
-    if ((endptr == buffer_values[i]) || (errno != 0))
-    {
-      WARNING ("oracle plugin: o_submit: Parsing `%s' as %s failed.",
-          buffer_values[i],
-          (ds->ds[i].type == DS_TYPE_COUNTER) ? "counter" : "gauge");
-      vl.values[i].gauge = NAN;
-    }
-  }
-
-  vl.time = time (NULL);
-  sstrncpy (vl.host, hostname_g, sizeof (vl.host));
-  sstrncpy (vl.plugin, "oracle", sizeof (vl.plugin));
-  sstrncpy (vl.plugin_instance, db->name, sizeof (vl.type_instance));
-  sstrncpy (vl.type, r->type, sizeof (vl.type));
-  strjoin (vl.type_instance, sizeof (vl.type_instance),
-      buffer_instances, r->instances_num, "-");
-  vl.type_instance[sizeof (vl.type_instance) - 1] = 0;
-
-  plugin_dispatch_values (&vl);
-} /* }}} void o_submit */
-
-static int o_handle_query_result (o_database_t *db, /* {{{ */
-    o_query_t *q, o_result_t *r,
-    char **column_names, char **column_values, size_t column_num)
-{
-  const data_set_t *ds;
-  char **instances;
-  char **values;
-  size_t i;
-
-  instances = NULL;
-  values = NULL;
-
-#define BAIL_OUT(status) \
-  sfree (instances); \
-  sfree (values); \
-  return (status)
-
-  /* Read `ds' and check number of values {{{ */
-  ds = plugin_get_ds (r->type);
-  if (ds == NULL)
-  {
-    ERROR ("oracle plugin: o_handle_query_result (%s, %s): Type `%s' is not "
-        "known by the daemon. See types.db(5) for details.",
-        db->name, q->name, r->type);
-    BAIL_OUT (-1);
-  }
-
-  if (((size_t) ds->ds_num) != r->values_num)
-  {
-    ERROR ("oracle plugin: o_handle_query_result (%s, %s): The type `%s' "
-        "requires exactly %i value%s, but the configuration specifies %zu.",
-        db->name, q->name, r->type,
-        ds->ds_num, (ds->ds_num == 1) ? "" : "s",
-        r->values_num);
-    BAIL_OUT (-1);
-  }
-  /* }}} */
-
-  /* Allocate `instances' and `values'. {{{ */
-  instances = (char **) calloc (r->instances_num, sizeof (char *));
-  if (instances == NULL)
-  {
-    ERROR ("oracle plugin: o_handle_query_result (%s, %s): malloc failed.",
-        db->name, q->name);
-    BAIL_OUT (-1);
-  }
-
-  values = (char **) calloc (r->values_num, sizeof (char *));
-  if (values == NULL)
-  {
-    sfree (instances);
-    ERROR ("oracle plugin: o_handle_query_result (%s, %s): malloc failed.",
-        db->name, q->name);
-    BAIL_OUT (-1);
-  }
-  /* }}} */
-
-  /* Fill `instances' with pointers to the appropriate strings from
-   * `column_values' */
-  for (i = 0; i < r->instances_num; i++) /* {{{ */
-  {
-    size_t j;
-
-    instances[i] = NULL;
-    for (j = 0; j < column_num; j++)
-    {
-      if (strcasecmp (r->instances[i], column_names[j]) == 0)
-      {
-        instances[i] = column_values[j];
-        break;
-      }
-    }
-
-    if (instances[i] == NULL)
-    {
-      ERROR ("oracle plugin: o_handle_query_result (%s, %s): "
-          "Cannot find column `%s'. Is the statement correct?",
-          db->name, q->name, r->instances[i]);
-      BAIL_OUT (-1);
-    }
-  } /* }}} */
-
-  /* Fill `values' with pointers to the appropriate strings from
-   * `column_values' */
-  for (i = 0; i < r->values_num; i++) /* {{{ */
-  {
-    size_t j;
-
-    values[i] = NULL;
-    for (j = 0; j < column_num; j++)
-    {
-      if (strcasecmp (r->values[i], column_names[j]) == 0)
-      {
-        values[i] = column_values[j];
-        break;
-      }
-    }
-
-    if (values[i] == NULL)
-    {
-      ERROR ("oracle plugin: o_handle_query_result (%s, %s): "
-          "Cannot find column `%s'. Is the statement correct?",
-          db->name, q->name, r->values[i]);
-      BAIL_OUT (-1);
-    }
-  } /* }}} */
-
-  o_submit (db, r, ds, instances, values);
-
-  BAIL_OUT (0);
-#undef BAIL_OUT
-} /* }}} int o_handle_query_result */
-
 static int o_read_database_query (o_database_t *db, /* {{{ */
-    o_query_t *q)
+    udb_query_t *q, udb_query_preparation_area_t *prep_area)
 {
   char **column_names;
   char **column_values;
   size_t column_num;
 
+  OCIStmt *oci_statement;
+
   /* List of `OCIDefine' pointers. These defines map columns to the buffer
    * space declared above. */
   OCIDefine **oci_defines;
@@ -875,35 +394,48 @@ static int o_read_database_query (o_database_t *db, /* {{{ */
   int status;
   size_t i;
 
+  oci_statement = udb_query_get_user_data (q);
+
   /* Prepare the statement */
-  if (q->oci_statement == NULL) /* {{{ */
+  if (oci_statement == NULL) /* {{{ */
   {
-    status = OCIHandleAlloc (oci_env, (void *) &q->oci_statement,
+    const char *statement;
+
+    statement = udb_query_get_statement (q);
+    assert (statement != NULL);
+
+    status = OCIHandleAlloc (oci_env, (void *) &oci_statement,
         OCI_HTYPE_STMT, /* user_data_size = */ 0, /* user_data = */ NULL);
     if (status != OCI_SUCCESS)
     {
       o_report_error ("o_read_database_query", "OCIHandleAlloc", oci_error);
-      q->oci_statement = NULL;
+      oci_statement = NULL;
       return (-1);
     }
 
-    status = OCIStmtPrepare (q->oci_statement, oci_error,
-        (text *) q->statement, (ub4) strlen (q->statement),
+    status = OCIStmtPrepare (oci_statement, oci_error,
+        (text *) statement, (ub4) strlen (statement),
         /* language = */ OCI_NTV_SYNTAX,
         /* mode     = */ OCI_DEFAULT);
     if (status != OCI_SUCCESS)
     {
       o_report_error ("o_read_database_query", "OCIStmtPrepare", oci_error);
-      OCIHandleFree (q->oci_statement, OCI_HTYPE_STMT);
-      q->oci_statement = NULL;
+      OCIHandleFree (oci_statement, OCI_HTYPE_STMT);
+      oci_statement = NULL;
       return (-1);
     }
-    assert (q->oci_statement != NULL);
+    udb_query_set_user_data (q, oci_statement);
+
+    DEBUG ("oracle plugin: o_read_database_query (%s, %s): "
+        "Successfully allocated statement handle.",
+        db->name, udb_query_get_name (q));
   } /* }}} */
 
+  assert (oci_statement != NULL);
+
   /* Execute the statement */
   status = OCIStmtExecute (db->oci_service_context, /* {{{ */
-      q->oci_statement,
+      oci_statement,
       oci_error,
       /* iters = */ 0,
       /* rowoff = */ 0,
@@ -911,9 +443,10 @@ static int o_read_database_query (o_database_t *db, /* {{{ */
       /* mode = */ OCI_DEFAULT);
   if (status != OCI_SUCCESS)
   {
+    DEBUG ("oracle plugin: o_read_database_query: status = %i (%#x)", status, status);
     o_report_error ("o_read_database_query", "OCIStmtExecute", oci_error);
     ERROR ("oracle plugin: o_read_database_query: "
-        "Failing statement was: %s", q->statement);
+        "Failing statement was: %s", udb_query_get_statement (q));
     return (-1);
   } /* }}} */
 
@@ -921,7 +454,7 @@ static int o_read_database_query (o_database_t *db, /* {{{ */
   do /* {{{ */
   {
     ub4 param_counter = 0;
-    status = OCIAttrGet (q->oci_statement, OCI_HTYPE_STMT, /* {{{ */
+    status = OCIAttrGet (oci_statement, OCI_HTYPE_STMT, /* {{{ */
         &param_counter, /* size pointer = */ NULL, 
         OCI_ATTR_PARAM_COUNT, oci_error);
     if (status != OCI_SUCCESS)
@@ -994,13 +527,12 @@ static int o_read_database_query (o_database_t *db, /* {{{ */
   for (i = 0; i < column_num; i++) /* {{{ */
   {
     char *column_name;
-    size_t column_name_length;
-    char column_name_copy[DATA_MAX_NAME_LEN];
+    ub4 column_name_length;
     OCIParam *oci_param;
 
     oci_param = NULL;
 
-    status = OCIParamGet (q->oci_statement, OCI_HTYPE_STMT, oci_error,
+    status = OCIParamGet (oci_statement, OCI_HTYPE_STMT, oci_error,
         (void *) &oci_param, (ub4) (i + 1));
     if (status != OCI_SUCCESS)
     {
@@ -1017,11 +549,15 @@ static int o_read_database_query (o_database_t *db, /* {{{ */
         &column_name, &column_name_length, OCI_ATTR_NAME, oci_error);
     if (status != OCI_SUCCESS)
     {
+      OCIDescriptorFree (oci_param, OCI_DTYPE_PARAM);
       o_report_error ("o_read_database_query", "OCIAttrGet (OCI_ATTR_NAME)",
           oci_error);
       continue;
     }
 
+    OCIDescriptorFree (oci_param, OCI_DTYPE_PARAM);
+    oci_param = NULL;
+
     /* Copy the name to column_names. Warning: The ``string'' returned by OCI
      * may not be null terminated! */
     memset (column_names[i], 0, DATA_MAX_NAME_LEN);
@@ -1031,10 +567,10 @@ static int o_read_database_query (o_database_t *db, /* {{{ */
     column_names[i][column_name_length] = 0;
 
     DEBUG ("oracle plugin: o_read_database_query: column_names[%zu] = %s; "
-        "column_name_length = %zu;",
-        i, column_name_copy, column_name_length);
+        "column_name_length = %"PRIu32";",
+        i, column_names[i], (uint32_t) column_name_length);
 
-    status = OCIDefineByPos (q->oci_statement,
+    status = OCIDefineByPos (oci_statement,
         &oci_defines[i], oci_error, (ub4) (i + 1),
         column_values[i], DATA_MAX_NAME_LEN, SQLT_STR,
         NULL, NULL, NULL, OCI_DEFAULT);
@@ -1046,12 +582,23 @@ static int o_read_database_query (o_database_t *db, /* {{{ */
   } /* for (j = 1; j <= param_counter; j++) */
   /* }}} End of the ``define'' stuff. */
 
+  status = udb_query_prepare_result (q, prep_area,
+      (db->host != NULL) ? db->host : hostname_g,
+      /* plugin = */ "oracle", db->name, column_names, column_num,
+      /* interval = */ 0);
+  if (status != 0)
+  {
+    ERROR ("oracle plugin: o_read_database_query (%s, %s): "
+        "udb_query_prepare_result failed.",
+        db->name, udb_query_get_name (q));
+    FREE_ALL;
+    return (-1);
+  }
+
   /* Fetch and handle all the rows that matched the query. */
   while (42) /* {{{ */
   {
-    o_result_t *r;
-
-    status = OCIStmtFetch2 (q->oci_statement, oci_error,
+    status = OCIStmtFetch2 (oci_statement, oci_error,
         /* nrows = */ 1, /* orientation = */ OCI_FETCH_NEXT,
         /* fetch offset = */ 0, /* mode = */ OCI_DEFAULT);
     if (status == OCI_NO_DATA)
@@ -1065,14 +612,13 @@ static int o_read_database_query (o_database_t *db, /* {{{ */
       break;
     }
 
-    for (i = 0; i < column_num; i++)
+    status = udb_query_handle_result (q, prep_area, column_values);
+    if (status != 0)
     {
-      DEBUG ("oracle plugin: o_read_database_query: [%zu] %s = %s;",
-           i, column_names[i], column_values[i]);
+      WARNING ("oracle plugin: o_read_database_query (%s, %s): "
+          "udb_query_handle_result failed.",
+          db->name, udb_query_get_name (q));
     }
-
-    for (r = q->results; r != NULL; r = r->next)
-      o_handle_query_result (db, q, r, column_names, column_values, column_num);
   } /* }}} while (42) */
 
   /* DEBUG ("oracle plugin: o_read_database_query: This statement succeeded: %s", q->statement); */
@@ -1088,6 +634,47 @@ static int o_read_database (o_database_t *db) /* {{{ */
   size_t i;
   int status;
 
+  if (db->oci_service_context != NULL)
+  {
+    OCIServer *server_handle;
+    ub4 connection_status;
+
+    server_handle = NULL;
+    status = OCIAttrGet ((void *) db->oci_service_context, OCI_HTYPE_SVCCTX, 
+        (void *) &server_handle, /* size pointer = */ NULL,
+        OCI_ATTR_SERVER, oci_error);
+    if (status != OCI_SUCCESS)
+    {
+      o_report_error ("o_read_database", "OCIAttrGet", oci_error);
+      return (-1);
+    }
+
+    if (server_handle == NULL)
+    {
+      connection_status = OCI_SERVER_NOT_CONNECTED;
+    }
+    else /* if (server_handle != NULL) */
+    {
+      connection_status = 0;
+      status = OCIAttrGet ((void *) server_handle, OCI_HTYPE_SERVER,
+          (void *) &connection_status, /* size pointer = */ NULL,
+          OCI_ATTR_SERVER_STATUS, oci_error);
+      if (status != OCI_SUCCESS)
+      {
+        o_report_error ("o_read_database", "OCIAttrGet", oci_error);
+        return (-1);
+      }
+    }
+
+    if (connection_status != OCI_SERVER_NORMAL)
+    {
+      INFO ("oracle plugin: Connection to %s lost. Trying to reconnect.",
+          db->name);
+      OCIHandleFree (db->oci_service_context, OCI_HTYPE_SVCCTX);
+      db->oci_service_context = NULL;
+    }
+  } /* if (db->oci_service_context != NULL) */
+
   if (db->oci_service_context == NULL)
   {
     status = OCILogon (oci_env, oci_error,
@@ -1095,7 +682,7 @@ static int o_read_database (o_database_t *db) /* {{{ */
         (OraText *) db->username, (ub4) strlen (db->username),
         (OraText *) db->password, (ub4) strlen (db->password),
         (OraText *) db->connect_id, (ub4) strlen (db->connect_id));
-    if (status != OCI_SUCCESS)
+    if ((status != OCI_SUCCESS) && (status != OCI_SUCCESS_WITH_INFO))
     {
       o_report_error ("o_read_database", "OCILogon", oci_error);
       DEBUG ("oracle plugin: OCILogon (%s): db->oci_service_context = %p;",
@@ -1103,6 +690,10 @@ static int o_read_database (o_database_t *db) /* {{{ */
       db->oci_service_context = NULL;
       return (-1);
     }
+    else if (status == OCI_SUCCESS_WITH_INFO)
+    {
+      /* TODO: Print NOTIFY message. */
+    }
     assert (db->oci_service_context != NULL);
   }
 
@@ -1110,7 +701,7 @@ static int o_read_database (o_database_t *db) /* {{{ */
       db->connect_id, db->oci_service_context);
 
   for (i = 0; i < db->queries_num; i++)
-    o_read_database_query (db, db->queries[i]);
+    o_read_database_query (db, db->queries[i], db->q_prep_areas[i]);
 
   return (0);
 } /* }}} int o_read_database */
@@ -1137,13 +728,24 @@ static int o_shutdown (void) /* {{{ */
     }
   
   for (i = 0; i < queries_num; i++)
-    if (queries[i]->oci_statement != NULL)
+  {
+    OCIStmt *oci_statement;
+
+    oci_statement = udb_query_get_user_data (queries[i]);
+    if (oci_statement != NULL)
     {
-      OCIHandleFree (queries[i]->oci_statement, OCI_HTYPE_STMT);
-      queries[i]->oci_statement = NULL;
+      OCIHandleFree (oci_statement, OCI_HTYPE_STMT);
+      udb_query_set_user_data (queries[i], NULL);
     }
+  }
   
   OCIHandleFree (oci_env, OCI_HTYPE_ENV);
+  oci_env = NULL;
+
+  udb_query_free (queries, queries_num);
+  queries = NULL;
+  queries_num = 0;
+
   return (0);
 } /* }}} int o_shutdown */