.......... [DEV-2135] refactored dbcache part 1

36 files changed, 117 insertions, 57 deletions

diff --git a/tests/libs/zbxalgo/Makefile.am b/tests/libs/zbxalgo/Makefile.am
index 36a097d3a29..89d686c5a0d 100644
--- a/tests/libs/zbxalgo/Makefile.am
+++ b/tests/libs/zbxalgo/Makefile.am
@@ -36,7 +36,12 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxshmem/libzbxshmem.a \
 	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
 	$(top_srcdir)/src/libs/zbxself/libzbxself.a \
diff --git a/tests/libs/zbxcommon/Makefile.am b/tests/libs/zbxcommon/Makefile.am
index f04f6402e18..eedff6448a9 100644
--- a/tests/libs/zbxcommon/Makefile.am
+++ b/tests/libs/zbxcommon/Makefile.am
@@ -65,7 +65,9 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/alias/libalias.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxshmem/libzbxshmem.a \
 	$(top_srcdir)/src/libs/zbxself/libzbxself.a \
 	$(top_srcdir)/src/libs/zbxmedia/libzbxmedia.a \
diff --git a/tests/libs/zbxconf/Makefile.am b/tests/libs/zbxconf/Makefile.am
index 15ae5520e3e..b7fbab632a8 100644
--- a/tests/libs/zbxconf/Makefile.am
+++ b/tests/libs/zbxconf/Makefile.am
@@ -29,7 +29,9 @@ parse_cfg_file_LDADD = \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxhistory/libzbxhistory.a \
 	$(top_srcdir)/src/libs/zbxshmem/libzbxshmem.a \
 	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
diff --git a/tests/libs/zbxdbcache/Makefile.am b/tests/libs/zbxdbcache/Makefile.am
index 1a9dba5bf9f..2aab76024ec 100644
--- a/tests/libs/zbxdbcache/Makefile.am
+++ b/tests/libs/zbxdbcache/Makefile.am
@@ -49,7 +49,9 @@ VALUECACHE_LIBS = \
 	$(top_srcdir)/tests/libzbxmockdata.a
 
 CACHE_LIBS = \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxavailability/libzbxavailability.a \
 	$(top_srcdir)/src/zabbix_server/availability/libavailability.a \
 	$(top_srcdir)/src/libs/zbxipcservice/libzbxipcservice.a \
@@ -105,7 +107,9 @@ CACHE_LIBS = \
 	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
 	$(top_srcdir)/src/libs/zbxstr/libzbxstr.a \
 	$(top_srcdir)/src/libs/zbxnum/libzbxnum.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
 	$(top_srcdir)/tests/libzbxmocktest.a \
 	$(top_srcdir)/tests/libzbxmockdata.a
@@ -130,7 +134,7 @@ COMMON_WRAP_FUNCS = \
 zbx_vc_get_values_SOURCES = \
 	zbx_vc_common.c \
 	zbx_vc_get_values.c \
-	@top_srcdir@/src/libs/zbxdbcache/valuecache.c \
+	@top_srcdir@/src/libs/zbxcachevalue/valuecache.c \
 	@top_srcdir@/src/libs/zbxhistory/history.c \
 	../../zbxmocktest.h
 
@@ -139,14 +143,16 @@ zbx_vc_get_values_LDFLAGS = @SERVER_LDFLAGS@ $(COMMON_WRAP_FUNCS)
 
 zbx_vc_get_values_CFLAGS = \
 	-I@top_srcdir@/src/libs/zbxalgo \
-	-I@top_srcdir@/src/libs/zbxdbcache \
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue \
 	-I@top_srcdir@/src/libs/zbxhistory \
 	-I@top_srcdir@/tests
 
 zbx_vc_add_values_SOURCES = \
 	zbx_vc_common.c \
 	zbx_vc_add_values.c \
-	@top_srcdir@/src/libs/zbxdbcache/valuecache.c \
+	@top_srcdir@/src/libs/zbxcachevalue/valuecache.c \
 	@top_srcdir@/src/libs/zbxhistory/history.c \
 	../../zbxmocktest.h
 
