From: ToineSiebelink Date: Thu, 1 Dec 2022 11:27:22 +0000 (+0000) Subject: Enhance read performance tests X-Git-Tag: 3.2.1~53^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fe9f46e0cf3c62e053a0e8a3ecbb7869e8c66d0f;p=cps.git Enhance read performance tests - Use cleaner base-data to prevent aready existing exception on generated IDs - Increased sample size to 10K - Test 3 scenarios now: get parent, get root and query as all 3 required separate perf improvements - Adjusted Timing for new size (allowing approx 10% margin in Nordix build) Issue-ID: CPS-1171 Signed-off-by: ToineSiebelink Change-Id: Id3867c8d33cd2c57d4d815c687561e23d1029bfd --- diff --git a/cps-ri/src/test/groovy/org/onap/cps/spi/performance/CpsToDataNodePerfTest.groovy b/cps-ri/src/test/groovy/org/onap/cps/spi/performance/CpsToDataNodePerfTest.groovy index 781d4cb43..fb6749c3f 100644 --- a/cps-ri/src/test/groovy/org/onap/cps/spi/performance/CpsToDataNodePerfTest.groovy +++ b/cps-ri/src/test/groovy/org/onap/cps/spi/performance/CpsToDataNodePerfTest.groovy @@ -28,18 +28,19 @@ import org.onap.cps.spi.model.DataNodeBuilder import org.springframework.beans.factory.annotation.Autowired import org.springframework.test.context.jdbc.Sql import static org.onap.cps.spi.FetchDescendantsOption.INCLUDE_ALL_DESCENDANTS -import static org.onap.cps.spi.impl.CpsPersistenceSpecBase.CLEAR_DATA class CpsToDataNodePerfTest extends CpsPersistenceSpecBase { - static final String SET_DATA = '/data/fragment.sql' + static final String PERF_TEST_DATA = '/data/perf-test.sql' @Autowired CpsDataPersistenceService objectUnderTest - def XPATH_DATA_NODE_WITH_DESCENDANTS = '/parent-1' + def PERF_TEST_PARENT = '/perf-parent-1' - @Sql([CLEAR_DATA, SET_DATA]) + def EXPECTED_NUMBER_OF_NODES = 10051 // 1 Parent + 50 Children + 10000 Grand-children + + @Sql([CLEAR_DATA, PERF_TEST_DATA]) def 'Get data node by xpath with all descendants with many children'() { given: 'nodes and grandchildren have been persisted' def setupStopWatch = new StopWatch() @@ -47,43 +48,65 @@ class CpsToDataNodePerfTest extends CpsPersistenceSpecBase { createLineage() setupStopWatch.stop() def setupDurationInMillis = setupStopWatch.getTime() - when: 'data node is requested with all descendants' + and: 'setup duration is under 8000 milliseconds' + assert setupDurationInMillis < 8000 + when: 'get parent is executed with all descendants' def readStopWatch = new StopWatch() readStopWatch.start() - def result = objectUnderTest.getDataNode(DATASPACE_NAME, ANCHOR_NAME1, XPATH_DATA_NODE_WITH_DESCENDANTS, INCLUDE_ALL_DESCENDANTS) + def result = objectUnderTest.getDataNode('PERF-DATASPACE', 'PERF-ANCHOR', PERF_TEST_PARENT, INCLUDE_ALL_DESCENDANTS) readStopWatch.stop() def readDurationInMillis = readStopWatch.getTime() - then: 'setup duration is under 2500 milliseconds' - assert setupDurationInMillis < 2500 - and: 'read duration is under 180 milliseconds' - assert readDurationInMillis < 180 + then: 'read duration is under 450 milliseconds' + assert readDurationInMillis < 450 + and: 'data node is returned with all the descendants populated' + assert countDataNodes(result) == EXPECTED_NUMBER_OF_NODES + when: 'get root is executed with all descendants' + readStopWatch.reset() + readStopWatch.start() + result = objectUnderTest.getDataNode('PERF-DATASPACE', 'PERF-ANCHOR', '', INCLUDE_ALL_DESCENDANTS) + readStopWatch.stop() + readDurationInMillis = readStopWatch.getTime() + then: 'read duration is under 450 milliseconds' + assert readDurationInMillis < 450 + and: 'data node is returned with all the descendants populated' + assert countDataNodes(result) == EXPECTED_NUMBER_OF_NODES + when: 'query is executed with all descendants' + readStopWatch.reset() + readStopWatch.start() + result = objectUnderTest.queryDataNodes('PERF-DATASPACE', 'PERF-ANCHOR', '//perf-parent-1', INCLUDE_ALL_DESCENDANTS) + readStopWatch.stop() + readDurationInMillis = readStopWatch.getTime() + then: 'read duration is under 450 milliseconds' + assert readDurationInMillis < 450 and: 'data node is returned with all the descendants populated' - assert countDataNodes(result) == 1533 + assert countDataNodes(result) == EXPECTED_NUMBER_OF_NODES } def createLineage() { - def numOfChildren = 30 - def numOfGrandChildren = 50 + def numOfChildren = 50 + def numOfGrandChildren = 200 (1..numOfChildren).each { def childName = "perf-test-child-${it}".toString() - def newChild = goForthAndMultiply(XPATH_DATA_NODE_WITH_DESCENDANTS, childName, numOfGrandChildren) - objectUnderTest.addChildDataNode(DATASPACE_NAME, ANCHOR_NAME1, XPATH_DATA_NODE_WITH_DESCENDANTS, newChild) + def newChild = goForthAndMultiply(PERF_TEST_PARENT, childName, numOfGrandChildren) + objectUnderTest.addChildDataNode('PERF-DATASPACE', 'PERF-ANCHOR', PERF_TEST_PARENT, newChild) } } def goForthAndMultiply(parentXpath, childName, numOfGrandChildren) { def children = [] (1..numOfGrandChildren).each { - def child = new DataNodeBuilder().withXpath("${parentXpath}/${childName}/${it}-grand-child").build() + def child = new DataNodeBuilder().withXpath("${parentXpath}/${childName}/${it}perf-test-grand-child").build() children.add(child) } return new DataNodeBuilder().withXpath("${parentXpath}/${childName}").withChildDataNodes(children).build() } - def countDataNodes(DataNode dataNode) { + def countDataNodes(dataNodes) { int nodeCount = 1 - for (DataNode child : dataNode.childDataNodes) { - nodeCount = nodeCount + (countDataNodes(child)) + for (DataNode parent : dataNodes) { + for (DataNode child : parent.childDataNodes) { + nodeCount = nodeCount + (countDataNodes(child)) + } } return nodeCount } diff --git a/cps-ri/src/test/resources/data/perf-test.sql b/cps-ri/src/test/resources/data/perf-test.sql new file mode 100644 index 000000000..5119f26b2 --- /dev/null +++ b/cps-ri/src/test/resources/data/perf-test.sql @@ -0,0 +1,28 @@ +/* + ============LICENSE_START======================================================= + Copyright (C) 2022 Nordix Foundation. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + SPDX-License-Identifier: Apache-2.0 + ============LICENSE_END========================================================= +*/ + +INSERT INTO DATASPACE (ID, NAME) VALUES (9001, 'PERF-DATASPACE'); + +INSERT INTO SCHEMA_SET (ID, NAME, DATASPACE_ID) VALUES (9002, 'PERF-SCHEMA-SET', 9001); + +INSERT INTO ANCHOR (ID, NAME, DATASPACE_ID, SCHEMA_SET_ID) VALUES (9003, 'PERF-ANCHOR', 9001, 9002); + +INSERT INTO FRAGMENT (ID, DATASPACE_ID, ANCHOR_ID, PARENT_ID, XPATH) VALUES (0, 9001, 9003, null, '/perf-parent-1'); +