Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
dcdb
dcdb
Commits
bff42db0
Commit
bff42db0
authored
Nov 12, 2021
by
Michael Ott
Browse files
Initialize QueryEngine in CollectAgent, minor fixes for compilation issues.
parent
0fb2250a
Changes
4
Hide whitespace changes
Inline
Side-by-side
analytics/Makefile
View file @
bff42db0
...
...
@@ -40,7 +40,6 @@ install: install_operator
@
echo
" > make install_conf"
operators/%.o
:
CXXFLAGS+= $(PLUGINFLAGS)
../common/src/sensornavigator.o
:
CXXFLAGS+= $(PLUGINFLAGS)
libdcdboperator_aggregator.$(LIBEXT)
:
operators/aggregator/AggregatorOperator.o operators/aggregator/AggregatorConfigurator.o
$(CXX)
$(LIBFLAGS)$@
-o
$@
$^
-L
$(DCDBDEPLOYPATH)
/lib/
-lboost_log
-lboost_system
-lboost_regex
...
...
analytics/operators/clustering/ClusteringConfigurator.cpp
View file @
bff42db0
...
...
@@ -83,7 +83,7 @@ bool ClusteringConfigurator::readUnits(ClusteringOperator& op, std::vector<Clust
}
shared_ptr
<
UnitTemplate
<
ClusteringSensorBase
>>
un
=
nullptr
;
try
{
un
=
_unitGen
.
generateHierarchicalUnit
(
S
ensorNavigator
::
rootKey
,
std
::
list
<
std
::
string
>
(),
protoGlobalOutputs
,
protoInputs
,
un
=
_unitGen
.
generateHierarchicalUnit
(
_s
ensorNavigator
->
rootKey
,
std
::
list
<
std
::
string
>
(),
protoGlobalOutputs
,
protoInputs
,
protoOutputs
,
inputMode
,
op
.
getMqttPart
(),
!
op
.
getStreaming
(),
op
.
getEnforceTopics
(),
op
.
getRelaxed
());
}
catch
(
const
std
::
exception
&
e
)
{
...
...
collectagent/analyticscontroller.cpp
View file @
bff42db0
...
...
@@ -27,6 +27,8 @@
#include
"analyticscontroller.h"
SensorNavigator
*
_sensorNavigator
;
void
AnalyticsController
::
start
()
{
_keepRunning
=
true
;
_readingCtr
=
0
;
...
...
collectagent/collectagent.cpp
View file @
bff42db0
...
...
@@ -772,9 +772,7 @@ int main(int argc, char* const argv[]) {
boost
::
asio
::
io_context
io
;
boost
::
thread_group
threads
;
analyticsController
=
new
AnalyticsController
(
mySensorConfig
,
mySensorDataStore
,
io
);
analyticsController
->
setCache
(
&
mySensorCache
);
analyticsController
->
setMetadataStore
(
metadataStore
);
_queryEngine
=
new
QueryEngine
;
_queryEngine
->
setFilter
(
analyticsSettings
.
filter
);
_queryEngine
->
setJobFilter
(
analyticsSettings
.
jobFilter
);
_queryEngine
->
setJobMatch
(
analyticsSettings
.
jobMatch
);
...
...
@@ -785,6 +783,10 @@ int main(int argc, char* const argv[]) {
_queryEngine
->
setGroupQueryCallback
(
sensorGroupQueryCallback
);
_queryEngine
->
setMetadataQueryCallback
(
metadataQueryCallback
);
_queryEngine
->
setJobQueryCallback
(
jobQueryCallback
);
analyticsController
=
new
AnalyticsController
(
mySensorConfig
,
mySensorDataStore
,
io
);
analyticsController
->
setCache
(
&
mySensorCache
);
analyticsController
->
setMetadataStore
(
metadataStore
);
if
(
!
analyticsController
->
initialize
(
settings
))
return
EXIT_FAILURE
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment