Analytics: switching to group queries for Aggregator plugins

analytics/operators/aggregator/AggregatorOperator.cpp

@@ -47,20 +47,18 @@ void AggregatorOperator::printConfig(LOG_LEVEL ll) {
 }
 
 void AggregatorOperator::compute(U_Ptr unit) {
-    // Clearing the buffer
-    _buffer.clear();
-    size_t elCtr=0;
     uint64_t startTs=0, endTs=0, now=getTimestamp();
     startTs = _relative ? _window : now - _window;
     endTs   = _relative ? 0 : now;
+    // Clearing the buffer
+    _buffer.clear();
+    std::vector<std::string> sensorNames;
     for(const auto& in : unit->getInputs()) {
-        // Getting the most recent values as specified in _window
-        // Since we do not clear the internal buffer, all sensor readings will be accumulated in the same vector
-        elCtr = _buffer.size();
-        if(!_queryEngine.querySensor(in->getName(), startTs, endTs, _buffer, _relative) || _buffer.size()<=elCtr) {
-            LOG(debug) << "Operator " + _name + ": cannot read from sensor " + in->getName() + "!";
-            return;
-        }
+        sensorNames.push_back(in->getName());
+    }
+    if(!_queryEngine.querySensor(sensorNames, startTs, endTs, _buffer, _relative)) {
+        LOG(debug) << "Operator " + _name + ": cannot read from any sensor for unit " + unit->getName() + "!";
+        return;
     }
     compute_internal(unit, _buffer);
 }

analytics/operators/aggregator/JobAggregatorOperator.cpp

@@ -37,24 +37,22 @@ JobAggregatorOperator::JobAggregatorOperator(const JobAggregatorOperator& other)
 JobAggregatorOperator::~JobAggregatorOperator() {}
 
 void JobAggregatorOperator::compute(U_Ptr unit, qeJobData& jobData) {
-    // Clearing the buffer
-    _buffer.clear();
-    size_t elCtr=0;
     uint64_t now = getTimestamp();
     // Making sure that the aggregation boundaries do not go past the job start/end time
     uint64_t jobEnd   = jobData.endTime!=0 && now > jobData.endTime ? jobData.endTime : now;
     uint64_t jobStart = jobEnd-_window < jobData.startTime ? jobData.startTime : jobEnd-_window;
+    // Clearing the buffer
+    _buffer.clear();
+    std::vector<std::string> sensorNames;
     // Job units are hierarchical, and thus we iterate over all sub-units associated to each single node
     for(const auto& subUnit : unit->getSubUnits()) {
-        // Getting the most recent values as specified in _window
-        // Since we do not clear the internal buffer, all sensor readings will be accumulated in the same vector
-        for(const auto& in : subUnit->getInputs()) {
-            elCtr = _buffer.size();
-            if (!_queryEngine.querySensor(in->getName(), jobStart, jobEnd, _buffer, false) || _buffer.size() <= elCtr) {
-                LOG(debug) << "Job Operator " << _name << " cannot read from sensor " << in->getName() << "!";
-                return;
-            }
+        for (const auto &in : subUnit->getInputs()) {
+            sensorNames.push_back(in->getName());
         }
     }
+    if (!_queryEngine.querySensor(sensorNames, jobStart, jobEnd, _buffer, false)) {
+        LOG(debug) << "Job Operator " << _name << ": cannot read from any sensor for unit " + unit->getName() + "!";
+        return;
+    }
     compute_internal(unit, _buffer);
 }
\ No newline at end of file