You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/04/02 04:32:15 UTC
[james-project] 08/15: JAMES-2648 Avoid reading schemaVersion upon
each alias resolution
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 52597104ee4a9544e6405547f83015706ce1c853
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Mar 31 14:50:56 2020 +0700
JAMES-2648 Avoid reading schemaVersion upon each alias resolution
---
.../james/rrt/cassandra/CassandraRecipientRewriteTable.java | 2 +-
.../rrt/cassandra/CassandraRecipientRewriteTableV6Test.java | 7 ++-----
...va => CassandraRecipientRewriteTableV7BeforeStartTest.java} | 10 ++++------
.../rrt/cassandra/CassandraRecipientRewriteTableV7Test.java | 2 +-
4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java
index 1997e53..0eac424 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java
@@ -110,7 +110,7 @@ public class CassandraRecipientRewriteTable extends AbstractRecipientRewriteTabl
private boolean isLegacy() {
return isLegacy(initialSchemaVersion)
// If we started with a legacy james then maybe schema version had been updated since then
- || isLegacy(versionManager.computeVersion());
+ && isLegacy(versionManager.computeVersion());
}
private boolean isLegacy(SchemaVersion schemaVersion) {
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java
index 69aea33..525eacb 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java
@@ -63,14 +63,11 @@ public class CassandraRecipientRewriteTableV6Test extends AbstractRecipientRewri
protected AbstractRecipientRewriteTable getRecipientRewriteTable() {
CassandraSchemaVersionDAO cassandraSchemaVersionDAO = new CassandraSchemaVersionDAO(
cassandra.getConf());
+ cassandraSchemaVersionDAO.updateVersion(SCHEMA_VERSION_V6).block();
- CassandraRecipientRewriteTable rrt = new CassandraRecipientRewriteTable(
+ return new CassandraRecipientRewriteTable(
new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION),
new CassandraMappingsSourcesDAO(cassandra.getConf()),
new CassandraSchemaVersionManager(cassandraSchemaVersionDAO));
-
- cassandraSchemaVersionDAO.updateVersion(SCHEMA_VERSION_V6);
-
- return rrt;
}
}
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7BeforeStartTest.java
similarity index 94%
copy from server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java
copy to server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7BeforeStartTest.java
index 063cb83..8510f4e 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7BeforeStartTest.java
@@ -33,7 +33,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
-public class CassandraRecipientRewriteTableV7Test extends AbstractRecipientRewriteTableTest {
+public class CassandraRecipientRewriteTableV7BeforeStartTest extends AbstractRecipientRewriteTableTest {
private static final SchemaVersion SCHEMA_VERSION_V7 = new SchemaVersion(7);
private static final CassandraModule MODULE = CassandraModule.aggregateModules(
@@ -64,13 +64,11 @@ public class CassandraRecipientRewriteTableV7Test extends AbstractRecipientRewri
CassandraSchemaVersionDAO cassandraSchemaVersionDAO = new CassandraSchemaVersionDAO(
cassandra.getConf());
- CassandraRecipientRewriteTable rrt = new CassandraRecipientRewriteTable(
+ cassandraSchemaVersionDAO.updateVersion(SCHEMA_VERSION_V7).block();
+
+ return new CassandraRecipientRewriteTable(
new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION),
new CassandraMappingsSourcesDAO(cassandra.getConf()),
new CassandraSchemaVersionManager(cassandraSchemaVersionDAO));
-
- cassandraSchemaVersionDAO.updateVersion(SCHEMA_VERSION_V7);
-
- return rrt;
}
}
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java
index 063cb83..35246b9 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java
@@ -69,7 +69,7 @@ public class CassandraRecipientRewriteTableV7Test extends AbstractRecipientRewri
new CassandraMappingsSourcesDAO(cassandra.getConf()),
new CassandraSchemaVersionManager(cassandraSchemaVersionDAO));
- cassandraSchemaVersionDAO.updateVersion(SCHEMA_VERSION_V7);
+ cassandraSchemaVersionDAO.updateVersion(SCHEMA_VERSION_V7).block();
return rrt;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org