Merging upstream version 1.36.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 1 deletions

diff --git a/database/engine/rrdengine.h b/database/engine/rrdengine.h
index c6f89a37..4b383b62 100644
--- a/database/engine/rrdengine.h
+++ b/database/engine/rrdengine.h
@@ -26,6 +26,8 @@
 
 #endif /* NETDATA_RRD_INTERNALS */
 
+extern unsigned rrdeng_pages_per_extent;
+
 /* Forward declarations */
 struct rrdengine_instance;
 
@@ -35,7 +37,8 @@ struct rrdengine_instance;
 #define RRDENG_FILE_NUMBER_PRINT_TMPL "%1.1u-%10.10u"
 
 struct rrdeng_collect_handle {
-    struct rrdeng_page_descr *descr, *prev_descr;
+    struct rrdeng_metric_handle *metric_handle;
+    struct rrdeng_page_descr *descr;
     unsigned long page_correlation_id;
     struct rrdengine_instance *ctx;
     // set to 1 when this dimension is not page aligned with the other dimensions in the chart
@@ -43,6 +46,7 @@ struct rrdeng_collect_handle {
 };
 
 struct rrdeng_query_handle {
+    struct rrdeng_metric_handle *metric_handle;
     struct rrdeng_page_descr *descr;
     struct rrdengine_instance *ctx;
     struct pg_cache_page_index *page_index;
@@ -50,6 +54,7 @@ struct rrdeng_query_handle {
     time_t now;
     unsigned position;
     unsigned entries;
+    TIER_QUERY_FETCH tier_query_fetch_type;
     storage_number *page;
     usec_t page_end_time;
     uint32_t page_length;
@@ -239,12 +244,14 @@ struct rrdengine_instance {
     char machine_guid[GUID_LEN + 1]; /* the unique ID of the corresponding host, or localhost for multihost DB */
     uint64_t disk_space;
     uint64_t max_disk_space;
+    int tier;
     unsigned last_fileno; /* newest index of datafile and journalfile */
     unsigned long max_cache_pages;
     unsigned long cache_pages_low_watermark;
     unsigned long metric_API_max_producers;
 
     uint8_t quiesce; /* set to SET_QUIESCE before shutdown of the engine */
+    uint8_t page_type; /* Default page type for this context */
 
     struct rrdengine_statistics stats;
 };