Skip to content

Commit

Permalink
Merge pull request #717 from FIWARE/troe/attribute-instance-for-sub-a…
Browse files Browse the repository at this point in the history
…ttributes

troe/attribute-instance-for-sub-attributes
  • Loading branch information
kzangeli committed Feb 15, 2021
2 parents 54b9ec4 + 7e9a50b commit 62e9094
Show file tree
Hide file tree
Showing 57 changed files with 239 additions and 239 deletions.
2 changes: 1 addition & 1 deletion src/lib/orionld/troe/pgAttributeTreat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ bool pgAttributeTreat
for (KjNode* subAttrP = attrP->value.firstChildP; subAttrP != NULL; subAttrP = subAttrP->next)
{
LM_TMP(("TEMP: Got a sub-attr: '%s'", subAttrP->name));
if (pgSubAttributeTreat(connectionP, subAttrP, entityId, id) == false)
if (pgSubAttributeTreat(connectionP, subAttrP, entityId, instanceId) == false)
{
LM_E(("Internal Error (pgSubAttributeTreat failed)"));
return false;
Expand Down
10 changes: 5 additions & 5 deletions src/lib/orionld/troe/pgBoolSubPropertyPush.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ bool pgBoolSubPropertyPush
const char* instanceId,
bool boolValue,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* observedAt
)
{
Expand All @@ -56,16 +56,16 @@ bool pgBoolSubPropertyPush
if (observedAt != NULL)
{
snprintf(sql, sizeof(sql), "INSERT INTO subAttributes("
"instanceId, id, entityId, attributeId, ts, observedAt, valueType, boolean) "
"instanceId, id, entityId, attrInstanceId, ts, observedAt, valueType, boolean) "
"VALUES ('%s', '%s', '%s', '%s', '%s', '%s', 'Boolean', %s)",
instanceId, subAttributeName, entityId, attributeId, orionldState.requestTimeString, observedAt, (boolValue == true)? "true" : "false");
instanceId, subAttributeName, entityId, attrInstanceId, orionldState.requestTimeString, observedAt, (boolValue == true)? "true" : "false");
}
else
{
snprintf(sql, sizeof(sql), "INSERT INTO subAttributes("
"instanceId, id, entityId, attributeId, ts, valueType, boolean) "
"instanceId, id, entityId, attrInstanceId, ts, valueType, boolean) "
"VALUES ('%s', '%s', '%s', '%s', '%s', 'Boolean', %s)",
instanceId, subAttributeName, entityId, attributeId, orionldState.requestTimeString, (boolValue == true)? "true" : "false");
instanceId, subAttributeName, entityId, attrInstanceId, orionldState.requestTimeString, (boolValue == true)? "true" : "false");
}
LM_TMP(("SQL[%p]: %s;", connectionP, sql));

Expand Down
2 changes: 1 addition & 1 deletion src/lib/orionld/troe/pgBoolSubPropertyPush.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ extern bool pgBoolSubPropertyPush
const char* instanceId,
bool boolValue,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* observedAt
);

Expand Down
10 changes: 5 additions & 5 deletions src/lib/orionld/troe/pgCompoundSubPropertyPush.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bool pgCompoundSubPropertyPush
const char* instanceId,
KjNode* compoundValueNodeP,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* observedAt
)
{
Expand All @@ -70,16 +70,16 @@ bool pgCompoundSubPropertyPush
if (observedAt != NULL)
{
snprintf(sql, sqlSize, "INSERT INTO subAttributes("
"instanceId, id, entityId, attributeId, ts, observedAt, valueType, compound) "
"instanceId, id, entityId, attrInstanceId, ts, observedAt, valueType, compound) "
"VALUES ('%s', '%s', '%s', '%s', '%s', '%s', 'Compound', '%s')",
instanceId, subAttributeName, entityId, attributeId, orionldState.requestTimeString, observedAt, renderedValue);
instanceId, subAttributeName, entityId, attrInstanceId, orionldState.requestTimeString, observedAt, renderedValue);
}
else
{
snprintf(sql, sqlSize, "INSERT INTO subAttributes("
"instanceId, id, entityId, attributeId, ts, valueType, compound) "
"instanceId, id, entityId, attrInstanceId, ts, valueType, compound) "
"VALUES ('%s', '%s', '%s', '%s', '%s', 'Compound', '%s')",
instanceId, subAttributeName, entityId, attributeId, orionldState.requestTimeString, renderedValue);
instanceId, subAttributeName, entityId, attrInstanceId, orionldState.requestTimeString, renderedValue);
}

