Skip to content
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

Pass callback and user data by value in realm_mongo_collection_<func> #6307

Merged
merged 1 commit into from
Feb 16, 2023
Merged

Pass callback and user data by value in realm_mongo_collection_<func> #6307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions src/realm/object-store/c_api/app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ RLM_API bool realm_mongo_collection_find(realm_mongodb_collection_t* collection,
return wrap_err([&] {
collection->find_bson(convert_to_bson<bson::BsonDocument>(filter_ejson),
to_mongodb_collection_find_options(options),
[&](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only a minimal thing, I think the only thing you need to capture by copy is the callback, the rest of the data can be passed by reference. Although in 99% of the case, we are copying a ptr (thus equivalent to passing the arguments by reference), for realm_string_t filter_ejson we will be copying sizeof(ptr) + sizeof(size_t) bytes.
Not a big issue, since the amount of data copied will always be constant.

Copy link
Contributor Author

@desistefanova desistefanova Feb 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to pass by value data, delete_data and callback. Otherwise when I receive the callback I can't access the data object. I can change it to [data, delete_data, callback] instead of [=], if you say that it is better.

handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand All @@ -965,7 +965,7 @@ RLM_API bool realm_mongo_collection_find_one(realm_mongodb_collection_t* collect
return wrap_err([&] {
collection->find_one_bson(
convert_to_bson<bson::BsonDocument>(filter_ejson), to_mongodb_collection_find_options(options),
[&](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand All @@ -980,7 +980,7 @@ RLM_API bool realm_mongo_collection_aggregate(realm_mongodb_collection_t* collec
return wrap_err([&] {
collection->aggregate_bson(
convert_to_bson<bson::BsonArray>(filter_ejson),
[&](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand All @@ -994,7 +994,7 @@ RLM_API bool realm_mongo_collection_count(realm_mongodb_collection_t* collection
REALM_ASSERT(collection);
return wrap_err([&] {
collection->count_bson(convert_to_bson<bson::BsonDocument>(filter_ejson), limit,
[&](util::Optional<bson::Bson> bson, util::Optional<app::AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<app::AppError> app_error) {
handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand All @@ -1009,7 +1009,7 @@ RLM_API bool realm_mongo_collection_insert_one(realm_mongodb_collection_t* colle
return wrap_err([&] {
collection->insert_one_bson(
convert_to_bson<bson::BsonDocument>(filter_ejson),
[&](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand All @@ -1024,7 +1024,7 @@ RLM_API bool realm_mongo_collection_insert_many(realm_mongodb_collection_t* coll
return wrap_err([&] {
collection->insert_many_bson(
convert_to_bson<bson::BsonArray>(filter_ejson),
[&](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand All @@ -1039,7 +1039,7 @@ RLM_API bool realm_mongo_collection_delete_one(realm_mongodb_collection_t* colle
return wrap_err([&] {
collection->delete_one_bson(
convert_to_bson<bson::BsonDocument>(filter_ejson),
[&](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand All @@ -1054,7 +1054,7 @@ RLM_API bool realm_mongo_collection_delete_many(realm_mongodb_collection_t* coll
return wrap_err([&] {
collection->delete_many_bson(
convert_to_bson<bson::BsonDocument>(filter_ejson),
[&](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand All @@ -1072,7 +1072,7 @@ RLM_API bool realm_mongo_collection_update_one(realm_mongodb_collection_t* colle
const auto& bson_update = convert_to_bson<bson::BsonDocument>(update_ejson);
collection->update_one_bson(
bson_filter, bson_update, upsert,
[&](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand All @@ -1090,7 +1090,7 @@ RLM_API bool realm_mongo_collection_update_many(realm_mongodb_collection_t* coll
const auto& bson_update = convert_to_bson<bson::BsonDocument>(update_ejson);
collection->update_many_bson(
bson_filter, bson_update, upsert,
[&](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand All @@ -1109,7 +1109,7 @@ RLM_API bool realm_mongo_collection_find_one_and_update(realm_mongodb_collection
const auto& bson_update = convert_to_bson<bson::BsonDocument>(update_ejson);
collection->find_one_and_update_bson(
bson_filter, bson_update, to_mongodb_collection_find_one_and_modify_options(options),
[&](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand All @@ -1127,7 +1127,7 @@ RLM_API bool realm_mongo_collection_find_one_and_replace(
const auto& replacement_bson = convert_to_bson<bson::BsonDocument>(replacement_ejson);
collection->find_one_and_replace_bson(
filter_bson, replacement_bson, to_mongodb_collection_find_one_and_modify_options(options),
[&](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand All @@ -1145,7 +1145,7 @@ RLM_API bool realm_mongo_collection_find_one_and_delete(realm_mongodb_collection
const auto& bson_filter = convert_to_bson<bson::BsonDocument>(filter_ejson);
collection->find_one_and_delete_bson(
bson_filter, to_mongodb_collection_find_one_and_modify_options(options),
[&](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
[=](util::Optional<bson::Bson> bson, util::Optional<AppError> app_error) {
handle_mongodb_collection_result(bson, app_error, {data, delete_data}, callback);
});
return true;
Expand Down