Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#140 - Add benchmarks for after-convert callbacks.

Browse Source 
- add the benchmark itself
- migrate to spring-boot dependencies of version 2.3.0
This commit is contained in:
Roman Puchkovskiy
2020-03-14 15:37:43 +04:00
committed by Mark Paluch
parent 067c18a989
commit 40e051f494
11 changed files with 180 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/commons/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.data.benchmark</groupId>
<artifactId>spring-data-benchmark-parent</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.3.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-benchmark-commons</artifactId>

2
benchmark/mongodb/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.data.benchmark</groupId>
<artifactId>spring-data-benchmark-parent</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.3.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-benchmark-mongodb</artifactId>

115
benchmark/mongodb/src/main/java/org/springframework/data/microbenchmark/mongodb/AfterConvertCallbacksBenchmark.java Normal file
View File

@@ -0,0 +1,115 @@
/*
* Copyright 2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.microbenchmark.mongodb;
import org.bson.Document;
import org.mockito.Mockito;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Setup;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.microbenchmark.common.AbstractMicrobenchmark;
import org.springframework.data.microbenchmark.mongodb.ProjectionsBenchmark.Address;
import org.springframework.data.microbenchmark.mongodb.ProjectionsBenchmark.Person;
import org.springframework.data.mongodb.MongoDatabaseFactory;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
import org.springframework.data.mongodb.core.mapping.event.AfterConvertCallback;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
/**
* @author Roman Puchkovskiy
*/
public class AfterConvertCallbacksBenchmark extends AbstractMicrobenchmark {
private MongoTemplate templateWithoutContext;
private MongoTemplate templateWithEmptyContext;
private MongoTemplate templateWithContext;
private Person source;
@Setup
public void setUp() {
MongoClient client = Mockito.mock(MongoClient.class);
MongoDatabase db = Mockito.mock(MongoDatabase.class);
MongoCollection<Document> collection = Mockito.mock(MongoCollection.class);
Mockito.when(client.getDatabase(Mockito.anyString())).thenReturn(db);
Mockito.when(db.getCollection(Mockito.anyString(), Mockito.eq(Document.class))).thenReturn(collection);
MongoDatabaseFactory factory = new SimpleMongoClientDatabaseFactory(client, "mock-database");
templateWithoutContext = new MongoTemplate(factory);
templateWithEmptyContext = new MongoTemplate(factory);
templateWithEmptyContext.setApplicationContext(new AnnotationConfigApplicationContext(EmptyConfig.class));
templateWithContext = new MongoTemplate(factory);
templateWithContext.setApplicationContext(new AnnotationConfigApplicationContext(EntityCallbackConfig.class));
source = new Person();
source.id = "luke-skywalker";
source.firstname = "luke";
source.lastname = "skywalker";
source.address = new Address();
source.address.street = "melenium falcon 1";
source.address.city = "deathstar";
}
@Benchmark
public Object baseline() {
return templateWithoutContext.save(source);
}
@Benchmark
public Object emptyContext() {
return templateWithEmptyContext.save(source);
}
@Benchmark
public Object entityCallbacks() {
return templateWithContext.save(source);
}
@Configuration
static class EmptyConfig {
}
@Configuration
static class EntityCallbackConfig {
@Bean
AfterConvertCallback<Person> afterConvertCallback() {
return (it, document, collection) -> {
Person target = new Person();
target.id = it.id;
target.firstname = it.firstname = "luke";
target.lastname = it.lastname = "skywalker";
target.address = it.address;
return target;
};
}
}
}

8
benchmark/mongodb/src/main/java/org/springframework/data/microbenchmark/mongodb/CallbacksBenchmark.java
View File

