Skip to content

value_util.cc: Fix MaxValue() to no longer use designated initialization. #9851

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
May 27, 2022
Merged

value_util.cc: Fix MaxValue() to no longer use designated initialization. #9851

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dbc5dd
external_rules.cmake: Pass along FIREBASE_PYTHON_HOST_EXECUTABLE beca…
dconeybe May 26, 2022
f2fb419
value_util.cc: replace designated initialization with manual initiali…
dconeybe May 27, 2022
d491e48
Merge remote-tracking branch 'origin/master' into DesignatedInitializ…
dconeybe May 27, 2022
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
46 changes: 25 additions & 21 deletions Firestore/core/src/model/value_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,26 +53,6 @@ const char* kRawMaxValueFieldValue = "__max__";
pb_bytes_array_s* kMaxValueFieldValue =
nanopb::MakeBytesArray(kRawMaxValueFieldValue);

/** The special map field value entry of a maximum proto value. */
google_firestore_v1_MapValue_FieldsEntry kMaxValueFieldEntry = {
.key = kMaxValueFieldKey,
.value = {
.which_value_type = google_firestore_v1_Value_string_value_tag,
.string_value = const_cast<pb_bytes_array_t*>(kMaxValueFieldValue)}};

/** The special map value of a maximum proto value. */
_google_firestore_v1_MapValue kMaxValueMapValue = {
.fields_count = 1, .fields = &kMaxValueFieldEntry};

/**
* A maximum value that is larger than any other Firestore values. Underlying it
* is a map value with a special map field that SDK user cannot possibly
* construct.
*/
google_firestore_v1_Value kMaxValue = {
.which_value_type = google_firestore_v1_Value_map_value_tag,
.map_value = kMaxValueMapValue};

} // namespace

using nanopb::Message;
Expand Down Expand Up @@ -703,8 +683,32 @@ bool IsMinValue(const google_firestore_v1_Value& value) {
return IsNullValue(value);
}

/**
* Creates and returns a maximum value that is larger than any other Firestore
* values. Underlying it is a map value with a special map field that SDK user
* cannot possibly construct.
*/
google_firestore_v1_Value MaxValue() {
return kMaxValue;
google_firestore_v1_Value value;
value.which_value_type = google_firestore_v1_Value_string_value_tag;
value.string_value = kMaxValueFieldValue;

// Make `field_entry` static so that it has a memory address that outlives
// this function's scope; otherwise, using its address in the `map_value`
// variable below would be invalid by the time the caller accessed it.
static google_firestore_v1_MapValue_FieldsEntry field_entry;
field_entry.key = kMaxValueFieldKey;
field_entry.value = value;

google_firestore_v1_MapValue map_value;
map_value.fields_count = 1;
map_value.fields = &field_entry;

google_firestore_v1_Value max_value;
max_value.which_value_type = google_firestore_v1_Value_map_value_tag;
max_value.map_value = map_value;

return max_value;
}

bool IsMaxValue(const google_firestore_v1_Value& value) {
Expand Down