Skip to content

Commit 8e8afec

Browse files
committed
Feedback.
1 parent eb7e8e8 commit 8e8afec

File tree

5 files changed

+14
-24
lines changed

5 files changed

+14
-24
lines changed

firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryEagerGcSettings.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ public MemoryEagerGcSettings build() {
2929
}
3030
}
3131

32-
@Override
33-
public int hashCode() {
34-
return super.hashCode();
35-
}
36-
3732
@Override
3833
public boolean equals(@Nullable Object obj) {
3934
if (this == obj) return true;

firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryLruGcSettings.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.google.firebase.firestore;
22

33
import androidx.annotation.NonNull;
4-
import androidx.annotation.Nullable;
54

65
public final class MemoryLruGcSettings implements MemoryGarbageCollectorSettings {
76

@@ -36,16 +35,18 @@ public long getSizeBytes() {
3635
}
3736

3837
@Override
39-
public int hashCode() {
40-
return super.hashCode();
38+
public boolean equals(Object o) {
39+
if (this == o) return true;
40+
if (o == null || getClass() != o.getClass()) return false;
41+
42+
MemoryLruGcSettings that = (MemoryLruGcSettings) o;
43+
44+
return sizeBytes == that.sizeBytes;
4145
}
4246

4347
@Override
44-
public boolean equals(@Nullable Object obj) {
45-
if (this == obj) return true;
46-
if (obj == null || getClass() != obj.getClass()) return false;
47-
48-
return true;
48+
public int hashCode() {
49+
return (int) (sizeBytes ^ (sizeBytes >>> 32));
4950
}
5051

5152
@NonNull

firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryLruReferenceDelegate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.Map;
2828

2929
/** Provides LRU garbage collection functionality for MemoryPersistence. */
30-
public class MemoryLruReferenceDelegate implements ReferenceDelegate, LruDelegate {
30+
class MemoryLruReferenceDelegate implements ReferenceDelegate, LruDelegate {
3131
private final MemoryPersistence persistence;
3232
private final LocalSerializer serializer;
3333
private final Map<DocumentKey, Long> orphanedSequenceNumbers;

firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteLruReferenceDelegate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.List;
2626

2727
/** Provides LRU functionality for SQLite persistence. */
28-
public class SQLiteLruReferenceDelegate implements ReferenceDelegate, LruDelegate {
28+
class SQLiteLruReferenceDelegate implements ReferenceDelegate, LruDelegate {
2929
/**
3030
* The batch size for orphaned document GC in `removeOrphanedDocuments()`.
3131
*

firebase-firestore/src/test/java/com/google/firebase/firestore/spec/SpecTestCase.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,11 @@
5656
import com.google.firebase.firestore.core.QueryListener;
5757
import com.google.firebase.firestore.core.SyncEngine;
5858
import com.google.firebase.firestore.local.LocalStore;
59+
import com.google.firebase.firestore.local.LruDelegate;
5960
import com.google.firebase.firestore.local.LruGarbageCollector;
60-
import com.google.firebase.firestore.local.MemoryLruReferenceDelegate;
6161
import com.google.firebase.firestore.local.Persistence;
6262
import com.google.firebase.firestore.local.PersistenceTestHelpers;
6363
import com.google.firebase.firestore.local.QueryPurpose;
64-
import com.google.firebase.firestore.local.SQLiteLruReferenceDelegate;
6564
import com.google.firebase.firestore.local.TargetData;
6665
import com.google.firebase.firestore.model.DocumentKey;
6766
import com.google.firebase.firestore.model.MutableDocument;
@@ -326,14 +325,9 @@ private void initClient() {
326325

327326
ComponentProvider provider = initializeComponentProvider(configuration, useEagerGcForMemory);
328327
localPersistence = provider.getPersistence();
329-
if (localPersistence.getReferenceDelegate() instanceof SQLiteLruReferenceDelegate) {
328+
if (localPersistence.getReferenceDelegate() instanceof LruDelegate) {
330329
lruGarbageCollector =
331-
((SQLiteLruReferenceDelegate) localPersistence.getReferenceDelegate())
332-
.getGarbageCollector();
333-
} else if (localPersistence.getReferenceDelegate() instanceof MemoryLruReferenceDelegate) {
334-
lruGarbageCollector =
335-
((MemoryLruReferenceDelegate) localPersistence.getReferenceDelegate())
336-
.getGarbageCollector();
330+
((LruDelegate) localPersistence.getReferenceDelegate()).getGarbageCollector();
337331
}
338332
remoteStore = provider.getRemoteStore();
339333
localStore = provider.getLocalStore();

0 commit comments

Comments
 (0)