Skip to content

Mila/multi db #1321

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
milaGGL merged 23 commits into from
May 19, 2023
Merged

Mila/multi db #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
bd7a8df
Mila/multi db add get instance header (#1267)
milaGGL Apr 13, 2023
6a9e36b
Pass database_id from GetInstance() down to CreateFirestore() (#1270)
milaGGL Apr 14, 2023
3c2dc25
Update FirestoreCache key type (#1272)
milaGGL May 9, 2023
23269f7
Merge branch 'main' into mila/MultiDB
milaGGL May 12, 2023
1e4ae74
Enable multi database in android (#1318)
milaGGL May 15, 2023
a1c053b
Merge branch 'main' into mila/MultiDB
milaGGL May 16, 2023
40b05d9
format
milaGGL May 16, 2023
d4d5778
Update release_build_files/readme.md
milaGGL May 16, 2023
387ab6d
format
milaGGL May 16, 2023
0c1f503
Merge branch 'mila/MultiDB' of https://github.com/firebase/firebase-c…
milaGGL May 16, 2023
45199ba
add the task id to the TODO comments
milaGGL May 16, 2023
4c76921
refactor
milaGGL May 16, 2023
f2c9323
Delete .name
milaGGL May 16, 2023
b65cffd
Merge branch 'main' into mila/MultiDB
milaGGL May 18, 2023
158986f
try using this->databaseId() in android
milaGGL May 18, 2023
7639a73
update firestore_test file
milaGGL May 18, 2023
a3b7495
Revert "update firestore_test file"
milaGGL May 18, 2023
2ccf668
Revert "try using this->databaseId() in android"
milaGGL May 18, 2023
7f12232
set up global macro to run against emulator
milaGGL May 18, 2023
a2112d0
use const std::string&
milaGGL May 19, 2023
5bc40c8
Update integration_test_util.cc
milaGGL May 19, 2023
6cf1ba7
use std::move() on key
milaGGL May 19, 2023
24b7c1a
Merge branch 'main' into mila/MultiDB
milaGGL May 19, 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
18 changes: 13 additions & 5 deletions firestore/integration_test_internal/src/firestore_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,19 @@ Firestore* FirestoreIntegrationTest::TestFirestore(
return TestFirestoreWithProjectId(name, /*project_id=*/"");
}

Firestore* FirestoreIntegrationTest::TestFirestoreWithDatabaseId(
const std::string& name, const std::string& database_id) const {
return TestFirestoreWithProjectId(name, /*project_id=*/"", database_id);
}

Firestore* FirestoreIntegrationTest::TestFirestoreWithProjectId(
const std::string& name, const std::string& project_id) const {
const std::string& name,
const std::string& project_id,
const std::string& database_id) const {
for (const auto& entry : firestores_) {
const FirestoreInfo& firestore_info = entry.second;
if (firestore_info.name() == name) {
if (firestore_info.name() == name &&
firestore_info.database_id() == database_id) {
return firestore_info.firestore();
}
}
Expand All @@ -129,9 +137,9 @@ Firestore* FirestoreIntegrationTest::TestFirestoreWithProjectId(
if (apps_.find(app) == apps_.end()) {
apps_[app] = std::unique_ptr<App>(app);
}

Firestore* db = new Firestore(CreateTestFirestoreInternal(app));
firestores_[db] = FirestoreInfo(name, std::unique_ptr<Firestore>(db));
Firestore* db = new Firestore(CreateTestFirestoreInternal(app, database_id));
firestores_[db] =
FirestoreInfo(name, database_id, std::unique_ptr<Firestore>(db));

firestore::LocateEmulator(db);
return db;
Expand Down
28 changes: 22 additions & 6 deletions firestore/integration_test_internal/src/firestore_integration_test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <mutex>
#include <string>
#include <unordered_map>
#include <utility>
#include <vector>

#include "app/meta/move.h"
Expand All @@ -49,7 +50,8 @@ const int kCheckIntervalMillis = 100;
// The timeout of waiting for a Future or a listener.
const int kTimeOutMillis = 15000;

FirestoreInternal* CreateTestFirestoreInternal(App* app);
FirestoreInternal* CreateTestFirestoreInternal(
App* app, const std::string& database_id = kDefaultDatabase);

App* GetApp();
App* GetApp(const char* name, const std::string& override_project_id);
Expand Down Expand Up @@ -252,9 +254,16 @@ class FirestoreIntegrationTest : public testing::Test {
Firestore* TestFirestore(const std::string& name = kDefaultAppName) const;

// Returns a Firestore instance for an app with the given `name`, associated
// with the database with the given `project_id`.
Firestore* TestFirestoreWithProjectId(const std::string& name,
const std::string& project_id) const;
// with the database with the given `project_id` and default `database_id`.
Firestore* TestFirestoreWithProjectId(
const std::string& name,
const std::string& project_id,
const std::string& database_id = kDefaultDatabase) const;

// Returns a Firestore instance for an app with the given `name`, associated
// with the database with the given `database_id`.
Firestore* TestFirestoreWithDatabaseId(const std::string& name,
const std::string& database_id) const;

// Deletes the given `Firestore` instance, which must have been returned by a
// previous invocation of `TestFirestore()`, and removes it from the cache of
Expand Down Expand Up @@ -419,15 +428,22 @@ class FirestoreIntegrationTest : public testing::Test {
class FirestoreInfo {
public:
FirestoreInfo() = default;
FirestoreInfo(const std::string& name, std::unique_ptr<Firestore> firestore)
: name_(name), firestore_(std::move(firestore)) {}
FirestoreInfo(const std::string& name,
const std::string& database_id,
std::unique_ptr<Firestore> firestore)
: name_(name),
database_id_(database_id),
firestore_(std::move(firestore)) {}

const std::string& name() const { return name_; }
Firestore* firestore() const { return firestore_.get(); }
const std::string& database_id() const { return database_id_; }

void ReleaseFirestore() { firestore_.release(); }

private:
std::string name_;
std::string database_id_;
std::unique_ptr<Firestore> firestore_;
};

Expand Down
Loading