LM_TMP(("SQL[%p]: %s;", connectionP, sql));
Expand Down
2 changes: 1 addition & 1 deletion src/lib/orionld/troe/pgCompoundSubPropertyPush.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ extern bool pgCompoundSubPropertyPush
const char* instanceId,
KjNode* compoundValueNodeP,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* observedAt
);

Expand Down
2 changes: 1 addition & 1 deletion src/lib/orionld/troe/pgDatabaseTableCreateAll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ bool pgDatabaseTableCreateAll(PGconn* connectionP)
"instanceId TEXT PRIMARY KEY,"
"id TEXT NOT NULL,"
"entityId TEXT NOT NULL,"
"attributeId TEXT NOT NULL,"
"attrInstanceId TEXT NOT NULL,"
"observedAt TIMESTAMP,"
"unitCode TEXT,"
"valueType ValueType,"
Expand Down
10 changes: 5 additions & 5 deletions src/lib/orionld/troe/pgGeoSubLineStringPush.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bool pgGeoSubLineStringPush
KjNode* coordinatesP,
const char* instanceId,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
)
Expand All @@ -75,16 +75,16 @@ bool pgGeoSubLineStringPush
if (observedAt != NULL)
{
snprintf(sql, sqlSize, "INSERT INTO subAttributes("
"instanceId, ts, id, entityId, attributeId, observedAt, valueType, geoLineString) "
"instanceId, ts, id, entityId, attrInstanceId, observedAt, valueType, geoLineString) "
"VALUES ('%s', '%s', '%s', '%s', '%s', '%s', 'GeoLineString', ST_GeomFromText('LINESTRING(%s)'))",
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attributeId, observedAt, lineStringCoordsString);
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attrInstanceId, observedAt, lineStringCoordsString);
}
else
{
snprintf(sql, sqlSize, "INSERT INTO subAttributes("
"instanceId, ts, id, entityId, attributeId, valueType, geoLineString) "
"instanceId, ts, id, entityId, attrInstanceId, valueType, geoLineString) "
"VALUES ('%s', '%s', '%s', '%s', '%s', 'GeoLineString', ST_GeomFromText('LINESTRING(%s)'))",
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attributeId, lineStringCoordsString);
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attrInstanceId, lineStringCoordsString);
}

LM_TMP(("SQL[%p]: %s;", connectionP, sql));
Expand Down
2 changes: 1 addition & 1 deletion src/lib/orionld/troe/pgGeoSubLineStringPush.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ extern bool pgGeoSubLineStringPush
KjNode* coordinatesP,
const char* instanceId,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
);
Expand Down
10 changes: 5 additions & 5 deletions src/lib/orionld/troe/pgGeoSubMultiLineStringPush.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bool pgGeoSubMultiLineStringPush
KjNode* coordinatesP,
const char* instanceId,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
)
Expand All @@ -75,16 +75,16 @@ bool pgGeoSubMultiLineStringPush
if (observedAt != NULL)
{
snprintf(sql, sqlSize, "INSERT INTO subAttributes("
"instanceId, ts, id, entityId, attributeId, observedAt, valueType, geoMultiLineString) "
"instanceId, ts, id, entityId, attrInstanceId, observedAt, valueType, geoMultiLineString) "
"VALUES ('%s', '%s', '%s', '%s', '%s', '%s', 'GeoMultiLineString', ST_GeomFromText('MULTILINESTRING(%s)'))",
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attributeId, observedAt, coordsString);
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attrInstanceId, observedAt, coordsString);
}
else
{
snprintf(sql, sqlSize, "INSERT INTO subAttributes("
"instanceId, ts, id, entityId, attributeId, valueType, geoMultiLineString) "
"instanceId, ts, id, entityId, attrInstanceId, valueType, geoMultiLineString) "
"VALUES ('%s', '%s', '%s', '%s', '%s', 'GeoMultiLineString', ST_GeomFromText('MULTILINESTRING(%s)'))",
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attributeId, coordsString);
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attrInstanceId, coordsString);
}