@@ -25,9 +25,9 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.data.microbenchmark.common.AbstractMicrobenchmark;
import org.springframework.data.microbenchmark.mongodb.ProjectionsBenchmark.Address;
import org.springframework.data.microbenchmark.mongodb.ProjectionsBenchmark.Person;
import org.springframework.data.mongodb.MongoDbFactory;
import org.springframework.data.mongodb.MongoDatabaseFactory;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory;
import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback;
import com.mongodb.client.MongoClient;
@@ -55,7 +55,7 @@ public class CallbacksBenchmark extends AbstractMicrobenchmark {
Mockito.when(client.getDatabase(Mockito.anyString())).thenReturn(db);
Mockito.when(db.getCollection(Mockito.anyString(), Mockito.eq(Document.class))).thenReturn(collection);
MongoDbFactory factory = new SimpleMongoClientDbFactory(client, "mock-database");
MongoDatabaseFactory factory = new SimpleMongoClientDatabaseFactory(client, "mock-database");
templateWithoutContext = new MongoTemplate(factory);
@@ -100,7 +100,7 @@ public class CallbacksBenchmark extends AbstractMicrobenchmark {
@Bean
BeforeConvertCallback<Person> convertCallback() {
return (it, Document) -> {
return (it, document) -> {
Person target = new Person();
target.id = it.id;

8
benchmark/mongodb/src/main/java/org/springframework/data/microbenchmark/mongodb/ProjectionsBenchmark.java
View File

@@ -28,8 +28,8 @@ import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.BasicQuery;
import com.mongodb.MongoClient;
import com.mongodb.ServerAddress;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
import com.mongodb.client.MongoCollection;
/**
@@ -57,7 +57,7 @@ public class ProjectionsBenchmark extends AbstractMicrobenchmark {
@Setup
public void setUp() {
client = new MongoClient(new ServerAddress());
client = MongoClients.create();
template = new MongoTemplate(client, DB_NAME);
source = new Person();
@@ -84,7 +84,7 @@ public class ProjectionsBenchmark extends AbstractMicrobenchmark {
@TearDown
public void tearDown() {
client.dropDatabase(DB_NAME);
client.getDatabase(DB_NAME).drop();
client.close();
}

18
benchmark/mongodb/src/main/java/org/springframework/data/microbenchmark/mongodb/convert/DbRefMappingBenchmark.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.data.microbenchmark.mongodb.convert;
import static org.springframework.data.mongodb.core.query.Criteria.*;
import static org.springframework.data.mongodb.core.query.Query.*;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
import lombok.Data;
@@ -24,19 +24,15 @@ import java.util.ArrayList;
import java.util.List;
import org.bson.types.ObjectId;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown;
import org.openjdk.jmh.annotations.*;
import org.springframework.data.annotation.Id;
import org.springframework.data.microbenchmark.common.AbstractMicrobenchmark;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.mapping.DBRef;
import org.springframework.data.mongodb.core.query.Query;
import com.mongodb.MongoClient;
import com.mongodb.ServerAddress;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
/**
* @author Christoph Strobl
@@ -55,7 +51,7 @@ public class DbRefMappingBenchmark extends AbstractMicrobenchmark {
@Setup
public void setUp() throws Exception {
client = new MongoClient(new ServerAddress());
client = MongoClients.create();
template = new MongoTemplate(client, DB_NAME);
List<RefObject> refObjects = new ArrayList<>();
@@ -80,7 +76,7 @@ public class DbRefMappingBenchmark extends AbstractMicrobenchmark {
@TearDown
public void tearDown() {
client.dropDatabase(DB_NAME);
client.getDatabase(DB_NAME).drop();
client.close();
}

25
benchmark/mongodb/src/main/java/org/springframework/data/microbenchmark/mongodb/convert/MappingMongoConverterBenchmark.java
View File

@@ -20,24 +20,15 @@ import lombok.Data;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.*;
import org.bson.Document;
import org.bson.types.ObjectId;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown;
import org.openjdk.jmh.annotations.*;
import org.springframework.data.annotation.Id;
import org.springframework.data.geo.Point;
import org.springframework.data.microbenchmark.common.AbstractMicrobenchmark;
import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
import org.springframework.data.mongodb.core.convert.DbRefResolver;
import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
@@ -45,8 +36,8 @@ import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
import com.mongodb.MongoClient;
import com.mongodb.ServerAddress;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
/**
* @author Christoph Strobl
@@ -68,13 +59,13 @@ public class MappingMongoConverterBenchmark extends AbstractMicrobenchmark {
@Setup
public void setUp() throws Exception {
client = new MongoClient(new ServerAddress());
client = MongoClients.create();
this.mappingContext = new MongoMappingContext();
this.mappingContext.setInitialEntitySet(Collections.singleton(Customer.class));
this.mappingContext.afterPropertiesSet();
DbRefResolver dbRefResolver = new DefaultDbRefResolver(new SimpleMongoDbFactory(client, DB_NAME));
DbRefResolver dbRefResolver = new DefaultDbRefResolver(new SimpleMongoClientDatabaseFactory(client, DB_NAME));
this.converter = new MappingMongoConverter(dbRefResolver, mappingContext);
this.converter.setCustomConversions(new MongoCustomConversions(Collections.emptyList()));
@@ -120,7 +111,7 @@ public class MappingMongoConverterBenchmark extends AbstractMicrobenchmark {
@TearDown
public void tearDown() {
client.dropDatabase(DB_NAME);
client.getDatabase(DB_NAME).drop();
client.close();
}

10
benchmark/pom.xml
View File

@@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.3.0.BUILD-SNAPSHOT</version>
</parent>
<modules>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.3.0.BUILD-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -58,6 +58,12 @@
<version>0.2.0.RELEASE</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.3</version>
</dependency>
</dependencies>
</dependencyManagement>

2
benchmark/relational/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.data.benchmark</groupId>
<artifactId>spring-data-benchmark-parent</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.3.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-benchmark-relational</artifactId>

12
benchmark/support/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.data.benchmark</groupId>
<artifactId>spring-data-benchmark-parent</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.3.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-benchmark-support</artifactId>
@@ -21,11 +21,21 @@
<artifactId>spring-data-mongodb</artifactId>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
</dependency>
<dependency>
<groupId>com.github.mp911de.microbenchmark-runner</groupId>
<artifactId>microbenchmark-runner-junit4</artifactId>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
</dependency>
</dependencies>
</project>

33
benchmark/support/src/main/java/org/springframework/data/microbenchmark/common/MongoResultsWriter.java
View File

@@ -17,10 +17,14 @@ package org.springframework.data.microbenchmark.common;
import jmh.mbr.core.ResultsWriter;
import lombok.RequiredArgsConstructor;
import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
import net.minidev.json.parser.JSONParser;
import net.minidev.json.parser.ParseException;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.bson.Document;
import org.openjdk.jmh.results.RunResult;
@@ -30,17 +34,17 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import com.mongodb.BasicDBObject;
import com.mongodb.MongoClient;
import com.mongodb.MongoClientURI;
import com.mongodb.ConnectionString;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
import com.mongodb.client.MongoDatabase;
import com.mongodb.util.JSON;
/**
* MongoDB specific {@link ResultsWriterOld} implementation.
* MongoDB specific {@link ResultsWriter} implementation.
*
* @author Christoph Strobl
* @author Mark Paluch
* @author Roman Puchkovskiy
*/
@RequiredArgsConstructor
class MongoResultsWriter implements ResultsWriter {
@@ -56,12 +60,12 @@ class MongoResultsWriter implements ResultsWriter {
try {
doWrite(results);
} catch (RuntimeException e) {
} catch (ParseException | RuntimeException e) {
output.println("Failed to write results: " + e.toString());
}
}
private void doWrite(Collection<RunResult> results) {
private void doWrite(Collection<RunResult> results) throws ParseException {
Date now = new Date();
StandardEnvironment env = new StandardEnvironment();
@@ -71,13 +75,16 @@ class MongoResultsWriter implements ResultsWriter {
String gitDirty = env.getProperty("git.dirty", "no");
String gitCommitId = env.getProperty("git.commit.id", "unknown");
MongoClientURI uri = new MongoClientURI(this.uri);
MongoClient client = new MongoClient(uri);
ConnectionString uri = new ConnectionString(this.uri);
MongoClient client = MongoClients.create();
String dbName = StringUtils.hasText(uri.getDatabase()) ? uri.getDatabase() : "spring-data-mongodb-benchmarks";
MongoDatabase db = client.getDatabase(dbName);
for (BasicDBObject dbo : (List<BasicDBObject>) JSON.parse(ResultsWriter.jsonifyResults(results))) {
String resultsJson = ResultsWriter.jsonifyResults(results).trim();
JSONArray array = (JSONArray) new JSONParser(JSONParser.MODE_PERMISSIVE).parse(resultsJson);
for (Object object : array) {
JSONObject dbo = (JSONObject) object;
String collectionName = extractClass(dbo.get("benchmark").toString());
@@ -113,8 +120,8 @@ class MongoResultsWriter implements ResultsWriter {
Object value = doc.get(key);
if (value instanceof Document) {
value = fixDocumentKeys((Document) value);
} else if (value instanceof BasicDBObject) {
value = fixDocumentKeys(new Document((BasicDBObject) value));
} else if (value instanceof Map) {
value = fixDocumentKeys(new Document((Map<String, Object>) value));
}
if (key instanceof String) {