Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[backend] Improve latency on atomicTestings #1733

Merged
merged 10 commits into from
Oct 29, 2024
Merged

[backend] Improve latency on atomicTestings #1733

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
788acf8
[backend] wip
savacano28 Oct 23, 2024
65d4e41
[backend] Rebase
savacano28 Oct 28, 2024
7a7afe6
[backend] Add subqueries for atomicTestings
savacano28 Oct 28, 2024
07a5af3
[backend] Add subqueries for atomicTestings
savacano28 Oct 28, 2024
45cdc76
[backend] Add subqueries for atomicTestings
savacano28 Oct 28, 2024
b7bbf93
[backend] Clean
savacano28 Oct 28, 2024
bce9532
[backend] Clean
savacano28 Oct 28, 2024
82dd72d
[backend] wip
savacano28 Oct 29, 2024
633e760
[backend] clean
savacano28 Oct 29, 2024
a08e44e
[backend] clean
savacano28 Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[backend] Add subqueries for atomicTestings
  • Loading branch information
@savacano28
savacano28 committed Oct 29, 2024
commit 07a5af3f83fefb83d6b3f51f17f27f98e91e8f2d
35 changes: 12 additions & 23 deletions openbas-api/src/main/java/io/openbas/service/AtomicTestingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,14 +399,10 @@ public Page<AtomicTestingOutput> atomicTestings(
return new PageImpl<>(injects, pageable, total);
}

private void selectForAtomicTesting(
CriteriaBuilder cb, CriteriaQuery<Tuple> cq, Root<Inject> injectRoot) {
// Joins
Join<Inject, InjectorContract> injectorContractJoin =
createLeftJoin(injectRoot, "injectorContract");
Join<InjectorContract, Injector> injectorJoin =
injectorContractJoin.join("injector", JoinType.LEFT);
//Join<Inject, InjectStatus> injectStatusJoin = createLeftJoin(injectRoot, "status");
private void selectForAtomicTesting(CriteriaBuilder cb, CriteriaQuery<Tuple> cq, Root<Inject> injectRoot) {
// Joins
Join<Inject, InjectorContract> injectorContractJoin = createLeftJoin(injectRoot, "injectorContract");
Join<InjectorContract, Injector> injectorJoin = injectorContractJoin.join("injector", JoinType.LEFT);

// Subquery for InjectStatus
Subquery<Tuple> statusSubquery = cq.subquery(Tuple.class);
Expand All @@ -422,21 +418,19 @@ private void selectForAtomicTesting(
)
.where(cb.equal(dateRoot.get("inject").get("id"), injectRoot.get("id")));


// Array aggregations
Expression<String[]> injectExpectationIdsExpression = createJoinArrayAggOnId(cb, injectRoot, EXPECTATIONS);
Expression<String[]> teamIdsExpression = createJoinArrayAggOnId(cb, injectRoot, "teams");
Expression<String[]> assetIdsExpression = createJoinArrayAggOnId(cb, injectRoot, "assets");
Expression<String[]> assetGroupIdsExpression = createJoinArrayAggOnId(cb, injectRoot, "assetGroups");

// SELECT
cq.multiselect(
injectRoot.get("id").alias("inject_id"),
injectRoot.get("title").alias("inject_title"),
injectRoot.get("updatedAt").alias("inject_updated_at"),
injectorJoin.get("type").alias("inject_type"),
injectorContractJoin.alias("inject_injector_contract"),
//injectStatusJoin.alias("inject_status"),
// SELECT
cq.multiselect(
injectRoot.get("id").alias("inject_id"),
injectRoot.get("title").alias("inject_title"),
injectRoot.get("updatedAt").alias("inject_updated_at"),
injectorJoin.get("type").alias("inject_type"),
injectorContractJoin.alias("inject_injector_contract"),
cb.selectCase()
.when(cb.exists(statusSubquery), statusSubquery.select(statusRoot.get("name")))
.otherwise(cb.nullLiteral(ExecutionStatus.class)).alias("inject_status"),
Expand All @@ -459,12 +453,7 @@ private void selectForAtomicTesting(
}

private List<AtomicTestingOutput> execAtomicTesting(TypedQuery<Tuple> query) {
long start = System.currentTimeMillis();
List<Tuple> resultList = query.getResultList();
long executionTime = System.currentTimeMillis() - start;
logger.info("Execution time of execution query true + raw query: " + executionTime + " ms");

return resultList
return query.getResultList()
.stream()
.map(tuple -> {
InjectStatus injectStatus = new InjectStatus();
Expand Down