Add schema aliases. Use aliases in rename-only deprecations. #6310
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -27,11 +27,20 @@ | |
|
|
||
| namespace dali { | ||
|
|
||
| namespace { | ||
|
|
||
| std::map<string, OpSchema, std::less<>> ®istry() { | ||
| static std::map<string, OpSchema, std::less<>> schema_map; | ||
| return schema_map; | ||
| } | ||
|
|
||
| std::map<string, string, std::less<>> &aliases() { | ||
| static std::map<string, string, std::less<>> alias_map; | ||
| return alias_map; | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| OpSchema &SchemaRegistry::RegisterSchema(std::string_view name) { | ||
| auto &schema_map = registry(); | ||
|
|
||
|
|
@@ -46,20 +55,52 @@ OpSchema &SchemaRegistry::RegisterSchema(std::string_view name) { | |
| } | ||
|
|
||
| const OpSchema &SchemaRegistry::GetSchema(std::string_view name) { | ||
| if (auto *schema = TryGetSchema(name)) | ||
| return *schema; | ||
| else | ||
| throw invalid_key("Schema for operator '" + std::string(name) + "' not registered"); | ||
| } | ||
|
|
||
| const OpSchema *SchemaRegistry::TryGetSchema(std::string_view name) { | ||
| auto &schema_map = registry(); | ||
| auto it = schema_map.find(name); | ||
| if (it == schema_map.end() || !it->second.AliasFor().empty()) { | ||
| auto &alias_map = aliases(); | ||
| auto alias_it = alias_map.find(name); | ||
| if (alias_it != alias_map.end()) { | ||
| name = alias_it->second; | ||
| it = schema_map.find(name); | ||
| } | ||
| } | ||
|
|
||
| if (it == schema_map.end()) | ||
| return nullptr; | ||
|
|
||
| return &it->second; | ||
| } | ||
|
mzient marked this conversation as resolved.
|
||
|
|
||
| void SchemaRegistry::AddAlias(std::string_view alias_name, std::string_view actual_name) { | ||
| if (alias_name == actual_name) | ||
| throw std::invalid_argument("Schema name self-aliasing is forbidden"); | ||
|
|
||
| auto &alias_map = aliases(); | ||
| auto previous_target_it = alias_map.find(alias_name); | ||
| if (previous_target_it != alias_map.end()) | ||
| throw std::invalid_argument(make_string("\"", alias_name, | ||
| "\" is already used as a schema alias name for \"", previous_target_it->second, "\"")); | ||
|
|
||
| for (;;) { | ||
| auto redir = alias_map.find(actual_name); | ||
| if (redir == alias_map.end()) | ||
| break; | ||
| if (redir->second == alias_name) | ||
| throw std::invalid_argument("Cycle detected while adding schema alias."); | ||
| actual_name = redir->second; | ||
| } | ||
|
Comment on lines
+92
to
+99
Contributor
There was a problem hiding this comment.
The This is not a problem today because
Contributor
Author
There was a problem hiding this comment. @greptileai Path compression might fail - but will cycle detection still work?
Contributor
There was a problem hiding this comment. Yes, cycle detection still works correctly regardless of insertion order. The loop traverses Consider the failure case for path compression:
In step 3, the loop does:
The loop doesn't rely on pre-compressed paths — it re-walks The only real outstanding issue is that |
||
| alias_map[std::string(alias_name)] = actual_name; | ||
| } | ||
|
|
||
|
|
||
| const OpSchema &OpSchema::Default() { | ||
| static OpSchema default_schema(DefaultSchemaTag{}); | ||
| return default_schema; | ||
|
|
@@ -380,6 +421,14 @@ OpSchema &OpSchema::Deprecate(std::string version, std::string in_favor_of, | |
| return *this; | ||
| } | ||
|
|
||
| OpSchema &OpSchema::AliasFor(std::string_view actual_name) { | ||
| DALI_ENFORCE(alias_for_.empty(), make_string( | ||
| "The schema \"", name_, "\" is already an alias for \"", alias_for_, "\"")); | ||
|
|
||
| alias_for_ = actual_name; | ||
| SchemaRegistry::AddAlias(name_, actual_name); | ||
| return *this; | ||
| } | ||
|
|
||
| OpSchema &OpSchema::Unserializable() { | ||
| serializable_ = false; | ||
|
|
@@ -826,6 +875,9 @@ const std::string &OpSchema::DeprecatedInFavorOf() const { | |
| return deprecated_in_favor_of_; | ||
| } | ||
|
|
||
| const std::string &OpSchema::AliasFor() const { | ||
| return alias_for_; | ||
| } | ||
|
|
||
| const std::string &OpSchema::DeprecationMessage() const { | ||
| return deprecation_message_; | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.