10000 Fix collection mismatch for `Set` in `Mixed`. by nicola-cab · Pull Request #6802 · realm/realm-core · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix collection mismatch for Set in Mixed. #6802

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
merged 3 commits into from
Jul 19, 2023
Merged

Fix collection mismatch for Set in Mixed. #6802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d841a80
test for verifying Lst<Mixed>::set_collection
nicola-cab Jul 17, 2023
6728ad3
detect collection mismatch for Set in Mixed
nicola-cab Jul 17, 2023
564891c
code review
nicola-cab Jul 18, 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
1 change: 0 additions & 1 deletion src/realm/bplustree.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ class BPlusTreeBase {

bool init_from_parent()
{
;
if (ref_type ref = m_parent->get_child_ref(m_ndx_in_parent)) {
init_from_ref(ref);
return true;
Expand Down
4 changes: 2 additions & 2 deletions src/realm/list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ void Lst<Mixed>::insert(size_t ndx, Mixed value)
ensure_created();
auto sz = size();
CollectionBase::validate_index("insert()", ndx, sz + 1);

if (Replication* repl = Base::get_replication()) {
repl->list_insert(*this, ndx, value, sz);
}
Expand Down Expand Up @@ -464,7 +463,7 @@ void Lst<Mixed>::set_collection(const PathElement& path_elem, CollectionType typ
{
auto ndx = path_elem.get_ndx();
// get will check for ndx out of bounds
Mixed old_val = do_get(ndx, "set()");
Mixed old_val = do_get(ndx, "set_collection()");
Mixed new_val(0, type);

check_level();
Expand Down Expand Up @@ -544,6 +543,7 @@ void Lst<Mixed>::do_insert(size_t ndx, Mixed value)
if (value.is_type(type_TypedLink)) {
Base::set_backlink(m_col_key, value.get<ObjLink>());
}

m_tree->insert(ndx, value);
}

Expand Down
4 changes: 1 addition & 3 deletions src/realm/list.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ class Lst final : public CollectionBaseImpl<LstBase> {
{
if (Base::should_update() || !(m_tree && m_tree->is_attached())) {
bool attached = init_from_parent(true);
Base::update_content_version();
REALM_ASSERT(attached);
Base::update_content_version();
}
}

Expand Down Expand Up @@ -1215,9 +1215,7 @@ void Lst<T>::insert(size_t ndx, T value)

auto sz = size();
CollectionBase::validate_index("insert()", ndx, sz + 1);

ensure_created();

if (Replication* repl = Base::get_replication()) {
repl->list_insert(*this, ndx, value, sz);
}
Expand Down
36 changes: 23 additions & 13 deletions src/realm/set.hpp
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,10 @@ class Set final : public CollectionBaseImpl<SetBase> {
{
if (Base::should_update() || !(m_tree && m_tree->is_attached())) {
bool attached = init_from_parent(true);
if (!attached) {
throw IllegalOperation("This is an ex-set");
}
Base::update_content_version();
REALM_ASSERT(attached);
}
}

Expand All @@ -223,19 +225,28 @@ class Set final : public CollectionBaseImpl<SetBase> {
const ArrayParent* parent = this;
m_tree->set_parent(const_cast<ArrayParent*>(parent), 0);
}

if (m_tree->init_from_parent()) {
// All is well
return true;
try {
auto ref = Base::get_collection_ref();
if (ref) {
m_tree->init_from_ref(ref);
}
else {
if (m_tree->init_from_parent()) {
// All is well
return true;
}
if (!allow_create) {
return false;
}
// The ref in the column was NULL, create the tree in place.
m_tree->create();
REALM_ASSERT(m_tree->is_attached());
}
}

if (!allow_create) {
catch (...) {
m_tree->detach();
return false;
}

// The ref in the column was NULL, create the tree in place.
m_tree->create();
REALM_ASSERT(m_tree->is_attached());
return true;
}

Expand Down Expand Up @@ -665,13 +676,12 @@ REALM_NOINLINE auto Set<T>::find_impl(const T& value) const -> iterator
template <class T>
std::pair<size_t, bool> Set<T>::insert(T value)
{
update();
ensure_created();

if (value_is_null(value) && !m_nullable)
throw InvalidArgument(ErrorCodes::PropertyNotNullable,
util::format("Set: %1", CollectionBase::get_property_name()));

ensure_created();
auto it = find_impl(value);

if (it != this->end() && SetElementEquals<T>{}(*it, value)) {
Expand Down
48 changes: 48 additions & 0 deletions test/object-store/c_api/c_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5088,6 +5088,54 @@ TEST_CASE("C API: nested collections", "[c_api]") {
REQUIRE(size == 5);
}

SECTION("set list for collection in mixed, verify that previous reference is invalid") {
REQUIRE(realm_set_collection(obj1.get(), foo_any_col_key, RLM_COLLECTION_TYPE_LIST));
realm_value_t value;
realm_get_value(obj1.get(), foo_any_col_key, &value);
REQUIRE(value.type == RLM_TYPE_LIST);
auto list = cptr_checked(realm_get_list(obj1.get(), foo_any_col_key));
realm_list_insert_collection(list.get(), 0, RLM_COLLECTION_TYPE_LIST);
auto n_list = cptr_checked(realm_list_get_list(list.get(), 0));
size_t size;
checked(realm_list_size(list.get(), &size));
REQUIRE(size == 1);
realm_list_insert(n_list.get(), 0, rlm_str_val("Test1"));
realm_list_set_collection(list.get(), 0, RLM_COLLECTION_TYPE_DICTIONARY);
// accessor has become invalid
REQUIRE(!realm_list_insert(n_list.get(), 1, rlm_str_val("Test2")));
CHECK_ERR(RLM_ERR_ILLEGAL_OPERATION);
// try to get a dictionary should work
auto n_dict = cptr_checked(realm_list_get_dictionary(list.get(), 0));
bool inserted = false;
size_t ndx;
realm_value_t key = rlm_str_val("key");
realm_value_t val = rlm_str_val("value");
REQUIRE(realm_dictionary_insert(n_dict.get(), key, val, &ndx, &inserted));
REQUIRE(ndx == 0);
REQUIRE(inserted);
realm_list_set_collection(list.get(), 0, RLM_COLLECTION_TYPE_SET);
// accessor invalid
REQUIRE(!realm_dictionary_insert(n_dict.get(), key, val, &ndx, &inserted));
CHECK_ERR(RLM_ERR_ILLEGAL_OPERATION);
auto n_set = cptr_checked(realm_list_get_set(list.get(), 0));
REQUIRE(realm_set_insert(n_set.get(), val, &ndx, &inserted));
REQUIRE(ndx == 0);
REQUIRE(inserted);
realm_list_set_collection(list.get(), 0, RLM_COLLECTION_TYPE_LIST);
// accessor invalid
REQUIRE(!realm_set_insert(n_set.get(), val, &ndx, &inserted));
CHECK_ERR(RLM_ERR_ILLEGAL_OPERATION);
// get a list should work
n_list = cptr_checked(realm_list_get_list(list.get(), 0));
REQUIRE(realm_list_insert(n_list.get(), 0, rlm_str_val("Test1")));
// reset the collection type to the same type (nop)
realm_list_set_collection(list.get(), 0, RLM_COLLECTION_TYPE_LIST);
// accessor is still valid
REQUIRE(realm_list_insert(n_list.get(), 0, rlm_str_val("Test2")));
checked(realm_list_size(n_list.get(), &size));
REQUIRE(size == 2);
}

SECTION("set") {
REQUIRE(realm_set_collection(obj1.get(), foo_any_col_key, RLM_COLLECTION_TYPE_SET));
realm_value_t value;
Expand Down
0