From 315cbc8d6c8ba6b6931d25b8ef434a0d8b6a5155 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Fri, 8 Mar 2024 09:31:59 +0100 Subject: [PATCH 1/5] use previous lasdDataDelete entry --- .../NGSIGenericColumnAggregator.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/aggregation/NGSIGenericColumnAggregator.java b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/aggregation/NGSIGenericColumnAggregator.java index 5e75c49ea..ad5b0e25b 100644 --- a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/aggregation/NGSIGenericColumnAggregator.java +++ b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/aggregation/NGSIGenericColumnAggregator.java @@ -263,11 +263,20 @@ public void aggregate(NGSIEvent event) { setLastDataTimestamp(currentTS); for (String key : aggregation.keySet()) { ArrayList valueLastData = new ArrayList<>(); - if (lastData.containsKey(key)) { - valueLastData = lastData.get(key); - } else if (!lastData.containsKey(key)){ - valueLastData = new ArrayList(Collections.nCopies(numPreviousValues, null)); + if (lastDataEntityDelete) { + if (lastDataDelete.containsKey(key)) { + valueLastData = lastDataDelete.get(key); + } else if (!lastDataDelete.containsKey(key)){ + valueLastData = new ArrayList(Collections.nCopies(numPreviousValues, null)); + } + } else { + if (lastData.containsKey(key)) { + valueLastData = lastData.get(key); + } else if (!lastData.containsKey(key)) { + valueLastData = new ArrayList(Collections.nCopies(numPreviousValues, null)); + } } + valueLastData.add(aggregation.get(key).get(aggregation.get(key).size() - 1)); if (lastDataEntityDelete) { lastDataDelete.put(key, valueLastData); From 8be1bec1149e79954a683420e2cf39800d5b3c42 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Fri, 8 Mar 2024 09:33:11 +0100 Subject: [PATCH 2/5] update CNR --- CHANGES_NEXT_RELEASE | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index e69de29bb..077d3f7dd 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -0,0 +1 @@ +- [cygnus-ngsi] [Column-aggregagor] FIx lastdata when remove multiple entities by alterationType with entityDelete From 8327a0a23801de40fb5b5366c048849c63ec05cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Fri, 8 Mar 2024 14:59:11 +0100 Subject: [PATCH 3/5] Update CHANGES_NEXT_RELEASE --- CHANGES_NEXT_RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 6f4504aad..5a90d51df 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,2 +1,2 @@ -- [cygnus-ngsi][Column-aggregagor] FIx lastdata when remove multiple entities by alterationType with entityDelete +- [cygnus-ngsi][Column-aggregagor] Fix lastdata when remove multiple entities by alterationType with entityDelete - [cygnus-ngsi][ColumnAggregator][LastData] Fix error when remove old values in lastData which does not exist (i.e. creating and updating entities) From 47813631559cacf994b63352438c531879e70392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Fri, 8 Mar 2024 14:59:32 +0100 Subject: [PATCH 4/5] Update CHANGES_NEXT_RELEASE --- CHANGES_NEXT_RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 5a90d51df..1f2835e95 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,2 +1,2 @@ -- [cygnus-ngsi][Column-aggregagor] Fix lastdata when remove multiple entities by alterationType with entityDelete +- [cygnus-ngsi][ColumnAggregagor] Fix lastdata when remove multiple entities by alterationType with entityDelete - [cygnus-ngsi][ColumnAggregator][LastData] Fix error when remove old values in lastData which does not exist (i.e. creating and updating entities) From 4003e46d6a44bb62838eb9bfac32c94b828f5c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Fri, 8 Mar 2024 14:59:46 +0100 Subject: [PATCH 5/5] Update CHANGES_NEXT_RELEASE --- CHANGES_NEXT_RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 1f2835e95..e40d5b21e 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,2 +1,2 @@ -- [cygnus-ngsi][ColumnAggregagor] Fix lastdata when remove multiple entities by alterationType with entityDelete +- [cygnus-ngsi][ColumnAggregator] Fix lastdata when remove multiple entities by alterationType with entityDelete - [cygnus-ngsi][ColumnAggregator][LastData] Fix error when remove old values in lastData which does not exist (i.e. creating and updating entities)