@@ -155,14 +161,16 @@ zbx_vc_add_values_LDFLAGS = @SERVER_LDFLAGS@ $(COMMON_WRAP_FUNCS)
 
 zbx_vc_add_values_CFLAGS = \
 	-I@top_srcdir@/src/libs/zbxalgo \
-	-I@top_srcdir@/src/libs/zbxdbcache \
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue \
 	-I@top_srcdir@/src/libs/zbxhistory \
 	-I@top_srcdir@/tests
 
 zbx_vc_get_value_SOURCES = \
 	zbx_vc_common.c \
 	zbx_vc_get_value.c \
-	@top_srcdir@/src/libs/zbxdbcache/valuecache.c \
+	@top_srcdir@/src/libs/zbxcachevalue/valuecache.c \
 	@top_srcdir@/src/libs/zbxhistory/history.c \
 	../../zbxmocktest.h
 
@@ -171,16 +179,22 @@ zbx_vc_get_value_LDFLAGS = @SERVER_LDFLAGS@ $(COMMON_WRAP_FUNCS)
 
 zbx_vc_get_value_CFLAGS = \
 	-I@top_srcdir@/src/libs/zbxalgo \
-	-I@top_srcdir@/src/libs/zbxdbcache \
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue \
 	-I@top_srcdir@/src/libs/zbxhistory \
 	-I@top_srcdir@/tests
 
 dc_maintenance_match_tags_CFLAGS = \
-	-I@top_srcdir@/src/libs/zbxdbcache \
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue \
 	-I@top_srcdir@/tests
 
 dc_check_maintenance_period_CFLAGS = \
-	-I@top_srcdir@/src/libs/zbxdbcache \
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue \
 	-I@top_srcdir@/tests
 
 dc_maintenance_match_tags_SOURCES = dc_maintenance_match_tags.c
@@ -199,12 +213,16 @@ is_item_processed_by_server_CFLAGS = -I@top_srcdir@/tests
 dc_item_poller_type_update_SOURCES = dc_item_poller_type_update.c
 dc_item_poller_type_update_LDADD = $(CACHE_LIBS) @SERVER_LIBS@
 dc_item_poller_type_update_LDFLAGS = @SERVER_LDFLAGS@
-dc_item_poller_type_update_CFLAGS = -I@top_srcdir@/tests -I@top_srcdir@/src/libs/zbxdbcache
+dc_item_poller_type_update_CFLAGS = -I@top_srcdir@/tests -I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory -I@top_srcdir@/src/libs/zbxcachevalue
 
 dc_expand_user_macros_in_func_params_CFLAGS = \
 	-I@top_srcdir@/tests \
 	-I@top_srcdir@/tests/mocks/configcache \
-	-I@top_srcdir@/src/libs/zbxdbcache
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue
+	
 dc_expand_user_macros_in_func_params_SOURCES = \
 	dc_expand_user_macros_in_func_params.c
 dc_expand_user_macros_in_func_params_LDADD = \
diff --git a/tests/libs/zbxdbcache/dc_check_maintenance_period.c b/tests/libs/zbxdbcache/dc_check_maintenance_period.c
index d4259968b70..deee63ddc97 100644
--- a/tests/libs/zbxdbcache/dc_check_maintenance_period.c
+++ b/tests/libs/zbxdbcache/dc_check_maintenance_period.c
@@ -25,7 +25,7 @@
 #include "zbxcommon.h"
 #include "zbxmutexs.h"
 #include "zbxalgo.h"
-#include "dbcache.h"
+#include "zbxcacheconfig.h"
 #include "log.h"
 
 #include "dbconfig.h"
diff --git a/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c b/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c
index ae751ad0d46..82985689eb6 100644
--- a/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c
+++ b/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c
@@ -25,7 +25,7 @@
 #include "zbxserver.h"
 #include "zbxcommon.h"
 #include "zbxalgo.h"
-#include "dbcache.h"
+#include "zbxcacheconfig.h"
 #include "zbxmutexs.h"
 #include "dbconfig.h"
 
diff --git a/tests/libs/zbxdbcache/dc_function_calculate_nextcheck.c b/tests/libs/zbxdbcache/dc_function_calculate_nextcheck.c
index fd59577f016..e8b6a1bb388 100644
--- a/tests/libs/zbxdbcache/dc_function_calculate_nextcheck.c
+++ b/tests/libs/zbxdbcache/dc_function_calculate_nextcheck.c
@@ -26,7 +26,7 @@
 #include "zbxtrends.h"
 #include "log.h"
 #include "zbxdbhigh.h"
-#include "dbcache.h"
+#include "zbxcacheconfig.h"
 
 int	zbx_dc_function_calculate_nextcheck(const zbx_trigger_timer_t *timer, time_t from, zbx_uint64_t seed);
 
diff --git a/tests/libs/zbxdbcache/dc_item_poller_type_update.c b/tests/libs/zbxdbcache/dc_item_poller_type_update.c
index b6bc9869c70..0f9bec82c95 100644
--- a/tests/libs/zbxdbcache/dc_item_poller_type_update.c
+++ b/tests/libs/zbxdbcache/dc_item_poller_type_update.c
@@ -32,7 +32,7 @@
 
 #include "zbxcommon.h"
 #include "zbxmutexs.h"
-#include "dbcache.h"
+#include "zbxcacheconfig.h"
 #include "dbconfig.h"
 #include "dc_item_poller_type_update_test.h"
 
diff --git a/tests/libs/zbxdbcache/dc_maintenance_match_tags.c b/tests/libs/zbxdbcache/dc_maintenance_match_tags.c
index 12815c5e6ca..9bdf9c17b19 100644
--- a/tests/libs/zbxdbcache/dc_maintenance_match_tags.c
+++ b/tests/libs/zbxdbcache/dc_maintenance_match_tags.c
@@ -25,7 +25,7 @@
 #include "zbxcommon.h"
 #include "zbxmutexs.h"
 #include "zbxalgo.h"
-#include "dbcache.h"
+#include "zbxcacheconfig.h"
 #include "dbconfig.h"
 #include "dbconfig_maintenance_test.h"
 
diff --git a/tests/libs/zbxdbcache/is_item_processed_by_server.c b/tests/libs/zbxdbcache/is_item_processed_by_server.c
index 63d912aa57b..e3da647a454 100644
--- a/tests/libs/zbxdbcache/is_item_processed_by_server.c
+++ b/tests/libs/zbxdbcache/is_item_processed_by_server.c
@@ -23,7 +23,7 @@
 #include "zbxmockutil.h"
 
 #include "zbxcommon.h"
