Move CompatUtility::GetCheckableInCheckPeriod() into Livestatus feature

[icinga2] / lib / livestatus / table.hpp

diff --git a/lib/livestatus/table.hpp b/lib/livestatus/table.hpp
index fb348e18c8bb42be79211639b9d0e538a759c7fe..5a3094e05e83423b395fac4a38e7c4e2bf674952 100644 (file)
--- a/lib/livestatus/table.hpp
+++ b/lib/livestatus/table.hpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2015 Icinga Development Team (http://www.icinga.org)    *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
@@ -23,12 +23,19 @@
 #include "livestatus/column.hpp"
 #include "base/object.hpp"
 #include "base/dictionary.hpp"
+#include "base/array.hpp"
 #include <vector>
 
 namespace icinga
 {
 
-typedef boost::function<void (const Value&)> AddRowFunction;
+struct LivestatusRowValue {
+       Value Row;
+       LivestatusGroupByType GroupByType;
+       Value GroupByObject;
+};
+
+typedef std::function<bool (const Value&, LivestatusGroupByType, const Object::Ptr&)> AddRowFunction;
 
 class Filter;
 
@@ -42,17 +49,19 @@ public:
 
        static Table::Ptr GetByName(const String& name, const String& compat_log_path = "", const unsigned long& from = 0, const unsigned long& until = 0);
 
-       virtual String GetName(void) const = 0;
-       virtual String GetPrefix(void) const = 0;
+       virtual String GetName() const = 0;
+       virtual String GetPrefix() const = 0;
 
-       std::vector<Value> FilterRows(const intrusive_ptr<Filter>& filter);
+       std::vector<LivestatusRowValue> FilterRows(const intrusive_ptr<Filter>& filter, int limit = -1);
 
        void AddColumn(const String& name, const Column& column);
        Column GetColumn(const String& name) const;
-       std::vector<String> GetColumnNames(void) const;
+       std::vector<String> GetColumnNames() const;
+
+       LivestatusGroupByType GetGroupByType() const;
 
 protected:
-       Table(void);
+       Table(LivestatusGroupByType type = LivestatusGroupByNone);
 
        virtual void FetchRows(const AddRowFunction& addRowFn) = 0;
 
@@ -62,10 +71,13 @@ protected:
        static Value EmptyArrayAccessor(const Value&);
        static Value EmptyDictionaryAccessor(const Value&);
 
+       LivestatusGroupByType m_GroupByType;
+       Value m_GroupByObject;
+
 private:
        std::map<String, Column> m_Columns;
 
-       void FilteredAddRow(std::vector<Value>& rs, const intrusive_ptr<Filter>& filter, const Value& row);
+       bool FilteredAddRow(std::vector<LivestatusRowValue>& rs, const intrusive_ptr<Filter>& filter, int limit, const Value& row, LivestatusGroupByType groupByType, const Object::Ptr& groupByObject);
 };
 
 }