Skip to content

New Cache Config and LRU GC #1308

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

Open
wu-hui wants to merge 25 commits into
base: main
Choose a base branch
from
Open

New Cache Config and LRU GC #1308

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ef27076
creating new settings files
wu-hui May 3, 2023
2021a27
Compiling..pheww
wu-hui May 4, 2023
12086e0
main tests pass.
wu-hui May 4, 2023
26e9896
LRU GC compiles
wu-hui May 8, 2023
e7a0f70
LRU tests pass
wu-hui May 8, 2023
b93e933
Feedback
wu-hui May 9, 2023
d65416d
Using new cache api, for future reference.
wu-hui May 9, 2023
47f4647
fix firestore_main to use legacy API for now
wu-hui May 9, 2023
bfa379f
More polishing and documentation.
wu-hui May 10, 2023
1692738
add equality tests
wu-hui May 10, 2023
fa90de0
Address lint warnings
wu-hui May 10, 2023
45a3d66
feedback
wu-hui May 15, 2023
105f757
Merge branch 'main' into wuandy/LruGC
dconeybe May 16, 2023
dc90586
Merge branch 'main' into wuandy/LruGC
wu-hui May 23, 2023
5be24a4
Use original deprecation suppress macro
wu-hui May 23, 2023
a8db140
Use refs instead of shared_ptr in api and remove dead code
wu-hui May 23, 2023
d56a2d4
Better cache config source management + others
wu-hui May 29, 2023
d560721
use forward decl for internal classes
wu-hui Jun 7, 2023
b328d02
remove main/api references
wu-hui Jun 7, 2023
c4264fd
No subclassing
wu-hui Jun 7, 2023
d9d5ecd
No subclassing
wu-hui Jun 7, 2023
b757139
delete includes from main
wu-hui Jul 5, 2023
ded9c2e
No more core from common
wu-hui Jul 11, 2023
9ee3f2e
Merge branch 'main' into wuandy/LruGC
wu-hui Jul 11, 2023
570e8c0
remove unnecessary include
wu-hui Jul 12, 2023
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
Prev Previous commit
Next Next commit
Use original deprecation suppress macro
  • Loading branch information
@wu-hui
wu-hui committed May 23, 2023
commit 5be24a403e8f7ea43e03fea7a47f8863f2a115b8
18 changes: 13 additions & 5 deletions firestore/integration_test_internal/src/firestore_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#include "util/future_test_util.h"
#if !defined(__ANDROID__)
#include "Firestore/core/src/util/autoid.h"
#include "Firestore/core/src/util/warnings.h"
#include "firestore/src/main/converter_main.h"
#include "firestore/src/main/firestore_main.h"
#else
Expand Down Expand Up @@ -1791,7 +1792,9 @@ class FirestoreCacheConfigTest : public FirestoreIntegrationTest {
TEST_F(FirestoreCacheConfigTest, LegacyCacheConfigForMemoryCacheWorks) {
auto* db = TestFirestore("legacy_memory_cache");
auto settings = db->settings();
WITH_DEPRECATED_API(settings.set_persistence_enabled(false));
SUPPRESS_DEPRECATED_DECLARATIONS_BEGIN();
settings.set_persistence_enabled(false);
SUPPRESS_END();
db->set_settings(std::move(settings));

VerifyCachedDocumentDeletedImmediately(db);
Expand All @@ -1800,7 +1803,9 @@ TEST_F(FirestoreCacheConfigTest, LegacyCacheConfigForMemoryCacheWorks) {
TEST_F(FirestoreCacheConfigTest, LegacyCacheConfigForPersistenceCacheWorks) {
auto* db = TestFirestore("legacy_persistent_cache");
auto settings = db->settings();
WITH_DEPRECATED_API(settings.set_persistence_enabled(true));
SUPPRESS_DEPRECATED_DECLARATIONS_BEGIN();
settings.set_persistence_enabled(true);
SUPPRESS_END();
db->set_settings(std::move(settings));

VerifyCachedDocumentStaysAround(db);
Expand Down Expand Up @@ -1832,14 +1837,17 @@ TEST_F(FirestoreCacheConfigTest, CannotMixNewAndLegacyCacheConfig) {
settings.set_local_cache_settings(
PersistentCacheSettings::Create().WithSizeBytes(50 * 1024 * 1024));

WITH_DEPRECATED_API(
EXPECT_THROW(settings.set_cache_size_bytes(0), std::logic_error));
SUPPRESS_DEPRECATED_DECLARATIONS_BEGIN();
EXPECT_THROW(settings.set_cache_size_bytes(0), std::logic_error);
SUPPRESS_END();
}

{
auto* db = TestFirestore("mixing_2");
auto settings = db->settings();
WITH_DEPRECATED_API(settings.set_persistence_enabled(false));
SUPPRESS_DEPRECATED_DECLARATIONS_BEGIN();
settings.set_persistence_enabled(false);
SUPPRESS_END();
EXPECT_THROW(
settings.set_local_cache_settings(MemoryCacheSettings::Create()),
std::logic_error);
Expand Down
37 changes: 25 additions & 12 deletions firestore/integration_test_internal/src/settings_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "firebase/firestore.h"
#include "firebase/firestore/local_cache_settings.h"
#include "firebase_test_framework.h"
#include "Firestore/core/src/util/warnings.h"

#include "gtest/gtest.h"

Expand All @@ -33,39 +34,51 @@ TEST(SettingsTest, Equality) {
Settings settings1;
settings1.set_host("foo");
settings1.set_ssl_enabled(true);
WITH_DEPRECATED_API(settings1.set_persistence_enabled(true));
WITH_DEPRECATED_API(settings1.set_cache_size_bytes(kFiveMb));
SUPPRESS_DEPRECATED_DECLARATIONS_BEGIN();
settings1.set_persistence_enabled(true);
settings1.set_cache_size_bytes(kFiveMb);
SUPPRESS_END();

Settings settings2;
settings2.set_host("bar");
settings2.set_ssl_enabled(true);
WITH_DEPRECATED_API(settings2.set_persistence_enabled(true));
WITH_DEPRECATED_API(settings2.set_cache_size_bytes(kFiveMb));
SUPPRESS_DEPRECATED_DECLARATIONS_BEGIN();
settings2.set_persistence_enabled(true);
settings2.set_cache_size_bytes(kFiveMb);
SUPPRESS_END();

Settings settings3;
settings3.set_host("foo");
settings3.set_ssl_enabled(false);
WITH_DEPRECATED_API(settings3.set_persistence_enabled(true));
WITH_DEPRECATED_API(settings3.set_cache_size_bytes(kFiveMb));
SUPPRESS_DEPRECATED_DECLARATIONS_BEGIN();
settings3.set_persistence_enabled(true);
settings3.set_cache_size_bytes(kFiveMb);
SUPPRESS_END();

Settings settings4;
settings4.set_host("foo");
settings4.set_ssl_enabled(true);
WITH_DEPRECATED_API(settings4.set_persistence_enabled(false));
WITH_DEPRECATED_API(settings4.set_cache_size_bytes(kFiveMb));
SUPPRESS_DEPRECATED_DECLARATIONS_BEGIN();
settings4.set_persistence_enabled(false);
settings4.set_cache_size_bytes(kFiveMb);
SUPPRESS_END();

Settings settings5;
settings5.set_host("foo");
settings5.set_ssl_enabled(true);
WITH_DEPRECATED_API(settings5.set_persistence_enabled(true));
WITH_DEPRECATED_API(settings5.set_cache_size_bytes(kSixMb));
SUPPRESS_DEPRECATED_DECLARATIONS_BEGIN();
settings5.set_persistence_enabled(true);
settings5.set_cache_size_bytes(kSixMb);
SUPPRESS_END();

// This is the same as settings4.
Settings settings6;
settings6.set_host("foo");
settings6.set_ssl_enabled(true);
WITH_DEPRECATED_API(settings6.set_persistence_enabled(false));
WITH_DEPRECATED_API(settings6.set_cache_size_bytes(kFiveMb));
SUPPRESS_DEPRECATED_DECLARATIONS_BEGIN();
settings6.set_persistence_enabled(false);
settings6.set_cache_size_bytes(kFiveMb);
SUPPRESS_END();

EXPECT_TRUE(settings1 == settings1);
EXPECT_TRUE(settings6 == settings4);
Expand Down