[midPoint-git] [Evolveum/midpoint] a0ad7d: Fix task statistics aggregation (colliding IDs)

mederly noreply at github.com
Thu Apr 8 10:56:57 CEST 2021


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: a0ad7dc47c12a62f606d5a76be41c0ca489611a3
      https://github.com/Evolveum/midpoint/commit/a0ad7dc47c12a62f606d5a76be41c0ca489611a3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Containerable.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/IterativeTaskInformation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StructuredTaskProgress.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/SynchronizationInformation.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestStatisticsProcessing.java
    A infra/schema/src/test/resources/statistics/task-aggregation-child-1.xml
    A infra/schema/src/test/resources/statistics/task-aggregation-child-2.xml
    A infra/schema/src/test/resources/statistics/task-aggregation-root.xml
    M infra/schema/testng-unit.xml

  Log Message:
  -----------
  Fix task statistics aggregation (colliding IDs)

Here we introduce ID-safe cloning methods: Containerable#cloneWithoutId
and CloneUtil#cloneCollectionMembersWithoutIds, and use them for
statistics aggregation.

Note that these methods are temporary and unfinished, just addressing
this particular issue. More in the comments.

Should fix MID-6975.


  Commit: 2d1dcb950f57eb455542ea38719062f20a87eae8
      https://github.com/Evolveum/midpoint/commit/2d1dcb950f57eb455542ea38719062f20a87eae8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-intest/src/test/resources/iterative-tasks/task-buckets-multithreaded.xml
    M model/model-intest/src/test/resources/reporting/task-recompute-roles-multinode.xml
    M model/model-intest/src/test/resources/reporting/task-recompute-roles.xml
    M model/model-intest/src/test/resources/reporting/task-reconcile-dummy-interrupted-partitioned-multinode.xml
    M model/model-intest/src/test/resources/reporting/task-reconcile-dummy-interrupted-partitioned.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/segmentation/StringWorkSegmentationStrategy.java
    M repo/task-quartz-impl/src/test/resources/work-buckets/task-125-0.xml
    M repo/task-quartz-impl/src/test/resources/work-buckets/task-130-0.xml

  Log Message:
  -----------
  Change boundary/position to start at 1

This is to align semantics of this property with other "index-like"
ones used in midPoint. All such properties start counting at 1,
only this one (because of Java/C/... influence) originally started at 0.

This commit fixes this.


  Commit: badfffc95b2ccac44b83a5739bd9ff7d20cbb3b2
      https://github.com/Evolveum/midpoint/commit/badfffc95b2ccac44b83a5739bd9ff7d20cbb3b2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-04-08 (Thu, 08 Apr 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeForQueryModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterTypeForXmlModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PolyStringEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismContainerValueWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismReferenceValueWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProvisioningStatisticsLineDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProvisioningStatisticsOperationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPopupPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskOperationStatisticsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/IterationHelper.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/a93ecb6c4825...badfffc95b2c


More information about the midPoint-svn mailing list