diff options
Diffstat (limited to 'src/libs/zbxserver/expression.c')
| -rw-r--r-- | src/libs/zbxserver/expression.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c index 7156646809f..a1a61bb9628 100644 --- a/src/libs/zbxserver/expression.c +++ b/src/libs/zbxserver/expression.c @@ -25,7 +25,8 @@ #include "zbxregexp.h" #include "zbxvariant.h" #include "zbxeval.h" -#include "valuecache.h" +#include "zbxdbwrap.h" +#include "zbxcachevalue.h" #include "macrofunc.h" #include "zbxxml.h" #include "zbxstr.h" @@ -5090,7 +5091,6 @@ void zbx_determine_items_in_expressions(zbx_vector_ptr_t *trigger_order, const z zbx_vector_uint64_create(&itemids_sorted); zbx_vector_uint64_append_array(&itemids_sorted, itemids, item_num); - zbx_vector_uint64_sort(&itemids_sorted, ZBX_DEFAULT_UINT64_COMPARE_FUNC); zbx_vector_ptr_create(&triggers_func_pos); zbx_vector_ptr_reserve(&triggers_func_pos, trigger_order->values_num); @@ -5303,7 +5303,7 @@ static void zbx_evaluate_item_functions(zbx_hashset_t *funcs, const zbx_vector_u zbx_vector_uint64_uniq(&itemids, ZBX_DEFAULT_UINT64_COMPARE_FUNC); *items_num = itemids.values_num; - *items = (DC_ITEM *)zbx_malloc(NULL, sizeof(DC_ITEM) * (size_t)itemids.values_num); + *items = (DC_ITEM *)zbx_calloc(NULL, 1, sizeof(DC_ITEM) * (size_t)itemids.values_num); *items_err = (int *)zbx_malloc(NULL, sizeof(int) * (size_t)itemids.values_num); DCconfig_get_items_by_itemids_partial(*items, itemids.values, *items_err, itemids.values_num, |