You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/06/09 07:26:15 UTC
[james-project] 06/07: [PERFORMANCE]
CassandraRecipientRewriteTableDAO should use
CassandraAsyncExecutor::executeRows
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 496864e5eaba399b94b45555db2183462144e5ed
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Jun 4 14:22:19 2021 +0700
[PERFORMANCE] CassandraRecipientRewriteTableDAO should use CassandraAsyncExecutor::executeRows
---
.../rrt/cassandra/CassandraRecipientRewriteTableDAO.java | 12 ++++--------
.../rrt/cassandra/CassandraRecipientRewriteTableDAOTest.java | 3 +--
.../rrt/cassandra/CassandraRecipientRewriteTableTest.java | 3 +--
.../org/apache/james/rrt/cassandra/CassandraStepdefs.java | 3 +--
.../cassandra/migration/MappingsSourcesMigrationTest.java | 3 +--
.../james/webadmin/routes/CassandraMappingsRoutesTest.java | 3 +--
6 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAO.java b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAO.java
index db31072..e535ae5 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAO.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAO.java
@@ -35,7 +35,6 @@ import javax.inject.Inject;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
-import org.apache.james.backends.cassandra.utils.CassandraUtils;
import org.apache.james.rrt.lib.Mapping;
import org.apache.james.rrt.lib.MappingSource;
import org.apache.james.rrt.lib.MappingsImpl;
@@ -49,16 +48,14 @@ import reactor.core.publisher.Mono;
public class CassandraRecipientRewriteTableDAO {
private final CassandraAsyncExecutor executor;
- private final CassandraUtils cassandraUtils;
private final PreparedStatement insertStatement;
private final PreparedStatement deleteStatement;
private final PreparedStatement retrieveMappingStatement;
private final PreparedStatement retrieveAllMappingsStatement;
@Inject
- public CassandraRecipientRewriteTableDAO(Session session, CassandraUtils cassandraUtils) {
+ public CassandraRecipientRewriteTableDAO(Session session) {
this.executor = new CassandraAsyncExecutor(session);
- this.cassandraUtils = cassandraUtils;
this.insertStatement = prepareInsertStatement(session);
this.deleteStatement = prepareDelete(session);
this.retrieveMappingStatement = prepareRetrieveMappingStatement(session);
@@ -107,12 +104,11 @@ public class CassandraRecipientRewriteTableDAO {
}
Mono<MappingsImpl> retrieveMappings(MappingSource source) {
- return executor.execute(retrieveMappingStatement.bind()
+ return executor.executeRows(retrieveMappingStatement.bind()
.setString(USER, source.getFixedUser())
.setString(DOMAIN, source.getFixedDomain()))
- .map(resultSet -> cassandraUtils.convertToStream(resultSet)
- .map(row -> row.getString(MAPPING))
- .collect(Guavate.toImmutableList()))
+ .map(row -> row.getString(MAPPING))
+ .collect(Guavate.toImmutableList())
.map(MappingsImpl::fromCollection)
.filter(Predicate.not(MappingsImpl::isEmpty));
}
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAOTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAOTest.java
index 1654166..9660964 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAOTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableDAOTest.java
@@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
-import org.apache.james.backends.cassandra.utils.CassandraUtils;
import org.apache.james.core.Domain;
import org.apache.james.rrt.lib.Mapping;
import org.apache.james.rrt.lib.MappingSource;
@@ -48,7 +47,7 @@ class CassandraRecipientRewriteTableDAOTest {
@BeforeEach
void setUp(CassandraCluster cassandra) {
- dao = new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
+ dao = new CassandraRecipientRewriteTableDAO(cassandra.getConf());
}
@Test
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
index 5e0a19f..29d4696 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
@@ -22,7 +22,6 @@ package org.apache.james.rrt.cassandra;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
-import org.apache.james.backends.cassandra.utils.CassandraUtils;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionDAO;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
@@ -47,7 +46,7 @@ class CassandraRecipientRewriteTableTest implements RecipientRewriteTableContrac
@BeforeEach
void setup(CassandraCluster cassandra) throws Exception {
cassandraSchemaVersionDAO = new CassandraSchemaVersionDAO(cassandra.getConf());
- recipientRewriteTableDAO = new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
+ recipientRewriteTableDAO = new CassandraRecipientRewriteTableDAO(cassandra.getConf());
mappingsSourcesDAO = new CassandraMappingsSourcesDAO(cassandra.getConf());
setUp();
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
index 2461dd7..6298ee1 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
@@ -21,7 +21,6 @@ package org.apache.james.rrt.cassandra;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.backends.cassandra.components.CassandraModule;
-import org.apache.james.backends.cassandra.utils.CassandraUtils;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
import org.apache.james.rrt.lib.RecipientRewriteTableFixture;
@@ -61,7 +60,7 @@ public class CassandraStepdefs {
private AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
CassandraRecipientRewriteTable rrt = new CassandraRecipientRewriteTable(
- new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION),
+ new CassandraRecipientRewriteTableDAO(cassandra.getConf()),
new CassandraMappingsSourcesDAO(cassandra.getConf()));
rrt.setDomainList(RecipientRewriteTableFixture.domainListForCucumberTests());
return rrt;
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTest.java
index c66ce36..beb5d19 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTest.java
@@ -31,7 +31,6 @@ import java.util.stream.IntStream;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
-import org.apache.james.backends.cassandra.utils.CassandraUtils;
import org.apache.james.core.Domain;
import org.apache.james.rrt.cassandra.CassandraMappingsSourcesDAO;
import org.apache.james.rrt.cassandra.CassandraRRTModule;
@@ -67,7 +66,7 @@ class MappingsSourcesMigrationTest {
@BeforeEach
void setUp(CassandraCluster cassandra) {
- cassandraRecipientRewriteTableDAO = new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
+ cassandraRecipientRewriteTableDAO = new CassandraRecipientRewriteTableDAO(cassandra.getConf());
cassandraMappingsSourcesDAO = new CassandraMappingsSourcesDAO(cassandra.getConf());
migration = new MappingsSourcesMigration(cassandraRecipientRewriteTableDAO, cassandraMappingsSourcesDAO);
diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
index 1473173..02a3e83 100644
--- a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
@@ -28,7 +28,6 @@ import static org.hamcrest.Matchers.notNullValue;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
-import org.apache.james.backends.cassandra.utils.CassandraUtils;
import org.apache.james.core.Domain;
import org.apache.james.json.DTOConverter;
import org.apache.james.rrt.cassandra.CassandraMappingsSourcesDAO;
@@ -72,7 +71,7 @@ class CassandraMappingsRoutesTest {
@BeforeEach
void setUp(CassandraCluster cassandra) {
- cassandraRecipientRewriteTableDAO = new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
+ cassandraRecipientRewriteTableDAO = new CassandraRecipientRewriteTableDAO(cassandra.getConf());
cassandraMappingsSourcesDAO = new CassandraMappingsSourcesDAO(cassandra.getConf());
mappingsSourcesMigration = new MappingsSourcesMigration(cassandraRecipientRewriteTableDAO, cassandraMappingsSourcesDAO);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org