Skip to content

Commit 161e657

Browse files
Ryan DewSanjeevani19
authored andcommitted
DHFPROD-9515: Speed up legacy Java e2e tests
1 parent f774eed commit 161e657

File tree

3 files changed

+102
-96
lines changed

3 files changed

+102
-96
lines changed

marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/builtins/steps/mastering/default/matching.sjs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ const hubUtils = require("/data-hub/5/impl/hub-utils.sjs");
2929
* @param {string} jobId
3030
*/
3131
function filterContentAlreadyProcessed(content, summaryCollection, collectionInfo, jobId) {
32+
const collectionQuery = cts.collectionQuery(summaryCollection);
33+
const jobIdQuery = cts.fieldWordQuery('datahubCreatedByJob', jobId);
3234
const filteredContent = [];
3335
let auditingNotificationsInSourceQuery = false;
3436
for (let item of content) {
@@ -39,6 +41,21 @@ function filterContentAlreadyProcessed(content, summaryCollection, collectionInf
3941
auditingNotificationsInSourceQuery = auditingNotificationsInSourceQuery || auditingOrNotificationDoc;
4042
continue;
4143
}
44+
// skip documents already set to be merged
45+
const actionDetailQuery = cts.andQuery([cts.jsonPropertyValueQuery("uris", item.uri, "exact"),cts.jsonPropertyValueQuery("action", "merge", "exact")]);
46+
const documentQuery = cts.andQuery([collectionQuery,jobIdQuery,cts.jsonPropertyScopeQuery("actionDetails",actionDetailQuery)]);
47+
if (cts.exists(documentQuery)) {
48+
let falsePositive = true;
49+
for (const matchedDoc of cts.search(documentQuery, ["unfiltered", "score-zero"], 0)) {
50+
if (cts.contains(matchedDoc.xpath("/matchSummary/actionDetails/*"), actionDetailQuery)) {
51+
falsePositive = false;
52+
break;
53+
}
54+
}
55+
if (!falsePositive) {
56+
continue;
57+
}
58+
}
4259
filteredContent.push(item);
4360
}
4461
if (auditingNotificationsInSourceQuery) {

0 commit comments

Comments
 (0)