summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordanielhanrahan <daniel.hanrahan@est.tech>2023-02-21 22:09:59 +0000
committerDaniel Hanrahan <daniel.hanrahan@est.tech>2023-02-22 15:26:03 +0000
commit60cff5c74886d5bd31657d292cc23ac45455b0d9 (patch)
tree09c85a51345a32b063d7ad95fb1aa36b8aa01844
parent5aecb131dff43bf6ead421f5885d0dbaab14e9c3 (diff)
Add performance tests for update data nodes
Issue-ID: CPS-1504 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: I1356e4a67a40d03cd71a98dad1571583229f414d
-rw-r--r--cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsPersistencePerfSpecBase.groovy16
-rw-r--r--cps-ri/src/test/groovy/org/onap/cps/spi/performance/CpsDataPersistenceServicePerfTest.groovy44
2 files changed, 52 insertions, 8 deletions
diff --git a/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsPersistencePerfSpecBase.groovy b/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsPersistencePerfSpecBase.groovy
index b67a5cc686..daa774698f 100644
--- a/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsPersistencePerfSpecBase.groovy
+++ b/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsPersistencePerfSpecBase.groovy
@@ -75,12 +75,18 @@ class CpsPersistencePerfSpecBase extends CpsPersistenceSpecBase {
return grandChildren
}
- def countDataNodes(dataNodes) {
- int nodeCount = 1
+ def countDataNodes(Collection<DataNode> dataNodes) {
+ int nodeCount = 0
for (DataNode parent : dataNodes) {
- for (DataNode child : parent.childDataNodes) {
- nodeCount = nodeCount + (countDataNodes(child))
- }
+ nodeCount = nodeCount + countDataNodes(parent)
+ }
+ return nodeCount
+ }
+
+ def countDataNodes(DataNode dataNode) {
+ int nodeCount = 1
+ for (DataNode child : dataNode.childDataNodes) {
+ nodeCount = nodeCount + countDataNodes(child)
}
return nodeCount
}
diff --git a/cps-ri/src/test/groovy/org/onap/cps/spi/performance/CpsDataPersistenceServicePerfTest.groovy b/cps-ri/src/test/groovy/org/onap/cps/spi/performance/CpsDataPersistenceServicePerfTest.groovy
index a2ec29aecf..cfd1093a99 100644
--- a/cps-ri/src/test/groovy/org/onap/cps/spi/performance/CpsDataPersistenceServicePerfTest.groovy
+++ b/cps-ri/src/test/groovy/org/onap/cps/spi/performance/CpsDataPersistenceServicePerfTest.groovy
@@ -21,7 +21,6 @@
package org.onap.cps.spi.performance
import org.onap.cps.spi.impl.CpsPersistencePerfSpecBase
-import org.springframework.util.StopWatch
import org.onap.cps.spi.CpsDataPersistenceService
import org.onap.cps.spi.repository.AnchorRepository
import org.onap.cps.spi.repository.DataspaceRepository
@@ -98,8 +97,8 @@ class CpsDataPersistenceServicePerfTest extends CpsPersistencePerfSpecBase {
def readDurationInMillis = stopWatch.getTotalTimeMillis()
then: 'the returned number of entities equal to the number of children * number of grandchildren'
assert result.size() == xpathsToAllGrandChildren.size()
- and: 'it took less then 4000ms'
- recordAndAssertPerformance('Find multiple xpaths', 4000, readDurationInMillis)
+ and: 'it took less then 3000ms'
+ recordAndAssertPerformance('Find multiple xpaths', 3000, readDurationInMillis)
}
def 'Query many descendants by cps-path with #scenario'() {
@@ -118,4 +117,43 @@ class CpsDataPersistenceServicePerfTest extends CpsPersistencePerfSpecBase {
'omit descendants ' | OMIT_DESCENDANTS || 150
'include descendants (although there are none)' | INCLUDE_ALL_DESCENDANTS || 150
}
+
+ def 'Update data nodes with descendants'() {
+ given: 'a list of xpaths to data nodes with descendants (xpath for each child)'
+ def xpaths = (1..20).collect {
+ "${PERF_TEST_PARENT}/perf-test-child-${it}".toString()
+ }
+ and: 'the correct number of data nodes are fetched'
+ def dataNodes = objectUnderTest.getDataNodesForMultipleXpaths(PERF_DATASPACE, PERF_ANCHOR, xpaths, INCLUDE_ALL_DESCENDANTS)
+ assert dataNodes.size() == 20
+ assert countDataNodes(dataNodes) == 20 + 20 * 50
+ when: 'the fragment entities are updated by the data nodes'
+ stopWatch.start()
+ objectUnderTest.updateDataNodesAndDescendants(PERF_DATASPACE, PERF_ANCHOR, dataNodes)
+ stopWatch.stop()
+ def updateDurationInMillis = stopWatch.getTotalTimeMillis()
+ then: 'update duration is under 600 milliseconds'
+ recordAndAssertPerformance('Update data nodes with descendants', 600, updateDurationInMillis)
+ }
+
+ def 'Update data nodes without descendants'() {
+ given: 'a list of xpaths to data nodes without descendants (xpath for each grandchild)'
+ def xpaths = []
+ for (int childIndex = 21; childIndex <= 40; childIndex++) {
+ xpaths.addAll((1..50).collect {
+ "${PERF_TEST_PARENT}/perf-test-child-${childIndex}/perf-test-grand-child-${it}".toString()
+ })
+ }
+ and: 'the correct number of data nodes are fetched'
+ def dataNodes = objectUnderTest.getDataNodesForMultipleXpaths(PERF_DATASPACE, PERF_ANCHOR, xpaths, OMIT_DESCENDANTS)
+ assert dataNodes.size() == 20 * 50
+ assert countDataNodes(dataNodes) == 20 * 50
+ when: 'the fragment entities are updated by the data nodes'
+ stopWatch.start()
+ objectUnderTest.updateDataNodesAndDescendants(PERF_DATASPACE, PERF_ANCHOR, dataNodes)
+ stopWatch.stop()
+ def updateDurationInMillis = stopWatch.getTotalTimeMillis()
+ then: 'update duration is under 1400 milliseconds'
+ recordAndAssertPerformance('Update data nodes without descendants', 1400, updateDurationInMillis)
+ }
}