Skip to content

CELDEV-1055 - Performance metrics with benchmark #319

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

Draft
fpichler wants to merge 6 commits into
base: dev
Choose a base branch
from
Draft

CELDEV-1055 - Performance metrics with benchmark #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f7fe2b9
benchmarking
fpichler Jun 25, 2022
f646b8a
update celendar-web to 5.6-SNAPSHOT
fpichler Jun 25, 2022
805b173
benchmarking
fpichler Jun 25, 2022
06cec73
benchmarking
fpichler Jun 25, 2022
afbae1d
replace benchmark.vm with benchmark service
fpichler Jun 26, 2022
f006de6
update celements-search dependency
fpichler Jun 27, 2022
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
9 changes: 7 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<dependency>
<groupId>com.celements</groupId>
<artifactId>calendar-web</artifactId>
<version>5.5</version>
<version>5.6-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
Expand All @@ -162,6 +162,11 @@
</dependency>

<!-- celements dependencies -->
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-performance</artifactId>
<version>5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-commons</artifactId>
Expand Down Expand Up @@ -205,7 +210,7 @@
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-search</artifactId>
<version>5.3</version>
<version>5.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.celements</groupId>
Expand Down
20 changes: 0 additions & 20 deletions src/main/webapp/templates/celMacros/benchmark.vm
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/main/webapp/templates/celMacros/debug/queryexec.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@

<p><b>${query.language}-query</b> &mdash; <i>$query.statement</i></p>
<p>limit: $limit &mdash; printLimit: $printLimit </p>
#parse('celMacros/benchmark.vm') ## start benchmark
$services.bench.startBench()
#set($result = $query.execute())
<p>#bench('query execution time' true)</p>
<p>$services.bench.benchAndPrint('query execution time', true)</p>
<p>result count: $result.size() #if($limit > 0 && $result.size() >= $limit) (limited) #end</p>
<hr>
#if(!$noResultList)
Expand All @@ -65,7 +65,7 @@
</div>
#end
<hr>
<p>#bench('printing result list' true)</p>
<p>$services.bench.benchAndPrint('printing result list', true)</p>
#end ## noResultList

#end ## ("$!query" == '')
Expand Down