Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
dcdb
dcdb
Commits
e9f50eaf
Commit
e9f50eaf
authored
Sep 02, 2019
by
Carla Guillen Carias
Browse files
Merge branch 'development' of
https://gitlab.lrz.de/dcdb/dcdb
into development
parents
014b619f
91359c50
Changes
2
Hide whitespace changes
Inline
Side-by-side
analytics/includes/UnitGenerator.h
View file @
e9f50eaf
...
...
@@ -35,6 +35,7 @@
#include
"sensornavigator.h"
#include
"UnitTemplate.h"
#include
"mqttchecker.h"
#include
"logging.h"
using
namespace
std
;
...
...
@@ -215,12 +216,15 @@ public:
try
{
unitObjects
->
push_back
(
_generateUnit
(
u
,
inputs
,
outputs
,
inputMode
,
mqttPrefix
,
relaxed
));
}
catch
(
const
exception
&
e
)
{
delete
units
;
delete
unitObjects
;
throw
;
//delete units;
//delete unitObjects;
//throw;
LOG
(
error
)
<<
e
.
what
();
LOG
(
error
)
<<
"UnitGenerator: cannot build unit "
<<
u
<<
"!"
;
continue
;
}
}
if
(
ondemand
)
{
shared_ptr
<
UnitTemplate
<
SBase
>>
unPtr
=
make_shared
<
UnitTemplate
<
SBase
>>
(
SensorNavigator
::
templateKey
,
inputs
,
outputs
);
unPtr
->
setInputMode
(
inputMode
);
...
...
@@ -228,6 +232,11 @@ public:
}
delete
units
;
if
(
unitObjects
->
empty
())
{
delete
unitObjects
;
throw
invalid_argument
(
"UnitGenerator: No units were created!"
);
}
return
unitObjects
;
}
...
...
@@ -442,6 +451,9 @@ protected:
return
unPtr
;
}
// Logger object
boost
::
log
::
sources
::
severity_logger
<
boost
::
log
::
trivial
::
severity_level
>
lg
;
//Internal SensorNavigator object
shared_ptr
<
SensorNavigator
>
_navi
;
...
...
analytics/operators/persystsql/PerSystSqlConfigurator.h
View file @
e9f50eaf
...
...
@@ -43,7 +43,7 @@ private:
void
sensorBase
(
AggregatorSensorBase
&
s
,
CFG_VAL
config
)
override
;
void
operatorAttributes
(
PerSystSqlOperator
&
op
,
CFG_VAL
config
)
override
;
bool
unit
(
UnitTemplate
<
AggregatorSensorBase
>&
u
)
override
;
bool
readUnits
(
PerSystSqlOperator
&
op
,
std
::
vector
<
shared_ptr
<
AggregatorSensorBase
>>&
protoInputs
,
std
::
vector
<
shared_ptr
<
AggregatorSensorBase
>>&
protoOutputs
,
inputMode_t
inputMode
);
bool
readUnits
(
PerSystSqlOperator
&
op
,
std
::
vector
<
shared_ptr
<
AggregatorSensorBase
>>&
protoInputs
,
std
::
vector
<
shared_ptr
<
AggregatorSensorBase
>>&
protoOutputs
,
inputMode_t
inputMode
)
override
;
};
extern
"C"
OperatorConfiguratorInterface
*
create
()
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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