dovecot-2.0: lib-sql: Renamed "sql pool" to "sql db cache", sinc...

dovecot at dovecot.org dovecot at dovecot.org
Mon May 3 18:03:47 EEST 2010


details:   http://hg.dovecot.org/dovecot-2.0/rev/e0d02ae9d50f
changeset: 11252:e0d02ae9d50f
user:      Timo Sirainen <tss at iki.fi>
date:      Mon May 03 18:03:40 2010 +0300
description:
lib-sql: Renamed "sql pool" to "sql db cache", since that's what it is.

diffstat:

 src/lib-dict/dict-sql.c    |   12 ++--
 src/lib-sql/Makefile.am    |    4 +-
 src/lib-sql/sql-db-cache.c |  139 ++++++++++++++++++++++++++++++++++++++++++++++
 src/lib-sql/sql-db-cache.h |   14 ++++
 src/lib-sql/sql-pool.c     |  138 ----------------------------------------------
 src/lib-sql/sql-pool.h     |   13 ----
 6 files changed, 161 insertions(+), 159 deletions(-)

diffs (truncated from 389 to 300 lines):

diff -r 6243376eff60 -r e0d02ae9d50f src/lib-dict/dict-sql.c
--- a/src/lib-dict/dict-sql.c	Mon May 03 16:58:36 2010 +0300
+++ b/src/lib-dict/dict-sql.c	Mon May 03 18:03:40 2010 +0300
@@ -5,7 +5,7 @@
 #include "istream.h"
 #include "str.h"
 #include "sql-api-private.h"
-#include "sql-pool.h"
+#include "sql-db-cache.h"
 #include "dict-private.h"
 #include "dict-sql-settings.h"
 #include "dict-sql.h"
@@ -68,7 +68,7 @@
 	unsigned int changed:1;
 };
 
-static struct sql_pool *dict_sql_pool;
+static struct sql_db_cache *dict_sql_db_cache;
 
 static void sql_dict_prev_inc_flush(struct sql_dict_transaction_context *ctx);
 
@@ -94,8 +94,8 @@
 	/* currently pgsql and sqlite don't support "ON DUPLICATE KEY" */
 	dict->has_on_duplicate_key = strcmp(driver->name, "mysql") == 0;
 
-	dict->db = sql_pool_new(dict_sql_pool, driver->name,
-				dict->set->connect);
+	dict->db = sql_db_cache_new(dict_sql_db_cache, driver->name,
+				    dict->set->connect);
 	return &dict->dict;
 }
 
@@ -900,7 +900,7 @@
         const struct sql_db *const *drivers;
 	unsigned int i, count;
 
-	dict_sql_pool = sql_pool_init(DICT_SQL_MAX_UNUSED_CONNECTIONS);
+	dict_sql_db_cache = sql_db_cache_init(DICT_SQL_MAX_UNUSED_CONNECTIONS);
 
 	/* @UNSAFE */
 	drivers = array_get(&sql_drivers, &count);
@@ -921,5 +921,5 @@
 	for (i = 0; dict_sql_drivers[i].name != NULL; i++)
 		dict_driver_unregister(&dict_sql_drivers[i]);
 	i_free(dict_sql_drivers);
-	sql_pool_deinit(&dict_sql_pool);
+	sql_db_cache_deinit(&dict_sql_db_cache);
 }
diff -r 6243376eff60 -r e0d02ae9d50f src/lib-sql/Makefile.am
--- a/src/lib-sql/Makefile.am	Mon May 03 16:58:36 2010 +0300
+++ b/src/lib-sql/Makefile.am	Mon May 03 18:03:40 2010 +0300
@@ -32,7 +32,7 @@
 
 dist_sources = \
 	sql-api.c \
-	sql-pool.c
+	sql-db-cache.c
 
 if ! SQL_PLUGINS
 driver_sources = \
@@ -66,7 +66,7 @@
 headers = \
 	sql-api.h \
 	sql-api-private.h \
