lib-sql, lib-dict-backend: Rename sql-db-cache to sql-db-cache-legacy

diff --git a/src/lib-dict-backend/dict-sql.c b/src/lib-dict-backend/dict-sql.c
index fc6b3b58537f2efdf37097508f15ad62917f42ea..3c5427297eeba72568c899e7a1dba2f181a82b87 100644 (file)
--- a/src/lib-dict-backend/dict-sql.c
+++ b/src/lib-dict-backend/dict-sql.c
@@ -8,7 +8,7 @@
 #include "hash.h"
 #include "str.h"
 #include "sql-api-private.h"
-#include "sql-db-cache.h"
+#include "sql-db-cache-legacy.h"
 #include "dict-private.h"
 #include "dict-sql-settings.h"
 #include "dict-sql.h"
@@ -118,7 +118,8 @@ sql_dict_init_legacy(struct dict *driver, const char *uri,
        sql_set.connect_string = dict->set->connect;
        sql_set.event_parent = set->event_parent;
 
-       if (sql_db_cache_new(dict_sql_db_cache, &sql_set, &dict->db, error_r) < 0) {
+       if (sql_db_cache_new_legacy(dict_sql_db_cache, &sql_set,
+                                   &dict->db, error_r) < 0) {
                pool_unref(&pool);
                return -1;
        }
@@ -1676,7 +1677,7 @@ void dict_sql_register(void)
         const struct sql_db *const *drivers;
        unsigned int i, count;
 
-       dict_sql_db_cache = sql_db_cache_init(DICT_SQL_MAX_UNUSED_CONNECTIONS);
+       dict_sql_db_cache = sql_db_cache_init_legacy(DICT_SQL_MAX_UNUSED_CONNECTIONS);
 
        /* @UNSAFE */
        drivers = array_get(&sql_drivers, &count);
@@ -1697,6 +1698,6 @@ void dict_sql_unregister(void)
        for (i = 0; dict_sql_drivers[i].name != NULL; i++)
                dict_driver_unregister(&dict_sql_drivers[i]);
        i_free(dict_sql_drivers);
-       sql_db_cache_deinit(&dict_sql_db_cache);
+       sql_db_cache_deinit_legacy(&dict_sql_db_cache);
        dict_sql_settings_deinit();
 }

diff --git a/src/lib-sql/Makefile.am b/src/lib-sql/Makefile.am
index 26344ee73d8dead30f628e7ff7f4f884a15c45aa..96e1514574a597438b92935ece520e1274fed8e5 100644 (file)
--- a/src/lib-sql/Makefile.am
+++ b/src/lib-sql/Makefile.am
@@ -43,7 +43,7 @@ AM_CPPFLAGS = \
 
 dist_sources = \
        sql-api.c \
-       sql-db-cache.c
+       sql-db-cache-legacy.c
 
 if ! SQL_PLUGINS
 driver_sources = \
@@ -100,7 +100,7 @@ libdovecot_sql_la_LDFLAGS = -export-dynamic
 headers = \
        sql-api.h \
        sql-api-private.h \
-       sql-db-cache.h
+       sql-db-cache-legacy.h
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-sql/sql-db-cache.c b/src/lib-sql/sql-db-cache-legacy.c
similarity index 85%
rename from src/lib-sql/sql-db-cache.c
rename to src/lib-sql/sql-db-cache-legacy.c
index b1351cf5e7b0e941dd43f217c6db6c0c77a10cef..b003c91e794eff18ac7dd943028080cc3acdc23f 100644 (file)
--- a/src/lib-sql/sql-db-cache.c
+++ b/src/lib-sql/sql-db-cache-legacy.c
@@ -4,10 +4,10 @@
 #include "array.h"
 #include "hash.h"
 #include "sql-api-private.h"
-#include "sql-db-cache.h"
+#include "sql-db-cache-legacy.h"
 
 #define SQL_DB_CACHE_CONTEXT(obj) \
-       MODULE_CONTEXT_REQUIRE(obj, sql_db_cache_module)
+       MODULE_CONTEXT_REQUIRE(obj, sql_db_cache_module_legacy)
 
 struct sql_db_cache_context {
        union sql_db_module_context module_ctx;
@@ -25,7 +25,8 @@ struct sql_db_cache {
        struct sql_db *unused_tail, *unused_head;
 };
 
-static MODULE_CONTEXT_DEFINE_INIT(sql_db_cache_module, &sql_db_module_register);
+static MODULE_CONTEXT_DEFINE_INIT(sql_db_cache_module_legacy,
+                                 &sql_db_module_register);
 
 static void sql_db_cache_db_unref(struct sql_db *db)
 {
@@ -94,9 +95,9 @@ static void sql_db_cache_drop_oldest(struct sql_db_cache *cache)
                sql_db_cache_free_tail(cache);
 }
 
-int sql_db_cache_new(struct sql_db_cache *cache,
-                    const struct sql_legacy_settings *set,
-                    struct sql_db **db_r, const char **error_r)
+int sql_db_cache_new_legacy(struct sql_db_cache *cache,
+                           const struct sql_legacy_settings *set,
+                           struct sql_db **db_r, const char **error_r)
 {
        struct sql_db_cache_context *ctx;
        struct sql_db *db;
@@ -125,7 +126,7 @@ int sql_db_cache_new(struct sql_db_cache *cache,
                ctx->orig_deinit = db->v.deinit;
                db->v.unref = sql_db_cache_db_unref;
 
-               MODULE_CONTEXT_SET(db, sql_db_cache_module, ctx);
+               MODULE_CONTEXT_SET(db, sql_db_cache_module_legacy, ctx);
                hash_table_insert(cache->dbs, ctx->key, db);
        }
 
@@ -135,7 +136,8 @@ int sql_db_cache_new(struct sql_db_cache *cache,
        return 0;
 }
 
-struct sql_db_cache *sql_db_cache_init(unsigned int max_unused_connections)
+struct sql_db_cache *
+sql_db_cache_init_legacy(unsigned int max_unused_connections)
 {
        struct sql_db_cache *cache;
 
@@ -145,7 +147,7 @@ struct sql_db_cache *sql_db_cache_init(unsigned int max_unused_connections)
        return cache;
 }
 
-void sql_db_cache_deinit(struct sql_db_cache **_cache)
+void sql_db_cache_deinit_legacy(struct sql_db_cache **_cache)
 {
        struct sql_db_cache *cache = *_cache;
 

diff --git a/src/lib-sql/sql-db-cache-legacy.h b/src/lib-sql/sql-db-cache-legacy.h
new file mode 100644 (file)
index 0000000..e741c0c
--- /dev/null
+++ b/src/lib-sql/sql-db-cache-legacy.h
@@ -0,0 +1,15 @@
+#ifndef SQL_DB_CACHE_LEGACY_H
+#define SQL_DB_CACHE_LEGACY_H
+
+struct sql_db_cache;
+
+/* Like sql_init(), but use a connection pool. */
+int sql_db_cache_new_legacy(struct sql_db_cache *cache,
+                           const struct sql_legacy_settings *set,
+                           struct sql_db **db_r, const char **error_r);
+
+struct sql_db_cache *
+sql_db_cache_init_legacy(unsigned int max_unused_connections);
+void sql_db_cache_deinit_legacy(struct sql_db_cache **cache);
+
+#endif

diff --git a/src/lib-sql/sql-db-cache.h b/src/lib-sql/sql-db-cache.h
deleted file mode 100644 (file)
index 9cdea73..0000000
--- a/src/lib-sql/sql-db-cache.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef SQL_DB_CACHE_H
-#define SQL_DB_CACHE_H
-
-struct sql_db_cache;
-
-/* Like sql_init(), but use a connection pool. */
-int sql_db_cache_new(struct sql_db_cache *cache,
-                    const struct sql_legacy_settings *set,
-                     struct sql_db **db_r, const char **error_r);
-
-struct sql_db_cache *sql_db_cache_init(unsigned int max_unused_connections);
-void sql_db_cache_deinit(struct sql_db_cache **cache);
-
-#endif