LM_TMP(("SQL[%p]: %s;", connectionP, sql));
Expand Down
2 changes: 1 addition & 1 deletion src/lib/orionld/troe/pgGeoSubMultiLineStringPush.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ extern bool pgGeoSubMultiLineStringPush
KjNode* coordinatesP,
const char* instanceId,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
);
Expand Down
10 changes: 5 additions & 5 deletions src/lib/orionld/troe/pgGeoSubMultiPolygonPush.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bool pgGeoSubMultiPolygonPush
KjNode* coordinatesP,
const char* instanceId,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
)
Expand All @@ -75,16 +75,16 @@ bool pgGeoSubMultiPolygonPush
if (observedAt != NULL)
{
snprintf(sql, sqlSize, "INSERT INTO subAttributes("
"instanceId, id, entityId, attributeId, ts, observedAt, valueType, geoMultiPolygon) "
"instanceId, id, entityId, attrInstanceId, ts, observedAt, valueType, geoMultiPolygon) "
"VALUES ('%s', '%s', '%s', '%s', '%s', '%s', 'GeoMultiPolygon', ST_GeomFromText('MULTIPOLYGON(%s)', 4267))",
instanceId, subAttributeName, entityId, attributeId, orionldState.requestTimeString, observedAt, coordsString);
instanceId, subAttributeName, entityId, attrInstanceId, orionldState.requestTimeString, observedAt, coordsString);
}
else
{
snprintf(sql, sqlSize, "INSERT INTO subAttributes("
"instanceId, id, entityId, attributeId, ts, valueType, geoMultiPolygon) "
"instanceId, id, entityId, attrInstanceId, ts, valueType, geoMultiPolygon) "
"VALUES ('%s', '%s', '%s', '%s', '%s', 'GeoMultiPolygon', ST_GeomFromText('MULTIPOLYGON(%s)', 4267))",
instanceId, subAttributeName, entityId, attributeId, orionldState.requestTimeString, coordsString);
instanceId, subAttributeName, entityId, attrInstanceId, orionldState.requestTimeString, coordsString);
}

LM_TMP(("SQL[%p]: %s;", connectionP, sql));
Expand Down
2 changes: 1 addition & 1 deletion src/lib/orionld/troe/pgGeoSubMultiPolygonPush.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ extern bool pgGeoSubMultiPolygonPush
KjNode* coordinatesP,
const char* instanceId,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
);
Expand Down
10 changes: 5 additions & 5 deletions src/lib/orionld/troe/pgGeoSubPointPush.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ bool pgGeoSubPointPush
KjNode* coordinatesP,
const char* instanceId,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
)
Expand All @@ -69,16 +69,16 @@ bool pgGeoSubPointPush
if (observedAt != NULL)
{
snprintf(sql, sizeof(sql), "INSERT INTO subAttributes("
"instanceId, ts, id, entityId, attributeId, observedAt, valueType, geoPoint) "
"instanceId, ts, id, entityId, attrInstanceId, observedAt, valueType, geoPoint) "
"VALUES ('%s', '%s', '%s', '%s', '%s', '%s', 'GeoPoint', ST_GeomFromText('POINT Z(%f %f %f)'))",
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attributeId, observedAt, longitude, latitude, altitude);
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attrInstanceId, observedAt, longitude, latitude, altitude);
}
else
{
snprintf(sql, sizeof(sql), "INSERT INTO subAttributes("
"instanceId, ts, id, entityId, attributeId, valueType, geoPoint) "
"instanceId, ts, id, entityId, attrInstanceId, valueType, geoPoint) "
"VALUES ('%s', '%s', '%s', '%s', '%s', 'GeoPoint', ST_GeomFromText('POINT Z(%f %f %f)'))",
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attributeId, longitude, latitude, altitude);
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attrInstanceId, longitude, latitude, altitude);
}