-#include "dbcache.h"
+#include "zbxcacheconfig.h"
 
 void	zbx_mock_test_entry(void **state)
 {
diff --git a/tests/libs/zbxdbcache/um_cache_mock.c b/tests/libs/zbxdbcache/um_cache_mock.c
index 6a06a30c852..a1337a3dbeb 100644
--- a/tests/libs/zbxdbcache/um_cache_mock.c
+++ b/tests/libs/zbxdbcache/um_cache_mock.c
@@ -24,8 +24,9 @@
 
 #include "zbxnum.h"
 #include "zbxalgo.h"
-#include "zbxdbcache/user_macro.h"
+#include "zbxcacheconfig/user_macro.h"
 #include "um_cache_mock.h"
+#include "zbxshmem.h"
 
 ZBX_PTR_VECTOR_IMPL(um_mock_macro, zbx_um_mock_macro_t *)
 
diff --git a/tests/libs/zbxdbcache/um_cache_mock.h b/tests/libs/zbxdbcache/um_cache_mock.h
index 588a84361aa..8ce1c585804 100644
--- a/tests/libs/zbxdbcache/um_cache_mock.h
+++ b/tests/libs/zbxdbcache/um_cache_mock.h
@@ -20,8 +20,8 @@
 #ifndef ZABBIX_UM_CACHE_MOCK_H
 #define ZABBIX_UM_CACHE_MOCK_H
 
-#include "zbxdbcache/dbconfig.h"
-#include "zbxdbcache/dbsync.h"
+#include "zbxcacheconfig/dbconfig.h"
+#include "zbxcacheconfig/dbsync.h"
 
 typedef struct
 {
diff --git a/tests/libs/zbxdbcache/um_cache_resolve.c b/tests/libs/zbxdbcache/um_cache_resolve.c
index 5119f718c81..17b5697c2ba 100644
--- a/tests/libs/zbxdbcache/um_cache_resolve.c
+++ b/tests/libs/zbxdbcache/um_cache_resolve.c
@@ -23,7 +23,7 @@
 #include "zbxmockutil.h"
 
 #include "zbxnum.h"
-#include "zbxdbcache/user_macro.h"
+#include "zbxcacheconfig/user_macro.h"
 #include "um_cache_mock.h"
 
 static void	mock_get_hostids(zbx_vector_uint64_t *hostids, zbx_mock_handle_t handle)
diff --git a/tests/libs/zbxdbcache/um_cache_resolve_cont.c b/tests/libs/zbxdbcache/um_cache_resolve_cont.c
index fbf9c8152dc..bccc3ad6421 100644
--- a/tests/libs/zbxdbcache/um_cache_resolve_cont.c
+++ b/tests/libs/zbxdbcache/um_cache_resolve_cont.c
@@ -24,7 +24,7 @@
 
 #include "zbxcommon.h"
 #include "zbxjson.h"
-#include "zbxdbcache/user_macro.h"
+#include "zbxcacheconfig/user_macro.h"
 #include "zbxalgo.h"
 #include "um_cache_mock.h"
 
diff --git a/tests/libs/zbxdbcache/um_cache_sync.c b/tests/libs/zbxdbcache/um_cache_sync.c
index 54bdec14753..9e6120e4eb8 100644
--- a/tests/libs/zbxdbcache/um_cache_sync.c
+++ b/tests/libs/zbxdbcache/um_cache_sync.c
@@ -23,7 +23,7 @@
 #include "zbxmockutil.h"
 
 #include "zbxcommon.h"
-#include "zbxdbcache/user_macro.h"
+#include "zbxcacheconfig/user_macro.h"
 #include "zbxalgo.h"
 #include "um_cache_mock.h"
 
diff --git a/tests/libs/zbxdbcache/zbx_vc_add_values.c b/tests/libs/zbxdbcache/zbx_vc_add_values.c
index 574efdf2b7f..c4b489e97fe 100644
--- a/tests/libs/zbxdbcache/zbx_vc_add_values.c
+++ b/tests/libs/zbxdbcache/zbx_vc_add_values.c
@@ -23,7 +23,7 @@
 #include "zbxmockutil.h"
 
 #include "zbxcommon.h"
-#include "valuecache.h"
+#include "zbxcachevalue.h"
 #include "valuecache_test.h"
 #include "mocks/valuecache/valuecache_mock.h"
 
diff --git a/tests/libs/zbxdbcache/zbx_vc_common.c b/tests/libs/zbxdbcache/zbx_vc_common.c
index 1dcdc946f48..807f90f243f 100644
--- a/tests/libs/zbxdbcache/zbx_vc_common.c
+++ b/tests/libs/zbxdbcache/zbx_vc_common.c
@@ -25,7 +25,7 @@
 
 #include "zbxnum.h"
 #include "zbxmutexs.h"
-#include "valuecache.h"
+#include "zbxcachevalue.h"
 #include "valuecache_test.h"
 #include "mocks/valuecache/valuecache_mock.h"
 
diff --git a/tests/libs/zbxdbcache/zbx_vc_get_value.c b/tests/libs/zbxdbcache/zbx_vc_get_value.c
index fbdd784f588..2bc786c104f 100644
--- a/tests/libs/zbxdbcache/zbx_vc_get_value.c
+++ b/tests/libs/zbxdbcache/zbx_vc_get_value.c
@@ -23,7 +23,7 @@
 #include "zbxmockutil.h"
 
 #include "zbxnum.h"
-#include "valuecache.h"
+#include "zbxcachevalue.h"
 #include "valuecache_test.h"
 #include "mocks/valuecache/valuecache_mock.h"
 
diff --git a/tests/libs/zbxdbcache/zbx_vc_get_values.c b/tests/libs/zbxdbcache/zbx_vc_get_values.c
index 039616df687..b4187f54ccf 100644
--- a/tests/libs/zbxdbcache/zbx_vc_get_values.c
+++ b/tests/libs/zbxdbcache/zbx_vc_get_values.c
@@ -23,7 +23,7 @@
 #include "zbxmockutil.h"
 
 #include "zbxcommon.h"
-#include "valuecache.h"
+#include "zbxcachevalue.h"
 #include "valuecache_test.h"
 #include "mocks/valuecache/valuecache_mock.h"
 
diff --git a/tests/libs/zbxdbhigh/Makefile.am b/tests/libs/zbxdbhigh/Makefile.am
index 74118eb8698..31ea5ed6962 100644
--- a/tests/libs/zbxdbhigh/Makefile.am
+++ b/tests/libs/zbxdbhigh/Makefile.am
@@ -91,7 +91,9 @@ SERVER_COMMON_LIB = \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/alias/libalias.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxeval/libzbxeval.a \
 	$(top_srcdir)/src/libs/zbxserialize/libzbxserialize.a \
 	$(top_srcdir)/src/zabbix_server/availability/libavailability.a \
@@ -135,7 +137,9 @@ if PROXY
 
 PROXY_COMMON_LIB = \
 	$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxeval/libzbxeval.a \
 	$(top_srcdir)/src/libs/zbxserialize/libzbxserialize.a \
 	$(top_srcdir)/src/libs/zbxdbwrap/libzbxdbwrap.a \
diff --git a/tests/libs/zbxeval/Makefile.am b/tests/libs/zbxeval/Makefile.am
index 0cb02059978..022b60697c2 100755
--- a/tests/libs/zbxeval/Makefile.am
+++ b/tests/libs/zbxeval/Makefile.am
@@ -37,7 +37,9 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/zabbix_server/odbc/libzbxodbc.a \
 	$(top_srcdir)/src/zabbix_server/scripts/libzbxscripts.a \
 	$(top_srcdir)/src/zabbix_server/preprocessor/libpreprocessor.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxeval/libzbxeval.a \
 	$(top_srcdir)/src/libs/zbxserialize/libzbxserialize.a \
 	$(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
diff --git a/tests/libs/zbxserver/Makefile.am b/tests/libs/zbxserver/Makefile.am
index 2092a19d445..d6f5c02a45c 100755
--- a/tests/libs/zbxserver/Makefile.am
+++ b/tests/libs/zbxserver/Makefile.am
@@ -35,7 +35,9 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/zabbix_server/scripts/libzbxscripts.a \
 	$(top_srcdir)/src/zabbix_server/preprocessor/libpreprocessor.a \
 	$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
@@ -47,7 +49,9 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxmedia/libzbxmedia.a \
 	$(top_srcdir)/src/libs/zbxdbwrap/libzbxdbwrap.a \
 	$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
@@ -144,7 +148,9 @@ macro_fmttime_LDADD += @SERVER_LIBS@
 macro_fmttime_LDFLAGS = @SERVER_LDFLAGS@ $(VALUECACHE_WRAP_FUNCS)
 
 macro_fmttime_CFLAGS = $(COMMON_COMPILER_FLAGS) \
-	-I@top_srcdir@/src/libs/zbxdbcache \
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue \
 	-I@top_srcdir@/src/libs/zbxserver
 
 evaluate_function_SOURCES = \
@@ -217,22 +223,30 @@ VALUECACHE_WRAP_FUNCS = \
 
 evaluate_function_CFLAGS = $(COMMON_COMPILER_FLAGS) \
 	-I@top_srcdir@/src/libs/zbxalgo \
-	-I@top_srcdir@/src/libs/zbxdbcache \
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue \
 	-I@top_srcdir@/src/libs/zbxhistory
 
 evaluate_stl_CFLAGS = $(COMMON_COMPILER_FLAGS) \
 	-I@top_srcdir@/src/libs/zbxalgo \
-	-I@top_srcdir@/src/libs/zbxdbcache \
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue \
 	-I@top_srcdir@/src/libs/zbxhistory
 
 evaluate_percentage_deviations_in_remainder_CFLAGS = $(COMMON_COMPILER_FLAGS) \
 	-I@top_srcdir@/src/libs/zbxalgo \
-	-I@top_srcdir@/src/libs/zbxdbcache \
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue \
 	-I@top_srcdir@/src/libs/zbxhistory
 
 valuemaps_CFLAGS = $(COMMON_COMPILER_FLAGS) \
 	-I@top_srcdir@/src/libs/zbxalgo \
-	-I@top_srcdir@/src/libs/zbxdbcache \
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue \
 	-I@top_srcdir@/src/libs/zbxhistory
 endif
 
diff --git a/tests/libs/zbxserver/evaluate_function.c b/tests/libs/zbxserver/evaluate_function.c
index 21c0a655c8c..2a03937e3cb 100644
--- a/tests/libs/zbxserver/evaluate_function.c
+++ b/tests/libs/zbxserver/evaluate_function.c
@@ -22,7 +22,7 @@
 #include "zbxmockassert.h"
 #include "zbxmockutil.h"
 
-#include "valuecache.h"
+#include "zbxcachevalue.h"
 #include "zbxserver.h"
 #include "../../src/libs/zbxserver/evalfunc.h"
 
diff --git a/tests/libs/zbxserver/evaluate_percentage_deviations_in_remainder.c b/tests/libs/zbxserver/evaluate_percentage_deviations_in_remainder.c
index 8c962bc1964..a2e80741332 100644
--- a/tests/libs/zbxserver/evaluate_percentage_deviations_in_remainder.c
+++ b/tests/libs/zbxserver/evaluate_percentage_deviations_in_remainder.c
@@ -22,7 +22,7 @@
 #include "zbxmockassert.h"
 #include "zbxmockutil.h"
 
-#include "valuecache.h"
+#include "zbxcachevalue.h"
 #include "zbxserver.h"
 #include "zbxtrends.h"
 #include "zbxparam.h"
diff --git a/tests/libs/zbxserver/evaluate_stl.c b/tests/libs/zbxserver/evaluate_stl.c
index 8ed26dc5805..d90d97545e5 100644
--- a/tests/libs/zbxserver/evaluate_stl.c
+++ b/tests/libs/zbxserver/evaluate_stl.c
@@ -23,7 +23,7 @@
 #include "zbxmockutil.h"
 
 #include "zbxserver.h"
-#include "valuecache.h"
+#include "zbxcachevalue.h"
 #include "mocks/valuecache/valuecache_mock.h"
 #include "../../../src/libs/zbxserver/anomalystl.h"
 
diff --git a/tests/libs/zbxserver/macro_fmttime.c b/tests/libs/zbxserver/macro_fmttime.c
index 651472c6b77..b92ca15064b 100644
--- a/tests/libs/zbxserver/macro_fmttime.c
+++ b/tests/libs/zbxserver/macro_fmttime.c
@@ -26,7 +26,7 @@
 #include "macrofunc.h"
 #include "log.h"
 #include "zbxexpr.h"
-#include "valuecache.h"
+#include "zbxcachevalue.h"
 #include "mocks/valuecache/valuecache_mock.h"
 
 int	__wrap_substitute_simple_macros(zbx_uint64_t *actionid, const ZBX_DB_EVENT *event, const ZBX_DB_EVENT *r_event,
diff --git a/tests/libs/zbxsysinfo/Makefile.am b/tests/libs/zbxsysinfo/Makefile.am
index 720ce4f31ff..84a5e456275 100644
--- a/tests/libs/zbxsysinfo/Makefile.am
+++ b/tests/libs/zbxsysinfo/Makefile.am
@@ -60,7 +60,9 @@ parse_item_key_LDADD = \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/alias/libalias.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxhistory/libzbxhistory.a \
 	$(top_srcdir)/src/libs/zbxshmem/libzbxshmem.a \
 	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
diff --git a/tests/mocks/configcache/Makefile.am b/tests/mocks/configcache/Makefile.am
index 4bab279c50a..d4592463723 100644
--- a/tests/mocks/configcache/Makefile.am
+++ b/tests/mocks/configcache/Makefile.am
@@ -8,5 +8,7 @@ libconfigcachemock_a_SOURCES = \
 
 libconfigcachemock_a_CFLAGS = \
 	-I@top_srcdir@/src/libs/zbxalgo \
-	-I@top_srcdir@/src/libs/zbxdbcache \
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue \
 	-I@top_srcdir@/tests
diff --git a/tests/mocks/configcache/hosts.c b/tests/mocks/configcache/hosts.c
index f44ba9f9dcb..7ff4a59dc1c 100644
--- a/tests/mocks/configcache/hosts.c
+++ b/tests/mocks/configcache/hosts.c
@@ -25,7 +25,7 @@
 #include "zbxserver.h"
 #include "zbxcommon.h"
 #include "zbxalgo.h"
-#include "dbcache.h"
+#include "zbxcacheconfig.h"
 #include "zbxmutexs.h"
 #include "dbconfig.h"
 #include "configcache.h"
diff --git a/tests/mocks/valuecache/Makefile.am b/tests/mocks/valuecache/Makefile.am
index ea19d055a20..9a25aca30d0 100644
--- a/tests/mocks/valuecache/Makefile.am
+++ b/tests/mocks/valuecache/Makefile.am
@@ -6,6 +6,8 @@ libvaluecachemock_a_SOURCES = \
 
 libvaluecachemock_a_CFLAGS = \
 	-I@top_srcdir@/src/libs/zbxalgo \
-	-I@top_srcdir@/src/libs/zbxdbcache \
+	-I@top_srcdir@/src/libs/zbxcacheconfig \
+	-I@top_srcdir@/src/libs/zbxcachehistory \
+	-I@top_srcdir@/src/libs/zbxcachevalue \
 	-I@top_srcdir@/src/libs/zbxhistory \
 	-I@top_srcdir@/tests
diff --git a/tests/mocks/valuecache/valuecache_mock.c b/tests/mocks/valuecache/valuecache_mock.c
index c3b3ad4f5d7..cc0abaf11c1 100644
--- a/tests/mocks/valuecache/valuecache_mock.c
+++ b/tests/mocks/valuecache/valuecache_mock.c
@@ -22,7 +22,7 @@
 #include "zbxmockutil.h"
 #include "valuecache_mock.h"
 
-#include "valuecache.h"
+#include "zbxcachevalue.h"
 #include "zbxnum.h"
 #include "log.h"
 #include "zbxmutexs.h"
@@ -30,7 +30,7 @@
 #include "zbxalgo.h"
 #include "zbxhistory.h"
 #include "history.h"
-#include "dbcache.h"
+#include "zbxcacheconfig.h"
 
 #include <setjmp.h>
 #include <cmocka.h>
diff --git a/tests/zabbix_server/pinger/Makefile.am b/tests/zabbix_server/pinger/Makefile.am
index 3f8f1945438..6e93b9aa8bd 100644
--- a/tests/zabbix_server/pinger/Makefile.am
+++ b/tests/zabbix_server/pinger/Makefile.am
@@ -9,7 +9,9 @@ COMMON_SRC_FILES = \
 PINGER_LIBS = \
 	$(top_srcdir)/tests/libzbxmocktest.a \
 	$(top_srcdir)/tests/libzbxmockdata.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
 	$(top_srcdir)/src/libs/zbxdb/libzbxdb.a \
 	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
@@ -53,7 +55,9 @@ PINGER_LIBS = \
 	$(top_srcdir)/src/libs/zbxhashicorp/libzbxhashicorp.a \
 	$(top_srcdir)/src/libs/zbxserialize/libzbxserialize.a \
 	$(top_srcdir)/src/libs/zbxdbwrap/libzbxdbwrap.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
 	$(top_srcdir)/src/libs/zbxservice/libzbxservice.a \
 	$(top_srcdir)/src/libs/zbxaudit/libzbxaudit.a \
diff --git a/tests/zabbix_server/poller/test_get_value_ssh.h b/tests/zabbix_server/poller/test_get_value_ssh.h
index 45f1f9d2d25..a9f9f44a36a 100644
--- a/tests/zabbix_server/poller/test_get_value_ssh.h
+++ b/tests/zabbix_server/poller/test_get_value_ssh.h
@@ -20,7 +20,7 @@
 #ifndef POLLER_GET_VALUE_SSH_TEST_H
 #define POLLER_GET_VALUE_SSH_TEST_H
 
-#include "dbcache.h"
+#include "zbxcacheconfig.h"
 
 #if defined(HAVE_SSH2) || defined(HAVE_SSH)
 int	zbx_get_value_ssh_test_run(DC_ITEM *item, char **error);
diff --git a/tests/zabbix_server/poller/test_get_value_telnet.h b/tests/zabbix_server/poller/test_get_value_telnet.h
index adb776a2c88..cfc6b039a34 100644
--- a/tests/zabbix_server/poller/test_get_value_telnet.h
+++ b/tests/zabbix_server/poller/test_get_value_telnet.h
@@ -20,7 +20,7 @@
 #ifndef POLLER_GET_VALUE_TELNET_TEST_H
 #define POLLER_GET_VALUE_TELNET_TEST_H
 
-#include "dbcache.h"
+#include "zbxcacheconfig.h"
 
 int	zbx_get_value_telnet_test_run(DC_ITEM *item, char **error);
 
diff --git a/tests/zabbix_server/preprocessor/zbx_item_preproc.c b/tests/zabbix_server/preprocessor/zbx_item_preproc.c
index d4936fae54b..7885c7d1a8d 100644
--- a/tests/zabbix_server/preprocessor/zbx_item_preproc.c
+++ b/tests/zabbix_server/preprocessor/zbx_item_preproc.c
@@ -24,7 +24,7 @@
 
 #include "zbxcommon.h"
 #include "zbxjson.h"
-#include "dbcache.h"
+#include "zbxcacheconfig.h"
 #include "zbxembed.h"
 #include "log.h"
 
diff --git a/tests/zabbix_server/service/Makefile.am b/tests/zabbix_server/service/Makefile.am
index 5847747c6d9..ee6d58ece9c 100644
--- a/tests/zabbix_server/service/Makefile.am
+++ b/tests/zabbix_server/service/Makefile.am
@@ -14,7 +14,9 @@ COMMON_SRC_FILES = \
 COMMON_LIBS = \
 	$(top_srcdir)/tests/libzbxmocktest.a \
 	$(top_srcdir)/src/zabbix_server/service/libservice.a \
-	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxcacheconfig/libzbxcacheconfig.a \
+	$(top_srcdir)/src/libs/zbxcachehistory/libzbxcachehistory.a \
+	$(top_srcdir)/src/libs/zbxcachevalue/libzbxcachevalue.a \
 	$(top_srcdir)/src/libs/zbxavailability/libzbxavailability.a \
 	$(top_srcdir)/src/zabbix_server/availability/libavailability.a \
 	$(top_srcdir)/src/libs/zbxipcservice/libzbxipcservice.a \