Skip to content

Firestore: Bloom filter minor code cleanup for consistency with web sdk #5177

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
Jul 20, 2023
Merged

Firestore: Bloom filter minor code cleanup for consistency with web sdk #5177

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
9 changes: 5 additions & 4 deletions firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TestingHooks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.google.auto.value.AutoValue;
import com.google.firebase.firestore.ListenerRegistration;
import com.google.firebase.firestore.model.DatabaseId;
import com.google.firebase.firestore.remote.WatchChangeAggregator.BloomFilterApplicationStatus;
import com.google.firestore.v1.BloomFilter;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicReference;
Expand Down Expand Up @@ -168,13 +169,13 @@ static ExistenceFilterMismatchInfo from(
ExistenceFilter existenceFilter,
DatabaseId databaseId,
@Nullable com.google.firebase.firestore.remote.BloomFilter bloomFilter,
boolean bloomFilterApplied) {
BloomFilterApplicationStatus bloomFilterStatus) {
return create(
localCacheCount,
existenceFilter.getCount(),
databaseId.getProjectId(),
databaseId.getDatabaseId(),
ExistenceFilterBloomFilterInfo.from(bloomFilter, bloomFilterApplied, existenceFilter));
ExistenceFilterBloomFilterInfo.from(bloomFilter, bloomFilterStatus, existenceFilter));
}
}

Expand Down Expand Up @@ -214,15 +215,15 @@ static ExistenceFilterBloomFilterInfo create(
@Nullable
static ExistenceFilterBloomFilterInfo from(
@Nullable com.google.firebase.firestore.remote.BloomFilter bloomFilter,
boolean bloomFilterApplied,
BloomFilterApplicationStatus bloomFilterStatus,
ExistenceFilter existenceFilter) {
BloomFilter unchangedNames = existenceFilter.getUnchangedNames();
if (unchangedNames == null) {
return null;
}
return create(
bloomFilter,
bloomFilterApplied,
/*bloomFilterApplied=*/ bloomFilterStatus == BloomFilterApplicationStatus.SUCCESS,
unchangedNames.getHashCount(),
unchangedNames.getBits().getBitmap().size(),
unchangedNames.getBits().getPadding());
Expand Down
10 changes: 5 additions & 5 deletions ...e-firestore/src/main/java/com/google/firebase/firestore/remote/WatchChangeAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public interface TargetMetadataProvider {
private static final String LOG_TAG = "WatchChangeAggregator";

/** The bloom filter application status while handling existence filter mismatch. */
private enum BloomFilterApplicationStatus {
enum BloomFilterApplicationStatus {
SUCCESS,
SKIPPED,
FALSE_POSITIVE
Expand Down Expand Up @@ -218,9 +218,9 @@ public void handleExistenceFilter(ExistenceFilterWatchChange watchChange) {
// Apply bloom filter to identify and mark removed documents.
BloomFilter bloomFilter = this.parseBloomFilter(watchChange);
BloomFilterApplicationStatus status =
bloomFilter == null
? BloomFilterApplicationStatus.SKIPPED
: this.applyBloomFilter(bloomFilter, watchChange, currentSize);
bloomFilter != null
? this.applyBloomFilter(bloomFilter, watchChange, currentSize)
: BloomFilterApplicationStatus.SKIPPED;

if (status != BloomFilterApplicationStatus.SUCCESS) {
// If bloom filter application fails, we reset the mapping and
Expand All @@ -242,7 +242,7 @@ public void handleExistenceFilter(ExistenceFilterWatchChange watchChange) {
watchChange.getExistenceFilter(),
targetMetadataProvider.getDatabaseId(),
bloomFilter,
/*bloomFilterApplied=*/ status == BloomFilterApplicationStatus.SUCCESS));
status));
}
}
}
Expand Down