LM_TMP(("SQL[%p]: %s;", connectionP, sql));
Expand Down
2 changes: 1 addition & 1 deletion src/lib/orionld/troe/pgGeoSubPointPush.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ extern bool pgGeoSubPointPush
KjNode* coordinatesP,
const char* instanceId,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
);
Expand Down
10 changes: 5 additions & 5 deletions src/lib/orionld/troe/pgGeoSubPolygonPush.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bool pgGeoSubPolygonPush
KjNode* coordinatesP,
const char* instanceId,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
)
Expand All @@ -75,16 +75,16 @@ bool pgGeoSubPolygonPush
if (observedAt != NULL)
{
snprintf(sql, sqlSize, "INSERT INTO subAttributes("
"instanceId, ts, id, entityId, attributeId, observedAt, valueType, geoPolygon) "
"instanceId, ts, id, entityId, attrInstanceId, observedAt, valueType, geoPolygon) "
"VALUES ('%s', '%s', '%s', '%s', '%s', '%s', 'GeoPolygon', ST_GeomFromText('POLYGON(%s)', 4267))",
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attributeId, observedAt, polygonCoordsString);
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attrInstanceId, observedAt, polygonCoordsString);
}
else
{
snprintf(sql, sqlSize, "INSERT INTO subAttributes("
"instanceId, ts, id, entityId, attributeId, valueType, geoPolygon) "
"instanceId, ts, id, entityId, attrInstanceId, valueType, geoPolygon) "
"VALUES ('%s', '%s', '%s', '%s', '%s', 'GeoPolygon', ST_GeomFromText('POLYGON(%s)', 4267))",
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attributeId, polygonCoordsString);
instanceId, orionldState.requestTimeString, subAttributeName, entityId, attrInstanceId, polygonCoordsString);
}

LM_TMP(("SQL[%p]: %s;", connectionP, sql));
Expand Down
2 changes: 1 addition & 1 deletion src/lib/orionld/troe/pgGeoSubPolygonPush.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ extern bool pgGeoSubPolygonPush
KjNode* coordinatesP,
const char* instanceId,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
);
Expand Down
12 changes: 6 additions & 6 deletions src/lib/orionld/troe/pgGeoSubPropertyPush.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ bool pgGeoSubPropertyPush
KjNode* valueNodeP,
const char* instanceId,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
)
Expand All @@ -68,15 +68,15 @@ bool pgGeoSubPropertyPush


if (strcmp(geoTypeP->value.s, "Point") == 0)
ok = pgGeoSubPointPush(connectionP, coordinatesP, instanceId, entityId, attributeId, subAttributeName, observedAt);
ok = pgGeoSubPointPush(connectionP, coordinatesP, instanceId, entityId, attrInstanceId, subAttributeName, observedAt);
else if (strcmp(geoTypeP->value.s, "Polygon") == 0)
ok = pgGeoSubPolygonPush(connectionP, coordinatesP, instanceId, entityId, attributeId, subAttributeName, observedAt);
ok = pgGeoSubPolygonPush(connectionP, coordinatesP, instanceId, entityId, attrInstanceId, subAttributeName, observedAt);
else if (strcmp(geoTypeP->value.s, "LineString") == 0)
ok = pgGeoSubLineStringPush(connectionP, coordinatesP, instanceId, entityId, attributeId, subAttributeName, observedAt);
ok = pgGeoSubLineStringPush(connectionP, coordinatesP, instanceId, entityId, attrInstanceId, subAttributeName, observedAt);
else if (strcmp(geoTypeP->value.s, "MultiPolygon") == 0)
ok = pgGeoSubMultiPolygonPush(connectionP, coordinatesP, instanceId, entityId, attributeId, subAttributeName, observedAt);
ok = pgGeoSubMultiPolygonPush(connectionP, coordinatesP, instanceId, entityId, attrInstanceId, subAttributeName, observedAt);
else if (strcmp(geoTypeP->value.s, "MultiLineString") == 0)
ok = pgGeoSubMultiLineStringPush(connectionP, coordinatesP, instanceId, entityId, attributeId, subAttributeName, observedAt);
ok = pgGeoSubMultiLineStringPush(connectionP, coordinatesP, instanceId, entityId, attrInstanceId, subAttributeName, observedAt);
else
LM_RE(false, ("Bad Input (invalid geometry for GeoProperty: %s)", geoTypeP->value.s));

