Skip to content

Use queryScanConsistency on reactive deleteAll(). #1108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2021
Merged

Use queryScanConsistency on reactive deleteAll(). #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .../springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package org.springframework.data.couchbase.repository.support;

import static org.springframework.data.couchbase.repository.support.Util.*;
import static org.springframework.data.couchbase.repository.support.Util.hasNonZeroVersionProperty;

import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
Expand All @@ -26,7 +26,6 @@
import java.util.stream.Collectors;

import org.reactivestreams.Publisher;

import org.springframework.data.couchbase.core.CouchbaseOperations;
import org.springframework.data.couchbase.core.ReactiveCouchbaseOperations;
import org.springframework.data.couchbase.core.query.Query;
Expand Down Expand Up @@ -189,7 +188,8 @@ public Mono<Long> count() {

@Override
public Mono<Void> deleteAll() {
return operations.removeByQuery(entityInformation.getJavaType()).all().then();
return operations.removeByQuery(entityInformation.getJavaType()).withConsistency(buildQueryScanConsistency()).all()
.then();
}

/**
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ public interface ReactiveAirportRepository extends ReactiveSortingRepository<Air
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<Airport> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Mono<Void> deleteAll();

@Override
Mono<Airport> save(Airport a);

Expand Down
19 changes: 19 additions & 0 deletions ...framework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,25 @@ void deleteAllById() {
}
}

@Test
void deleteAll() {

Airport vienna = new Airport("airports::vie", "vie", "LOWW");
Airport frankfurt = new Airport("airports::fra", "fra", "EDDF");
Airport losAngeles = new Airport("airports::lax", "lax", "KLAX");

try {
airportRepository.saveAll(asList(vienna, frankfurt, losAngeles)).as(StepVerifier::create)
.expectNext(vienna, frankfurt, losAngeles).verifyComplete();

airportRepository.deleteAll().as(StepVerifier::create).verifyComplete();

airportRepository.findAll().as(StepVerifier::create).verifyComplete();
} finally {
airportRepository.deleteAll().block();
}
}

@Configuration
@EnableReactiveCouchbaseRepositories("org.springframework.data.couchbase")
static class Config extends AbstractCouchbaseConfiguration {
Expand Down