You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by GitBox <gi...@apache.org> on 2022/06/06 08:48:06 UTC

[GitHub] [james-project] chibenwa commented on a diff in pull request #599: Poc cassandra driver 4

chibenwa commented on code in PR #599:
URL: https://github.com/apache/james-project/pull/599#discussion_r889943757


##########
server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/cache/CassandraBlobStoreCache.java:
##########
@@ -86,7 +97,7 @@ public Mono<byte[]> read(BlobId blobId) {
                 selectStatement.bind()
                     .setString(ID, blobId.asString())
                     .setConsistencyLevel(ONE)
-                    .setReadTimeoutMillis(readTimeOutFromDataBase))
+                    .setTimeout(Duration.ofDays(readTimeOutFromDataBase)))

Review Comment:
   Are we sure?



##########
server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java:
##########
@@ -110,8 +99,8 @@ public void addDomain(Domain domain) throws DomainListException {
     @Override
     public void doRemoveDomain(Domain domain) throws DomainListException {
         boolean executed = executor.executeReturnApplied(removeStatement.bind()
-            .setString(DOMAIN, domain.asString()))
-            .block();
+                .setString(DOMAIN, domain.asString()))
+            .blockOptional().orElseThrow();

Review Comment:
   Why not `.block()` ?



##########
server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java:
##########
@@ -100,8 +89,8 @@ protected boolean containsDomainInternal(Domain domain) throws DomainListExcepti
     @Override
     public void addDomain(Domain domain) throws DomainListException {
         boolean executed = executor.executeReturnApplied(insertStatement.bind()
-            .setString(DOMAIN, domain.asString()))
-            .block();
+                .setString(DOMAIN, domain.asString()))
+            .blockOptional().orElseThrow();

Review Comment:
   Why not `.block()` ?



##########
server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersDAO.java:
##########
@@ -263,12 +237,13 @@ public void addUser(Username username, String password) throws UsersRepositoryEx
         DefaultUser user = new DefaultUser(username, preferredAlgorithm, preferredAlgorithm);
         user.setPassword(password);
         boolean executed = executor.executeReturnApplied(
-            insertStatement.bind()
-                .setString(NAME, user.getUserName().asString())
-                .setString(REALNAME, user.getUserName().asString())
-                .setString(PASSWORD, user.getHashedPassword())
-                .setString(ALGORITHM, user.getHashAlgorithm().asString()))
-            .block();
+                insertStatement.bind()
+                    .setString(NAME, user.getUserName().asString())
+                    .setString(REALNAME, user.getUserName().asString())
+                    .setString(PASSWORD, user.getHashedPassword())
+                    .setString(ALGORITHM, user.getHashAlgorithm().asString()))
+            .blockOptional()
+            .orElseThrow();

Review Comment:
   Why?



##########
server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraDefaultBucketDAO.java:
##########
@@ -19,12 +19,11 @@
 
 package org.apache.james.blob.cassandra;
 
-import static com.datastax.driver.core.ConsistencyLevel.LOCAL_ONE;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.delete;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+import static com.datastax.oss.driver.api.core.ConsistencyLevel.LOCAL_ONE;

Review Comment:
   We need to create an optimistic execution profile for this.



##########
server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersDAO.java:
##########
@@ -246,13 +219,14 @@ public Publisher<Boolean> containsReactive(Username name) {
     public int countUsers() {
         return executor.executeSingleRow(countUserStatement.bind())
             .map(row -> Ints.checkedCast(row.getLong(0)))
-            .block();
+            .blockOptional()
+            .orElseThrow();
     }

Review Comment:
   Why?



##########
server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersDAO.java:
##########
@@ -215,17 +187,18 @@ public Flux<Username> getAuthorizedUsers(Username name) {
         return executor.executeSingleRow(
                 getAuthorizedUsersStatement.bind()
                     .setString(NAME, name.asString()))
-            .map(row -> row.getSet(AUTHORIZED_USERS, String.class))
+            .mapNotNull(row -> row.getSet(AUTHORIZED_USERS, String.class))
             .flatMapIterable(set -> set)
             .map(Username::of);
     }
 
     @Override
     public void removeUser(Username name) throws UsersRepositoryException {
         boolean executed = executor.executeReturnApplied(
-            removeUserStatement.bind()
-                .setString(NAME, name.asString()))
-            .block();
+                removeUserStatement.bind()
+                    .setString(NAME, name.asString()))
+            .blockOptional()
+            .orElseThrow();

Review Comment:
   Why?



##########
server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersDAO.java:
##########
@@ -184,7 +153,8 @@ public void updateUser(User user) throws UsersRepositoryException {
                     .setString(PASSWORD, defaultUser.getHashedPassword())
                     .setString(ALGORITHM, defaultUser.getHashAlgorithm().asString())
                     .setString(NAME, defaultUser.getUserName().asString()))
-            .block();
+            .blockOptional()
+            .orElseThrow();

Review Comment:
   Why?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org