diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-05-19 12:33:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-05-19 12:33:59 +0000 |
| commit | 1ee0c09c5742557e037df5421ca62abddb90ae22 (patch) | |
| tree | 71c0fa48bb6d31d036c9badd7e038527f90d1a73 /database/engine | |
| parent | Releasing debian version 1.30.1-1. (diff) | |
| download | netdata-1ee0c09c5742557e037df5421ca62abddb90ae22.tar.xz netdata-1ee0c09c5742557e037df5421ca62abddb90ae22.zip | |
Merging upstream version 1.31.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'database/engine')
| -rw-r--r-- | database/engine/metadata_log/metadatalog.h | 2 | ||||
| -rw-r--r-- | database/engine/pagecache.c | 2 | ||||
| -rw-r--r-- | database/engine/rrdengine.h | 2 | ||||
| -rwxr-xr-x | database/engine/rrdengineapi.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/database/engine/metadata_log/metadatalog.h b/database/engine/metadata_log/metadatalog.h index b484686d..483036a9 100644 --- a/database/engine/metadata_log/metadatalog.h +++ b/database/engine/metadata_log/metadatalog.h @@ -12,7 +12,7 @@ #include "metadatalogapi.h" #include "compaction.h" -/* Forward declerations */ +/* Forward declarations */ struct metalog_instance; struct parser_user_object; diff --git a/database/engine/pagecache.c b/database/engine/pagecache.c index d7698de0..f17afc22 100644 --- a/database/engine/pagecache.c +++ b/database/engine/pagecache.c @@ -3,7 +3,7 @@ #include "rrdengine.h" -/* Forward declerations */ +/* Forward declarations */ static int pg_cache_try_evict_one_page_unsafe(struct rrdengine_instance *ctx); /* always inserts into tail */ diff --git a/database/engine/rrdengine.h b/database/engine/rrdengine.h index 2d48665f..07cc1479 100644 --- a/database/engine/rrdengine.h +++ b/database/engine/rrdengine.h @@ -26,7 +26,7 @@ #endif /* NETDATA_RRD_INTERNALS */ -/* Forward declerations */ +/* Forward declarations */ struct rrdengine_instance; #define MAX_PAGES_PER_EXTENT (64) /* TODO: can go higher only when journal supports bigger than 4KiB transactions */ diff --git a/database/engine/rrdengineapi.c b/database/engine/rrdengineapi.c index cb46e06e..d847969e 100755 --- a/database/engine/rrdengineapi.c +++ b/database/engine/rrdengineapi.c @@ -32,7 +32,7 @@ void rrdeng_generate_legacy_uuid(const char *dim_id, char *chart_id, uuid_t *ret memcpy(ret_uuid, hash_value, sizeof(uuid_t)); } -/* Transform legacy UUID to be unique across hosts deterministacally */ +/* Transform legacy UUID to be unique across hosts deterministically */ void rrdeng_convert_legacy_uuid_to_multihost(char machine_guid[GUID_LEN + 1], uuid_t *legacy_uuid, uuid_t *ret_uuid) { EVP_MD_CTX *evpctx; @@ -359,7 +359,7 @@ static inline uint32_t *pginfo_to_points(struct rrdeng_page_info *page_info) * reference dimension that that have different data collection intervals and overlap with the time range * [start_time,end_time]. The caller must free (*region_info_arrayp) with freez(). If region_info_arrayp is set * to NULL nothing was allocated. - * @param max_intervalp is derefenced and set to be the largest data collection interval of all regions. + * @param max_intervalp is dereferenced and set to be the largest data collection interval of all regions. * @return number of regions with different data collection intervals. */ unsigned rrdeng_variable_step_boundaries(RRDSET *st, time_t start_time, time_t end_time, |