Expand Down
2 changes: 1 addition & 1 deletion src/lib/orionld/troe/pgGeoSubPropertyPush.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ extern bool pgGeoSubPropertyPush
KjNode* valueNodeP,
const char* instanceId,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
);
Expand Down
10 changes: 5 additions & 5 deletions src/lib/orionld/troe/pgNumberSubPropertyPush.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ bool pgNumberSubPropertyPush
const char* instanceId,
double numberValue,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* observedAt,
const char* unitCode
)
Expand All @@ -67,16 +67,16 @@ bool pgNumberSubPropertyPush
if (observedAt != NULL)
{
snprintf(sql, sizeof(sql), "INSERT INTO subAttributes("
"instanceId, id, entityId, attributeId, ts, observedAt, valueType, number, unitCode) "
"instanceId, id, entityId, attrInstanceId, ts, observedAt, valueType, number, unitCode) "
"VALUES ('%s', '%s', '%s', '%s', '%s', '%s', 'Number', %f, %s)",
instanceId, subAttributeName, entityId, attributeId, orionldState.requestTimeString, observedAt, numberValue, unitCodeString);
instanceId, subAttributeName, entityId, attrInstanceId, orionldState.requestTimeString, observedAt, numberValue, unitCodeString);
}
else
{
snprintf(sql, sizeof(sql), "INSERT INTO subAttributes("
"instanceId, id, entityId, attributeId, ts, valueType, number, unitCode) "
"instanceId, id, entityId, attrInstanceId, ts, valueType, number, unitCode) "
"VALUES ('%s', '%s', '%s', '%s', '%s', 'Number', %f, %s)",
instanceId, subAttributeName, entityId, attributeId, orionldState.requestTimeString, numberValue, unitCodeString);
instanceId, subAttributeName, entityId, attrInstanceId, orionldState.requestTimeString, numberValue, unitCodeString);
}
LM_TMP(("SQL[%p]: %s;", connectionP, sql));

Expand Down
2 changes: 1 addition & 1 deletion src/lib/orionld/troe/pgNumberSubPropertyPush.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ extern bool pgNumberSubPropertyPush
const char* instanceId,
double numberValue,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* observedAt,
const char* unitCode
);
Expand Down
10 changes: 5 additions & 5 deletions src/lib/orionld/troe/pgStringSubPropertyPush.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ bool pgStringSubPropertyPush
const char* instanceId,
const char* stringValue,
const char* entityId,
const char* attributeId,
const char* attrInstanceId,
const char* subAttributeName,
const char* observedAt
)
Expand All @@ -57,16 +57,16 @@ bool pgStringSubPropertyPush
if (observedAt != NULL)
{
snprintf(sql, sizeof(sql), "INSERT INTO subAttributes("
"instanceId, id, entityId, attributeId, ts, observedAt, valueType, text) "
"instanceId, id, entityId, attrInstanceId, ts, observedAt, valueType, text) "
"VALUES ('%s', '%s', '%s', '%s', '%s', '%s', 'String', '%s')",
instanceId, subAttributeName, entityId, attributeId, orionldState.requestTimeString, observedAt, stringValue);
instanceId, subAttributeName, entityId, attrInstanceId, orionldState.requestTimeString, observedAt, stringValue);
}
else
{
snprintf(sql, sizeof(sql), "INSERT INTO subAttributes("
"instanceId, id, entityId, attributeId, ts, valueType, text) "
"instanceId, id, entityId, attrInstanceId, ts, valueType, text) "
"VALUES ('%s', '%s', '%s', '%s', '%s', 'String', '%s')",
instanceId, subAttributeName, entityId, attributeId, orionldState.requestTimeString, stringValue);
instanceId, subAttributeName, entityId, attrInstanceId, orionldState.requestTimeString, stringValue);
}

LM_TMP(("SQL[%p]: %s;", connectionP, sql));
Expand Down

0 comments on commit 62e9094

Please sign in to comment.