diff options
Diffstat (limited to 'cps-ri')
4 files changed, 77 insertions, 19 deletions
diff --git a/cps-ri/pom.xml b/cps-ri/pom.xml index 4ced335e5f..b6fe284c2e 100644 --- a/cps-ri/pom.xml +++ b/cps-ri/pom.xml @@ -61,6 +61,7 @@ <dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
+ <version>${postgres.version}</version>
</dependency>
<!-- Add Hibernate support for Postgres datatype JSONB -->
<dependency>
diff --git a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java index 400e9b3e83..8008e0324a 100755 --- a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java +++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java @@ -60,9 +60,9 @@ import org.onap.cps.spi.repository.ModuleReferenceRepository; import org.onap.cps.spi.repository.SchemaSetRepository; import org.onap.cps.spi.repository.YangResourceRepository; import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; +import org.opendaylight.yangtools.yang.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YangModelDependencyInfo; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.retry.annotation.Backoff; @@ -252,6 +252,11 @@ public class CpsModulePersistenceServiceImpl implements CpsModulePersistenceServ final var tempYangTextSchemaSource = new YangTextSchemaSource(revisionSourceIdentifier) { @Override + public Optional<String> getSymbolicName() { + return Optional.empty(); + } + + @Override protected MoreObjects.ToStringHelper addToStringAttributes( final MoreObjects.ToStringHelper toStringHelper) { return toStringHelper; 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 a3e2e92ecb..fb6749c3fe 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 @@ -31,14 +31,16 @@ import static org.onap.cps.spi.FetchDescendantsOption.INCLUDE_ALL_DESCENDANTS 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() @@ -46,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 0000000000..5119f26b24 --- /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'); + |