Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Julian Dehm
briar
Commits
d84e176b
Commit
d84e176b
authored
Aug 22, 2018
by
akwizgran
Browse files
Merge branch 'fix_performance_test_db' into 'master'
Fix the database performance tests See merge request
briar/briar!893
parents
da8b49be
941a0ccc
Pipeline
#2128
passed with stage
in 12 minutes and 38 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceComparisonTest.java
View file @
d84e176b
package
org.briarproject.bramble.db
;
import
org.briarproject.bramble.api.crypto.SecretKey
;
import
org.briarproject.bramble.api.db.DatabaseConfig
;
import
org.briarproject.bramble.api.db.DbException
;
import
org.briarproject.bramble.api.system.Clock
;
...
...
@@ -26,6 +27,7 @@ public abstract class DatabasePerformanceComparisonTest
* How many blocks of each condition to compare.
*/
private
static
final
int
COMPARISON_BLOCKS
=
10
;
private
SecretKey
databaseKey
=
getSecretKey
();
abstract
Database
<
Connection
>
createDatabase
(
boolean
conditionA
,
DatabaseConfig
databaseConfig
,
Clock
clock
);
...
...
@@ -72,7 +74,7 @@ public abstract class DatabasePerformanceComparisonTest
throws
DbException
{
Database
<
Connection
>
db
=
createDatabase
(
conditionA
,
new
TestDatabaseConfig
(
testDir
,
MAX_SIZE
),
new
SystemClock
());
db
.
open
(
getSecret
Key
()
,
null
);
db
.
open
(
database
Key
,
null
);
return
db
;
}
...
...
bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseTraceTest.java
View file @
d84e176b
package
org.briarproject.bramble.db
;
import
org.briarproject.bramble.api.crypto.SecretKey
;
import
org.briarproject.bramble.api.db.DatabaseConfig
;
import
org.briarproject.bramble.api.db.DbException
;
import
org.briarproject.bramble.api.system.Clock
;
...
...
@@ -20,6 +21,8 @@ import static org.briarproject.bramble.test.TestUtils.getSecretKey;
public
abstract
class
DatabaseTraceTest
extends
DatabasePerformanceTest
{
private
SecretKey
databaseKey
=
getSecretKey
();
abstract
Database
<
Connection
>
createDatabase
(
DatabaseConfig
databaseConfig
,
Clock
clock
);
...
...
@@ -44,7 +47,7 @@ public abstract class DatabaseTraceTest extends DatabasePerformanceTest {
private
Database
<
Connection
>
openDatabase
()
throws
DbException
{
Database
<
Connection
>
db
=
createDatabase
(
new
TestDatabaseConfig
(
testDir
,
MAX_SIZE
),
new
SystemClock
());
db
.
open
(
getSecret
Key
()
,
null
);
db
.
open
(
database
Key
,
null
);
return
db
;
}
...
...
bramble-core/src/test/java/org/briarproject/bramble/db/SingleDatabasePerformanceTest.java
View file @
d84e176b
package
org.briarproject.bramble.db
;
import
org.briarproject.bramble.api.crypto.SecretKey
;
import
org.briarproject.bramble.api.db.DatabaseConfig
;
import
org.briarproject.bramble.api.db.DbException
;
import
org.briarproject.bramble.api.system.Clock
;
...
...
@@ -22,6 +23,8 @@ public abstract class SingleDatabasePerformanceTest
abstract
Database
<
Connection
>
createDatabase
(
DatabaseConfig
databaseConfig
,
Clock
clock
);
private
SecretKey
databaseKey
=
getSecretKey
();
@Override
protected
void
benchmark
(
String
name
,
BenchmarkTask
<
Database
<
Connection
>>
task
)
throws
Exception
{
...
...
@@ -41,7 +44,7 @@ public abstract class SingleDatabasePerformanceTest
private
Database
<
Connection
>
openDatabase
()
throws
DbException
{
Database
<
Connection
>
db
=
createDatabase
(
new
TestDatabaseConfig
(
testDir
,
MAX_SIZE
),
new
SystemClock
());
db
.
open
(
getSecret
Key
()
,
null
);
db
.
open
(
database
Key
,
null
);
return
db
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment