Skip to content

Commit ded9c2e

Browse files
wu-huiwu-hui
committed
No more core from common
1 parent b757139 commit ded9c2e

File tree

5 files changed

+81
-71
lines changed

5 files changed

+81
-71
lines changed

‎firestore/src/common/local_cache_settings.cc

+27-40
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "firestore/src/include/firebase/firestore/local_cache_settings.h"
1818
#include <memory>
1919

20-
#include "Firestore/core/src/api/settings.h"
2120
#include "firestore/src/common/hard_assert_common.h"
2221
#if defined(__ANDROID__)
2322
#else
@@ -27,55 +26,44 @@
2726
namespace firebase {
2827
namespace firestore {
2928

30-
namespace {
31-
using CoreCacheSettings = api::LocalCacheSettings;
32-
using CorePersistentSettings = api::PersistentCacheSettings;
33-
using CoreMemorySettings = api::MemoryCacheSettings;
34-
using CoreMemoryGarbageCollectorSettings = api::MemoryGargabeCollectorSettings;
35-
using CoreMemoryEagerGcSettings = api::MemoryEagerGcSettings;
36-
using CoreMemoryLruGcSettings = api::MemoryLruGcSettings;
37-
} // namespace
38-
3929
PersistentCacheSettings PersistentCacheSettings::Create() { return {}; }
4030

4131
PersistentCacheSettings::PersistentCacheSettings() {
42-
settings_internal_ = std::make_shared<PersistentCacheSettingsInternal>(
43-
CorePersistentSettings{});
32+
settings_internal_ = std::make_shared<PersistentCacheSettingsInternal>();
4433
}
4534

4635
PersistentCacheSettings PersistentCacheSettings::WithSizeBytes(
4736
int64_t size) const {
48-
PersistentCacheSettings new_settings{*this};
49-
new_settings.settings_internal_->set_core_settings(
50-
new_settings.settings_internal_->core_settings().WithSizeBytes(size));
37+
PersistentCacheSettings new_settings;
38+
new_settings.settings_internal_ =
39+
std::make_shared<PersistentCacheSettingsInternal>(
40+
this->settings_internal_->WithSizeBytes(size));
5141
return new_settings;
5242
}
5343

5444
int64_t PersistentCacheSettings::size_bytes() const {
55-
return settings_internal_->core_settings().size_bytes();
45+
return settings_internal_->size_bytes();
5646
}
5747

58-
const CoreCacheSettings& PersistentCacheSettings::core_settings() const {
59-
return settings_internal_->core_settings();
48+
const LocalCacheSettingsInternal& PersistentCacheSettings::internal() const {
49+
return *settings_internal_;
6050
}
6151

6252
MemoryEagerGCSettings MemoryEagerGCSettings::Create() { return {}; }
6353

6454
MemoryEagerGCSettings::MemoryEagerGCSettings() {
65-
settings_internal_ = std::make_shared<MemoryEagerGCSettingsInternal>(
66-
CoreMemoryEagerGcSettings{});
55+
settings_internal_ = std::make_shared<MemoryEagerGCSettingsInternal>();
6756
}
6857

69-
const CoreMemoryGarbageCollectorSettings& MemoryEagerGCSettings::core_settings()
58+
const MemoryGarbageCollectorSettingsInternal& MemoryEagerGCSettings::internal()
7059
const {
71-
return settings_internal_->core_settings();
60+
return *settings_internal_;
7261
}
7362

7463
MemoryLruGCSettings MemoryLruGCSettings::Create() { return {}; }
7564

7665
MemoryLruGCSettings::MemoryLruGCSettings() {
77-
settings_internal_ =
78-
std::make_shared<MemoryLruGCSettingsInternal>(CoreMemoryLruGcSettings{});
66+
settings_internal_ = std::make_shared<MemoryLruGCSettingsInternal>();
7967
}
8068

8169
MemoryLruGCSettings::MemoryLruGCSettings(
@@ -84,42 +72,41 @@ MemoryLruGCSettings::MemoryLruGCSettings(
8472
}
8573

8674
MemoryLruGCSettings MemoryLruGCSettings::WithSizeBytes(int64_t size) {
87-
return {MemoryLruGCSettingsInternal{
88-
settings_internal_->core_settings().WithSizeBytes(size)}};
75+
MemoryLruGCSettings result;
76+
result.settings_internal_ = std::make_shared<MemoryLruGCSettingsInternal>(
77+
this->settings_internal_->WithSizeBytes(size));
78+
return result;
8979
}
9080

9181
int64_t MemoryLruGCSettings::size_bytes() const {
92-
return settings_internal_->core_settings().size_bytes();
82+
return settings_internal_->size_bytes();
9383
}
9484

95-
const CoreMemoryGarbageCollectorSettings& MemoryLruGCSettings::core_settings()
85+
const MemoryGarbageCollectorSettingsInternal& MemoryLruGCSettings::internal()
9686
const {
97-
return settings_internal_->core_settings();
87+
return *settings_internal_;
9888
}
9989

10090
MemoryCacheSettings MemoryCacheSettings::Create() { return {}; }
10191

10292
MemoryCacheSettings::MemoryCacheSettings() {
103-
settings_internal_ =
104-
std::make_shared<MemoryCacheSettingsInternal>(CoreMemorySettings{});
93+
settings_internal_ = std::make_shared<MemoryCacheSettingsInternal>();
10594
}
10695

10796
MemoryCacheSettings MemoryCacheSettings::WithGarbageCollectorSettings(
10897
const MemoryGarbageCollectorSettings& settings) const {
109-
MemoryCacheSettings result{*this};
110-
CoreMemorySettings core_settings = result.settings_internal_->core_settings();
111-
result.settings_internal_->set_core_settings(
112-
core_settings.WithMemoryGarbageCollectorSettings(
113-
settings.core_settings()));
98+
MemoryCacheSettings result;
99+
result.settings_internal_ = std::make_shared<MemoryCacheSettingsInternal>(
100+
this->settings_internal_->WithGarbageCollectorSettings(settings));
114101
return result;
115102
}
116103

117-
const CoreCacheSettings& MemoryCacheSettings::core_settings() const {
118-
return settings_internal_->core_settings();
104+
const LocalCacheSettingsInternal& MemoryCacheSettings::internal() const {
105+
return *settings_internal_;
119106
}
120107

121108
bool operator==(const LocalCacheSettings& lhs, const LocalCacheSettings& rhs) {
122-
return lhs.kind() == rhs.kind() && lhs.core_settings() == rhs.core_settings();
109+
return lhs.kind() == rhs.kind() && lhs.internal() == rhs.internal();
123110
}
124111

125112
bool operator==(const MemoryCacheSettings& lhs,
@@ -134,7 +121,7 @@ bool operator==(const PersistentCacheSettings& lhs,
134121

135122
bool operator==(const MemoryGarbageCollectorSettings& lhs,
136123
const MemoryGarbageCollectorSettings& rhs) {
137-
return lhs.core_settings() == rhs.core_settings();
124+
return lhs.internal() == rhs.internal();
138125
}
139126

140127
bool operator==(const MemoryEagerGCSettings& lhs,

‎firestore/src/common/settings.cc

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <ostream>
2121
#include <sstream>
2222

23-
#include "Firestore/core/src/api/settings.h"
2423
#include "Firestore/core/src/util/hard_assert.h"
2524
#include "app/meta/move.h"
2625
#include "firebase/firestore/local_cache_settings.h"

‎firestore/src/include/firebase/firestore/local_cache_settings.h

+13-14
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,13 @@
2424

2525
namespace firebase {
2626
namespace firestore {
27-
namespace api {
28-
class LocalCacheSettings;
29-
class MemoryGargabeCollectorSettings;
30-
} // namespace api
3127

28+
class LocalCacheSettingsInternal;
3229
class PersistentCacheSettingsInternal;
3330
class MemoryCacheSettingsInternal;
3431
class MemoryLruGCSettingsInternal;
3532
class MemoryEagerGCSettingsInternal;
33+
class MemoryGarbageCollectorSettingsInternal;
3634

3735
/**
3836
* Abstract class implemented by all supported cache settings.
@@ -42,15 +40,16 @@ class MemoryEagerGCSettingsInternal;
4240
*/
4341
class LocalCacheSettings {
4442
public:
43+
enum class Kind { kMemory, kPersistent };
44+
4545
virtual ~LocalCacheSettings() = default;
4646

47+
virtual Kind kind() const = 0;
48+
4749
/** Equality function. */
4850
friend bool operator==(const LocalCacheSettings& lhs,
4951
const LocalCacheSettings& rhs);
5052

51-
protected:
52-
enum class Kind { kMemory, kPersistent };
53-
5453
private:
5554
friend class FirestoreInternal;
5655
friend class Settings;
@@ -59,8 +58,7 @@ class LocalCacheSettings {
5958

6059
LocalCacheSettings() = default;
6160

62-
virtual Kind kind() const = 0;
63-
virtual const api::LocalCacheSettings& core_settings() const = 0;
61+
virtual const LocalCacheSettingsInternal& internal() const = 0;
6462
};
6563

6664
/**
@@ -114,7 +112,7 @@ class PersistentCacheSettings final : public LocalCacheSettings {
114112
}
115113

116114
// Get the corresponding settings object from the core sdk.
117-
const api::LocalCacheSettings& core_settings() const override;
115+
const LocalCacheSettingsInternal& internal() const override;
118116

119117
std::shared_ptr<PersistentCacheSettingsInternal> settings_internal_;
120118
};
@@ -155,7 +153,7 @@ class MemoryCacheSettings final : public LocalCacheSettings {
155153
return LocalCacheSettings::Kind::kMemory;
156154
}
157155

158-
const api::LocalCacheSettings& core_settings() const override;
156+
const LocalCacheSettingsInternal& internal() const override;
159157

160158
std::shared_ptr<MemoryCacheSettingsInternal> settings_internal_;
161159
};
@@ -178,10 +176,11 @@ class MemoryGarbageCollectorSettings {
178176
friend class MemoryCacheSettings;
179177
friend class MemoryEagerGCSettings;
180178
friend class MemoryLruGCSettings;
179+
friend class MemoryCacheSettingsInternal;
181180

182181
MemoryGarbageCollectorSettings() = default;
183182

184-
virtual const api::MemoryGargabeCollectorSettings& core_settings() const = 0;
183+
virtual const MemoryGarbageCollectorSettingsInternal& internal() const = 0;
185184
};
186185

187186
/**
@@ -211,7 +210,7 @@ class MemoryEagerGCSettings final : public MemoryGarbageCollectorSettings {
211210
private:
212211
friend class MemoryCacheSettings;
213212
MemoryEagerGCSettings();
214-
const api::MemoryGargabeCollectorSettings& core_settings() const override;
213+
const MemoryGarbageCollectorSettingsInternal& internal() const override;
215214

216215
std::shared_ptr<MemoryEagerGCSettingsInternal> settings_internal_;
217216
};
@@ -267,7 +266,7 @@ class MemoryLruGCSettings final : public MemoryGarbageCollectorSettings {
267266
MemoryLruGCSettings();
268267
MemoryLruGCSettings(const MemoryLruGCSettingsInternal& other);
269268

270-
const api::MemoryGargabeCollectorSettings& core_settings() const override;
269+
const MemoryGarbageCollectorSettingsInternal& internal() const override;
271270

272271
std::shared_ptr<MemoryLruGCSettingsInternal> settings_internal_;
273272
};

‎firestore/src/main/firestore_main.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ void FirestoreInternal::set_settings(Settings from) {
221221
// this special logic should go away when legacy cache config is removed.
222222
if (from.cache_settings_source_ == Settings::CacheSettingsSource::kNew) {
223223
settings.set_local_cache_settings(
224-
from.local_cache_settings().core_settings());
224+
from.local_cache_settings().internal().core_settings());
225225
} else {
226226
settings.set_persistence_enabled(from.is_persistence_enabled());
227227
settings.set_cache_size_bytes(from.cache_size_bytes());

‎firestore/src/main/local_cache_settings_main.h

+40-15
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,39 @@
2121
#include <utility>
2222

2323
#include "Firestore/core/src/api/settings.h"
24+
#include "firebase/firestore/local_cache_settings.h"
2425

2526
namespace firebase {
2627
namespace firestore {
2728

2829
class LocalCacheSettingsInternal {
2930
public:
31+
friend bool operator==(const LocalCacheSettingsInternal& lhs,
32+
const LocalCacheSettingsInternal& rhs) {
33+
return &lhs == &rhs || lhs.core_settings() == rhs.core_settings();
34+
}
35+
3036
virtual const api::LocalCacheSettings& core_settings() const = 0;
3137
};
3238

3339
class PersistentCacheSettingsInternal final
3440
: public LocalCacheSettingsInternal {
3541
public:
36-
explicit PersistentCacheSettingsInternal(
37-
const api::PersistentCacheSettings& core_settings)
38-
: settings_(std::move(core_settings)) {}
42+
explicit PersistentCacheSettingsInternal() = default;
3943

4044
friend bool operator==(const PersistentCacheSettingsInternal& lhs,
4145
const PersistentCacheSettingsInternal& rhs) {
4246
return &lhs == &rhs || lhs.settings_ == rhs.settings_;
4347
}
4448

49+
PersistentCacheSettingsInternal WithSizeBytes(int64_t size) {
50+
PersistentCacheSettingsInternal result;
51+
result.set_core_settings(this->core_settings().WithSizeBytes(size));
52+
return result;
53+
}
54+
55+
int64_t size_bytes() const { return settings_.size_bytes(); }
56+
4557
const api::PersistentCacheSettings& core_settings() const override {
4658
return settings_;
4759
}
@@ -55,15 +67,18 @@ class PersistentCacheSettingsInternal final
5567

5668
class MemoryGarbageCollectorSettingsInternal {
5769
public:
70+
friend bool operator==(const MemoryGarbageCollectorSettingsInternal& lhs,
71+
const MemoryGarbageCollectorSettingsInternal& rhs) {
72+
return &lhs == &rhs || lhs.core_settings() == rhs.core_settings();
73+
}
74+
5875
virtual const api::MemoryGargabeCollectorSettings& core_settings() const = 0;
5976
};
6077

6178
class MemoryEagerGCSettingsInternal final
6279
: public MemoryGarbageCollectorSettingsInternal {
6380
public:
64-
explicit MemoryEagerGCSettingsInternal(
65-
const api::MemoryEagerGcSettings& core_settings)
66-
: settings_(std::move(core_settings)) {}
81+
explicit MemoryEagerGCSettingsInternal() = default;
6782

6883
friend bool operator==(const MemoryEagerGCSettingsInternal& lhs,
6984
const MemoryEagerGCSettingsInternal& rhs) {
@@ -84,15 +99,21 @@ class MemoryEagerGCSettingsInternal final
8499
class MemoryLruGCSettingsInternal final
85100
: public MemoryGarbageCollectorSettingsInternal {
86101
public:
87-
explicit MemoryLruGCSettingsInternal(
88-
const api::MemoryLruGcSettings& core_settings)
89-
: settings_(std::move(core_settings)) {}
102+
explicit MemoryLruGCSettingsInternal() = default;
90103

91104
friend bool operator==(const MemoryLruGCSettingsInternal& lhs,
92105
const MemoryLruGCSettingsInternal& rhs) {
93106
return &lhs == &rhs || lhs.settings_ == rhs.settings_;
94107
}
95108

109+
MemoryLruGCSettingsInternal WithSizeBytes(int64_t size) {
110+
MemoryLruGCSettingsInternal result;
111+
result.set_core_settings(this->core_settings().WithSizeBytes(size));
112+
return result;
113+
}
114+
115+
int64_t size_bytes() const { return settings_.size_bytes(); }
116+
96117
const api::MemoryLruGcSettings& core_settings() const override {
97118
return settings_;
98119
}
@@ -106,23 +127,27 @@ class MemoryLruGCSettingsInternal final
106127

107128
class MemoryCacheSettingsInternal final : public LocalCacheSettingsInternal {
108129
public:
109-
explicit MemoryCacheSettingsInternal(
110-
const api::MemoryCacheSettings& core_settings)
111-
: settings_(std::move(core_settings)) {}
130+
explicit MemoryCacheSettingsInternal() = default;
112131

113132
friend bool operator==(const MemoryCacheSettingsInternal& lhs,
114133
const MemoryCacheSettingsInternal& rhs) {
115134
return &lhs == &rhs || lhs.settings_ == rhs.settings_;
116135
}
117136

137+
MemoryCacheSettingsInternal WithGarbageCollectorSettings(
138+
const MemoryGarbageCollectorSettings& gc_settings) {
139+
return MemoryCacheSettingsInternal(
140+
api::MemoryCacheSettings().WithMemoryGarbageCollectorSettings(
141+
gc_settings.internal().core_settings()));
142+
}
143+
118144
const api::MemoryCacheSettings& core_settings() const override {
119145
return settings_;
120146
}
121-
void set_core_settings(const api::MemoryCacheSettings& settings) {
122-
settings_ = settings;
123-
}
124147

125148
private:
149+
explicit MemoryCacheSettingsInternal(const api::MemoryCacheSettings& settings)
150+
: settings_(settings) {}
126151
api::MemoryCacheSettings settings_;
127152
};
128153

0 commit comments

Comments
 (0)