-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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.
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
cel: patch thread safety issue #13739
Merged
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
diff --git a/eval/eval/field_backed_map_impl.cc b/eval/eval/field_backed_map_impl.cc | ||
index cd56f51..4d2a546 100644 | ||
--- a/eval/eval/field_backed_map_impl.cc | ||
+++ b/eval/eval/field_backed_map_impl.cc | ||
@@ -117,7 +117,9 @@ int FieldBackedMapImpl::size() const { | ||
const CelList* FieldBackedMapImpl::ListKeys() const { return key_list_.get(); } | ||
|
||
absl::optional<CelValue> FieldBackedMapImpl::operator[](CelValue key) const { | ||
-#ifdef GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND | ||
+#ifdef XXX_GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND | ||
+ static_assert(false); | ||
+ | ||
// Fast implementation. | ||
google::protobuf::MapKey inner_key; | ||
switch (key.type()) { | ||
@@ -171,7 +173,7 @@ absl::optional<CelValue> FieldBackedMapImpl::operator[](CelValue key) const { | ||
return CreateErrorValue(arena_, status.message()); | ||
} | ||
return result; | ||
-#else // GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND | ||
+#else // XXX_GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND | ||
// Slow implementation. | ||
CelValue result = CelValue::CreateNull(); | ||
CelValue inner_key = CelValue::CreateNull(); | ||
@@ -228,7 +230,7 @@ absl::optional<CelValue> FieldBackedMapImpl::operator[](CelValue key) const { | ||
} | ||
|
||
return {}; | ||
-#endif // GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND | ||
+#endif // XXX_GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND | ||
} | ||
|
||
} // namespace runtime |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a
TODO
explaining when / how the patch can be removed upon protobuf and cel-cpp update?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added an explanation.