status-im/realm-js
2
0
Fork 0
mirror of https://github.com/status-im/realm-js.git synced 2025-01-11 14:54:33 +00:00
Code Issues Projects Releases Wiki Activity

property copy schema from cached realms

Browse Source
This commit is contained in:
Ari Lazier 2015-08-12 11:07:06 -07:00
parent 8712c8bc2c
commit cb8364c255
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
shared_realm.cpp
View File

@ -65,11 +65,6 @@ Realm::Realm(Config &config) : m_config(config), m_thread_id(std::this_thread::g
} }
} }
Realm::~Realm()
{
s_global_cache.remove(m_config.path, m_thread_id);
}
Group *Realm::read_group() Group *Realm::read_group()
{ {
if (!m_group) { if (!m_group) {
@ -110,7 +105,12 @@ SharedRealm Realm::get_shared_realm(Config &config)
std::lock_guard<std::mutex> lock(s_init_mutex); std::lock_guard<std::mutex> lock(s_init_mutex);
uint64_t old_version = ObjectStore::get_schema_version(realm->read_group()); uint64_t old_version = ObjectStore::get_schema_version(realm->read_group());
if (!realm->m_config.schema) { if (auto existing = s_global_cache.get_any_realm(realm->config().path)) {
// if there is an existing realm at the current path steal its schema/column mapping
// FIXME - need to validate that schemas match
realm->m_config.schema = std::make_unique<Schema>(*existing->m_config.schema);
}
else if (!realm->m_config.schema) {
// get schema from group and skip validation // get schema from group and skip validation
realm->m_config.schema_version = old_version; realm->m_config.schema_version = old_version;
realm->m_config.schema = std::make_unique<Schema>(ObjectStore::schema_from_group(realm->read_group())); realm->m_config.schema = std::make_unique<Schema>(ObjectStore::schema_from_group(realm->read_group()));
@ -121,11 +121,6 @@ SharedRealm Realm::get_shared_realm(Config &config)
} }
ObjectStore::verify_schema(realm->read_group(), *realm->m_config.schema, true); ObjectStore::verify_schema(realm->read_group(), *realm->m_config.schema, true);
} }
else if(auto existing = s_global_cache.get_any_realm(realm->config().path)) {
// if there is an existing realm at the current path steal its schema/column mapping
// FIXME - need to validate that schemas match
realm->m_config.schema = std::make_unique<Schema>(*existing->m_config.schema);
}
else { else {
// its a non-cached realm so update/migrate if needed // its a non-cached realm so update/migrate if needed
realm->update_schema(*realm->m_config.schema, realm->m_config.schema_version); realm->update_schema(*realm->m_config.schema, realm->m_config.schema_version);
@ -357,11 +352,12 @@ SharedRealm RealmCache::get_any_realm(const std::string &path)
return SharedRealm(); return SharedRealm();
} }
for (auto thread_iter = path_iter->second.begin(); thread_iter != path_iter->second.end(); thread_iter++) { auto thread_iter = path_iter->second.begin();
while (thread_iter != path_iter->second.end()) {
if (auto realm = thread_iter->second.lock()) { if (auto realm = thread_iter->second.lock()) {
return realm; return realm;
} }
path_iter->second.erase(thread_iter); path_iter->second.erase(thread_iter++);
} }
return SharedRealm(); return SharedRealm();

1
shared_realm.hpp
View File

@ -120,7 +120,6 @@ namespace realm {
static RealmCache s_global_cache; static RealmCache s_global_cache;
public: public:
~Realm();
ExternalNotificationFunction m_external_notifier; ExternalNotificationFunction m_external_notifier;
// FIXME private // FIXME private