-	sql-pool.h
+	sql-db-cache.h
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
diff -r 6243376eff60 -r e0d02ae9d50f src/lib-sql/sql-db-cache.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lib-sql/sql-db-cache.c	Mon May 03 18:03:40 2010 +0300
@@ -0,0 +1,139 @@
+/* Copyright (c) 2004-2010 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "array.h"
+#include "hash.h"
+#include "sql-api-private.h"
+#include "sql-db-cache.h"
+
+#define SQL_DB_CACHE_CONTEXT(obj) \
+	MODULE_CONTEXT(obj, sql_db_cache_module)
+
+struct sql_db_cache_context {
+	union sql_db_module_context module_ctx;
+	struct sql_db *prev, *next; /* These are set while refcount=0 */
+
+	struct sql_db_cache *cache;
+	int refcount;
+	char *key;
+	void (*orig_deinit)(struct sql_db *db);
+};
+
+struct sql_db_cache {
+	struct hash_table *dbs;
+	unsigned int unused_count, max_unused_connections;
+	struct sql_db *unused_tail, *unused_head;
+};
+
+static MODULE_CONTEXT_DEFINE_INIT(sql_db_cache_module, &sql_db_module_register);
+
+static void sql_db_cache_db_deinit(struct sql_db *db)
+{
+	struct sql_db_cache_context *ctx = SQL_DB_CACHE_CONTEXT(db);
+	struct sql_db_cache_context *head_ctx;
+
+	if (--ctx->refcount > 0)
+		return;
+
+	ctx->cache->unused_count++;
+	if (ctx->cache->unused_tail == NULL)
+		ctx->cache->unused_tail = db;
+	else {
+		head_ctx = SQL_DB_CACHE_CONTEXT(ctx->cache->unused_head);
+		head_ctx->next = db;
+	}
+	ctx->prev = ctx->cache->unused_head;
+	ctx->cache->unused_head = db;
+}
+
+static void sql_db_cache_unlink(struct sql_db_cache_context *ctx)
+{
+	struct sql_db_cache_context *prev_ctx, *next_ctx;
+
+	i_assert(ctx->refcount == 0);
+
+	if (ctx->prev == NULL)
+		ctx->cache->unused_tail = ctx->next;
+	else {
+		prev_ctx = SQL_DB_CACHE_CONTEXT(ctx->prev);
+		prev_ctx->next = ctx->next;
+	}
+	if (ctx->next == NULL)
+		ctx->cache->unused_head = ctx->prev;
+	else {
+		next_ctx = SQL_DB_CACHE_CONTEXT(ctx->next);
+		next_ctx->prev = ctx->prev;
+	}
+	ctx->cache->unused_count--;
+}
+
+static void sql_db_cache_drop_oldest(struct sql_db_cache *cache)
+{
+	struct sql_db *db;
+	struct sql_db_cache_context *ctx;
+
+	while (cache->unused_count >= cache->max_unused_connections) {
+		db = cache->unused_tail;
+		ctx = SQL_DB_CACHE_CONTEXT(db);
+		sql_db_cache_unlink(ctx);
+
+		i_free(ctx->key);
+		ctx->orig_deinit(db);
+	}
+}
+
+struct sql_db *
+sql_db_cache_new(struct sql_db_cache *cache,
+		 const char *db_driver, const char *connect_string)
+{
+	struct sql_db_cache_context *ctx;
+	struct sql_db *db;
+	char *key;
+
+	key = i_strdup_printf("%s\t%s", db_driver, connect_string);
+	db = hash_table_lookup(cache->dbs, key);
+	if (db != NULL) {
+		ctx = SQL_DB_CACHE_CONTEXT(db);
+		if (ctx->refcount == 0) {
+			sql_db_cache_unlink(ctx);
+			ctx->prev = ctx->next = NULL;
+		}
+		i_free(key);
+	} else {
+		sql_db_cache_drop_oldest(cache);
+
+		ctx = i_new(struct sql_db_cache_context, 1);
+		ctx->cache = cache;
+		ctx->key = key;
+
+		db = sql_init(db_driver, connect_string);
+		ctx->orig_deinit = db->v.deinit;
+		db->v.deinit = sql_db_cache_db_deinit;
+
+		MODULE_CONTEXT_SET(db, sql_db_cache_module, ctx);
+		hash_table_insert(cache->dbs, ctx->key, db);
+	}
+
+	ctx->refcount++;
+	return db;
+}
+
+struct sql_db_cache *sql_db_cache_init(unsigned int max_unused_connections)
+{
+	struct sql_db_cache *cache;
+
+	cache = i_new(struct sql_db_cache, 1);
+	cache->dbs = hash_table_create(default_pool, default_pool, 0, str_hash,
+				       (hash_cmp_callback_t *)strcmp);
+	cache->max_unused_connections = max_unused_connections;
+	return cache;
+}
+
+void sql_db_cache_deinit(struct sql_db_cache **_cache)
+{
+	struct sql_db_cache *cache = *_cache;
+
+	*_cache = NULL;
+	hash_table_destroy(&cache->dbs);
+	i_free(cache);
+}
diff -r 6243376eff60 -r e0d02ae9d50f src/lib-sql/sql-db-cache.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lib-sql/sql-db-cache.h	Mon May 03 18:03:40 2010 +0300
@@ -0,0 +1,14 @@
+#ifndef SQL_DB_CACHE_H
+#define SQL_DB_CACHE_H
+
+struct sql_db_cache;
+
+/* Like sql_init(), but use a connection pool. */
+struct sql_db *
+sql_db_cache_new(struct sql_db_cache *cache,
+		 const char *db_driver, const char *connect_string);
+
+struct sql_db_cache *sql_db_cache_init(unsigned int max_unused_connections);
+void sql_db_cache_deinit(struct sql_db_cache **cache);
+
+#endif
diff -r 6243376eff60 -r e0d02ae9d50f src/lib-sql/sql-pool.c
--- a/src/lib-sql/sql-pool.c	Mon May 03 16:58:36 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/* Copyright (c) 2004-2010 Dovecot authors, see the included COPYING file */
-
-#include "lib.h"
-#include "array.h"
-#include "hash.h"
-#include "sql-api-private.h"
-#include "sql-pool.h"
-
-#define SQL_POOL_CONTEXT(obj) \
-	MODULE_CONTEXT(obj, sql_pool_module)
-
-struct sql_pool_context {
-	union sql_db_module_context module_ctx;
-	struct sql_db *prev, *next; /* These are set while refcount=0 */
-
-	struct sql_pool *pool;
-	int refcount;
-	char *key;
-	void (*orig_deinit)(struct sql_db *db);
-};
-
-struct sql_pool {
-	struct hash_table *dbs;
-	unsigned int unused_count, max_unused_connections;
-	struct sql_db *unused_tail, *unused_head;
-};
-
-static MODULE_CONTEXT_DEFINE_INIT(sql_pool_module, &sql_db_module_register);
-
-static void sql_pool_db_deinit(struct sql_db *db)
-{
-	struct sql_pool_context *ctx = SQL_POOL_CONTEXT(db);
-	struct sql_pool_context *head_ctx;
-
-	if (--ctx->refcount > 0)
-		return;
-
-	ctx->pool->unused_count++;
-	if (ctx->pool->unused_tail == NULL)
-		ctx->pool->unused_tail = db;
-	else {
-		head_ctx = SQL_POOL_CONTEXT(ctx->pool->unused_head);
-		head_ctx->next = db;
-	}
-	ctx->prev = ctx->pool->unused_head;
-	ctx->pool->unused_head = db;
-}
-
-static void sql_pool_unlink(struct sql_pool_context *ctx)
-{
-	struct sql_pool_context *prev_ctx, *next_ctx;
-
-	i_assert(ctx->refcount == 0);
-
-	if (ctx->prev == NULL)
-		ctx->pool->unused_tail = ctx->next;
-	else {
-		prev_ctx = SQL_POOL_CONTEXT(ctx->prev);
-		prev_ctx->next = ctx->next;
-	}
-	if (ctx->next == NULL)
-		ctx->pool->unused_head = ctx->prev;
-	else {
-		next_ctx = SQL_POOL_CONTEXT(ctx->next);
-		next_ctx->prev = ctx->prev;
-	}


More information about the dovecot-cvs mailing list