Skip to content

Commit 5328121

Browse files
at055612at055612
authored
Merge pull request #5103 from gchq/gh-5101-folder-reprocess-selection
PR for #5101 - Reprocessing of Errors from Folder level sometimes isn't filtering correctly
2 parents 4f244b5 + fb1ca6d commit 5328121

File tree

2 files changed

+105
-32
lines changed

2 files changed

+105
-32
lines changed

‎stroom-meta/stroom-meta-impl-db/src/main/java/stroom/meta/impl/db/MetaDaoImpl.java‎

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,38 +1661,51 @@ private SelectionSummary getReprocessSelectionSummary(final Collection<Condition
16611661
final int offset,
16621662
final int numberOfRows,
16631663
final Set<Integer> usedValKeys) {
1664-
return JooqUtil.contextResult(metaDbConnProvider, context ->
1665-
metaExpressionMapper.addJoins(context
1666-
.select(
1667-
DSL.countDistinct(parent.ID),
1668-
DSL.countDistinct(parent.FEED_ID),
1669-
DSL.groupConcatDistinct(parentFeed.NAME)
1670-
.separator(GROUP_CONCAT_DELIMITER),
1671-
DSL.countDistinct(parent.TYPE_ID),
1672-
DSL.groupConcatDistinct(parentType.NAME)
1673-
.separator(GROUP_CONCAT_DELIMITER),
1674-
DSL.countDistinct(meta.PROCESSOR_ID),
1675-
DSL.countDistinct(metaProcessor.PIPELINE_UUID),
1676-
DSL.countDistinct(parent.STATUS),
1677-
DSL.groupConcatDistinct(parent.STATUS)
1678-
.separator(GROUP_CONCAT_DELIMITER),
1679-
DSL.min(parent.CREATE_TIME),
1680-
DSL.max(parent.CREATE_TIME)
1681-
)
1682-
.from(meta)
1683-
.straightJoin(metaFeed).on(meta.FEED_ID.eq(metaFeed.ID))
1684-
.straightJoin(metaType).on(meta.TYPE_ID.eq(metaType.ID))
1685-
.leftOuterJoin(metaProcessor).on(meta.PROCESSOR_ID.eq(metaProcessor.ID))
1686-
.leftOuterJoin(parent).on(meta.PARENT_ID.eq(parent.ID))
1687-
.straightJoin(parentFeed).on(parent.FEED_ID.eq(parentFeed.ID))
1688-
.straightJoin(parentType).on(parent.TYPE_ID.eq(parentType.ID)),
1689-
meta.ID,
1690-
usedValKeys)
1691-
.where(conditions)
1692-
.and(parent.ID.isNotNull())
1693-
.and(parent.STATUS.eq(MetaStatusId.getPrimitiveValue(Status.UNLOCKED)))
1694-
.limit(offset, numberOfRows)
1695-
.fetchOptional())
1664+
// CheckStyle is a bit fussy about this block
1665+
return JooqUtil.contextResult(
1666+
metaDbConnProvider,
1667+
context -> {
1668+
final var baseQuery = context.select(
1669+
DSL.countDistinct(parent.ID),
1670+
DSL.countDistinct(parent.FEED_ID),
1671+
DSL.groupConcatDistinct(parentFeed.NAME)
1672+
.separator(GROUP_CONCAT_DELIMITER),
1673+
DSL.countDistinct(parent.TYPE_ID),
1674+
DSL.groupConcatDistinct(parentType.NAME)
1675+
.separator(GROUP_CONCAT_DELIMITER),
1676+
DSL.countDistinct(meta.PROCESSOR_ID),
1677+
DSL.countDistinct(metaProcessor.PIPELINE_UUID),
1678+
DSL.countDistinct(parent.STATUS),
1679+
DSL.groupConcatDistinct(parent.STATUS)
1680+
.separator(GROUP_CONCAT_DELIMITER),
1681+
DSL.min(parent.CREATE_TIME),
1682+
DSL.max(parent.CREATE_TIME)
1683+
)
1684+
.from(meta)
1685+
.straightJoin(metaFeed).on(meta.FEED_ID.eq(metaFeed.ID))
1686+
.straightJoin(metaType).on(meta.TYPE_ID.eq(metaType.ID))
1687+
.leftOuterJoin(metaProcessor).on(meta.PROCESSOR_ID.eq(metaProcessor.ID))
1688+
.leftOuterJoin(parent).on(meta.PARENT_ID.eq(parent.ID))
1689+
.straightJoin(parentFeed).on(parent.FEED_ID.eq(parentFeed.ID))
1690+
.straightJoin(parentType).on(parent.TYPE_ID.eq(parentType.ID));
1691+
1692+
// Status predicates need to be consistent with those in
1693+
// stroom.processor.impl.ProcessorTaskCreatorImpl.runSelectMetaQuery
1694+
// The default status=Unlocked term gets removed by the UI prior to
1695+
// getting here.
1696+
final var sql = metaExpressionMapper.addJoins(
1697+
baseQuery,
1698+
meta.ID,
1699+
usedValKeys)
1700+
.where(conditions)
1701+
.and(parent.ID.isNotNull())
1702+
.and(parent.STATUS.notEqual(MetaStatusId.getPrimitiveValue(Status.DELETED)))
1703+
.and(meta.STATUS.notEqual(MetaStatusId.getPrimitiveValue(Status.DELETED)))
1704+
.limit(offset, numberOfRows);
1705+
1706+
LOGGER.debug("getReprocessSelectionSummary() - sql:\n{}", sql);
1707+
return sql.fetchOptional();
1708+
})
16961709
.map(record -> {
16971710
final Set<String> distinctFeeds = splitGroupConcat(record.get(2, String.class));
16981711
final Set<String> distinctTypes = splitGroupConcat(record.get(4, String.class));

‎unreleased_changes/20250908_134015_219__5101.md‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
* Issue **#5101** : Fix select-all filtering when doing a reprocess of everything in a folder. It no longer tries to re-process deleted items streams.
2+
3+
4+
```sh
5+
# ********************************************************************************
6+
# Issue title: Reprocessing of Errors from Folder level sometimes isn't filtering correctly
7+
# Issue link: https://github.com/gchq/stroom/issues/5101
8+
# ********************************************************************************
9+
10+
# ONLY the top line will be included as a change entry in the CHANGELOG.
11+
# The entry should be in GitHub flavour markdown and should be written on a SINGLE
12+
# line with no hard breaks. You can have multiple change files for a single GitHub issue.
13+
# The entry should be written in the imperative mood, i.e. 'Fix nasty bug' rather than
14+
# 'Fixed nasty bug'.
15+
#
16+
# Examples of acceptable entries are:
17+
#
18+
#
19+
# * Issue **123** : Fix bug with an associated GitHub issue in this repository
20+
#
21+
# * Issue **namespace/other-repo#456** : Fix bug with an associated GitHub issue in another repository
22+
#
23+
# * Fix bug with no associated GitHub issue.
24+
25+
26+
# --------------------------------------------------------------------------------
27+
# The following is random text to make this file unique for git's change detection
28+
# EMPXWUDZpt5Ms2kIXxwbkZ7V2neugzyrHQTmBhItSYqPbk0RHr6GXjo5hraai6zmMa4eL7P7jYJLrpUY
29+
# pcPFzlq6LYSlIrTqugr7SomG8bQmaKv571D9boQsKnFUhmRh2yP6Oa6qCmiDD5brPlq9vRzUX43z1XCN
30+
# VXbzS5n52DAkrfAsh1oXZId19QOvi3MhHhi58rYHACO2mHU6gIErgsoohB36LpLWeHe4bHONN880nPVC
31+
# 4jHhiXIoUZ8pyyNRhaDGORkkK68cdoUZgJ9LmzD7OkccIiHQldp9qCzZvpSjIiLhzsYcL2FZm9JQWs2v
32+
# nQ63Pa01lKw7u7Lp3rNNStGWi4lC3V2hRBhUi3N2NC3vQiGKWVqVVHvIHFd2B0TYzA0DBhragqI5S35D
33+
# Rj6X3Eorgjrn0BPdSrdAVOe3Anl5VjFFYqCQaKT91XSDvtyORrnJxGqJvPbMaeNusTqbhNPJuXKARGnp
34+
# yzc2zogV4meXHB2bvZIbH97Qlz9dwfgBvwqNMTLdDcOICaPVV0Z39v8UfurBQWiiZDCDVe7u0fMM85n3
35+
# dQYV3UtlwZUBqDyxFBhk4BiaHk2f2oJHrixCl42SCDhW1obxmA0eereIldNPadhj8dw5sGi2pfxQMlie
36+
# 77sMbcapYY3g0qK1XOM9tBEt4amKm6rOtvlIXmHnjhM2DGZlpd4ggvkvJKNsDPjl38JUOOm2I5oonxZM
37+
# h2Zuqec1PvxJXWkz3gjR8thALrVtTenF1AWlsfTGMDHXChRVOHqXcaK9XPbr8BA58foV2E1P7osqsuo9
38+
# eW1AfXDpSIo0fwFkvMI9l8FKbVdm3XqdpoY1aCWS8g5S2oIFXzSdQRGJNXSi045zrI8He7nl7YQviuGQ
39+
# Elw7vPrxTyUOsb30OqdhJ6OyOdHVBO2zqGCX66Axy36HyNEeDJHtStgtz46JIoFrZmPDzHeFcDdNFCyd
40+
# FDEcFVhp77X2hetSozAGsECVkeUoXqveR7WpGK67PfQV0VkUbjOO4JQxIXRIRJPmRUnZPhT7yXEyjm1o
41+
# rVGtVvTiC5kqW35xCEmYu5UNSMHHv2066a5yx1t2uqRIV5qAVdlYQTvrda3cDwBdxzZMGpQHWt80Rici
42+
# RJrXfkHycqE5ZPe1KkClY9npfhcebXzlcm225zOoeaPcQPn1e3A9TO2p5GArW5xcvTf91ceFv1DSBBvN
43+
# WfeQGqHiPHf6FDXeJfHF7v77BYiJoth71qYnxNAfZZAR9Mltbk9jWZjIooh2gEuISG6wSZNkuz3EC3dw
44+
# gJ7jOH4JLs6XNnCx6cmCeAVTfdzSg1GXfBvmB2Ru0baZLg9PXhRZJWWqlwy9kje77GL3eLuFdPrGyJe2
45+
# r5gQsG0IU7glDN6stliuyKHx3kHQCKyhpbjwF0uG1x4lYrUZ0ASVGnWZhNxEa5TELaZCnh4hPkLtglQP
46+
# n0Rs4mMh6WMAqfH9cf5Y7wmZJ58ggxc3BDPs4AJvlC69A0F7dq5omeHUKlhvD18ZCShasjowdaLNWn4B
47+
# OazsDVJ7c1kzFSE6DdNax7hDPzkT97H4HZ0m8UxnZZAahLNKcrdr0kZlkinGZ4Gz8hcPP3bK9QvHuDnh
48+
# nByPJ30vWIAd2lwzx75uzkkBWKf0gWuv5NhWkFxxRAJjx9yCPdvIJrkg31yKQEGAjUbT5dshJiJsUl37
49+
# LG6MqrjtN46nVuBTr34gCs8HOdGFcwRv9JD9z8OICrcQH9bxymLiLm4P0SdLHUVZt1UgctykzxkvbBzl
50+
# Z4KdboSuA6uSQeQKSR5J8RUFIKqpoGQu5CchuziBujIAnD92Ceh3hf4WUflYdyZDnkKo0n4dKFoKTxz4
51+
# wfCJIm6v0e7dRwJ5AGqA8YBGBAaourqHJXSBMGtu2Sq8uZHeIWBnEx4SQGv7roxCsY27EINDrcSMAF1R
52+
# qMzauQKTyfdgilkSmANglDW0NZNd04Qqm5BS3xMT9ClXWRPLyKDTmmBT9SHJtxWhqVUhDwPMqR03aU6N
53+
# ojug6QGNgRfJdYcA9N5MwTZvw5LEaFDOcij3nMmnWX5PqQCW37YOcHsi4Wn8vIbl5AhPqomPUIPs6uV5
54+
# zrqhO2RH7yRfXAzACmNvWH5HNWewpPGIb74VBALVkLF0XtNgnE8JqRVMiG51dxl3r2JXg0c7Xr4aWKxk
55+
# i2LN2J86vYN592O33l2lKcCdSmxF36Vu6Yv2L26kMgroA9yR9reOgfencqSinVIshkdOTpt6xNDvollM
56+
# 97u2wKLIKZI7Jva3mOpfQ4iYkHxy2G1cXeq0kENugw4dRAKlCpt8qxurCi09eghqJ2HosMLUOHSBN8wD
57+
# dJZWY6HD8pMuPRhFkd1cj6MU1WwWVD7zPg38x65EKoisLS540zCBK6QVjVc6L1JRULPXoHnC5isKFkoS
58+
# --------------------------------------------------------------------------------
59+
60+
```

0 commit comments

Comments
 (0)