-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
IF: Use finalizer diffs in instant_finality_extension
- Loading branch information
Showing
17 changed files
with
491 additions
and
74 deletions.
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
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
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
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
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
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
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
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,113 @@ | ||
| #pragma once | ||
|
|
||
| #include <vector> | ||
| #include <utility> | ||
|
|
||
| namespace fc { | ||
|
|
||
| /** | ||
| * @class ordered_diff | ||
| * @brief Provides ability to generate and apply diff of containers of type T | ||
| * | ||
| * Example use: | ||
| * std::vector<char> source = { 'a', 'b', 'f', 'c', 'd' }; | ||
| * std::vector<char> target = { 'b', 'f', 'c', 'd', 'e', 'h' }; | ||
| * ordered_diff<char>::diff_result diff = ordered_diff<char>::diff(source, target); | ||
| * ordered_diff<char>::apply_diff(source, std::move(diff)); | ||
| * assert(source == target); | ||
| * | ||
| * @param T type stored in Container, must provide == | ||
| * @param SizeType numeric type used for index into diff_result, for non-unique Containers a larger type may be required | ||
| * @param Container container type for ordered diff and for diff_result | ||
| */ | ||
| template <typename T, typename SizeType = size_t, template<typename Y, typename...> typename Container = std::vector> | ||
| requires std::equality_comparable<T> && std::random_access_iterator<typename Container<T>::iterator> | ||
| class ordered_diff { | ||
| public: | ||
| struct diff_result { | ||
| Container<SizeType> remove_indexes; | ||
| Container<std::pair<SizeType, T>> insert_indexes; | ||
| }; | ||
|
|
||
| /// Generate diff_result that when `apply_diff(source, diff_result)` will modify source to be equal to target. | ||
| static diff_result diff(const Container<T>& source, const Container<T>& target) { | ||
| size_t s = 0; | ||
| size_t t = 0; | ||
|
|
||
| diff_result result; | ||
| while (s < source.size() || t < target.size()) { | ||
| if (s < source.size() && t < target.size()) { | ||
| if (source[s] == target[t]) { | ||
| // nothing to do, skip over | ||
| assert(s <= std::numeric_limits<SizeType>::max()); | ||
| assert(t <= std::numeric_limits<SizeType>::max()); | ||
| ++s; | ||
| ++t; | ||
| } else { // not equal | ||
| if (s == source.size() - 1 && t == target.size() - 1) { | ||
| // both at end, insert target and remove source | ||
| assert(s <= std::numeric_limits<SizeType>::max()); | ||
| assert(t <= std::numeric_limits<SizeType>::max()); | ||
| result.remove_indexes.push_back(s); | ||
| result.insert_indexes.emplace_back(t, target[t]); | ||
| ++s; | ||
| ++t; | ||
| } else if (s + 1 < source.size() && t + 1 < target.size() && source[s + 1] == target[t + 1]) { | ||
| // misalignment, but next value equal, insert and remove | ||
| assert(s <= std::numeric_limits<SizeType>::max()); | ||
| assert(t <= std::numeric_limits<SizeType>::max()); | ||
| result.remove_indexes.push_back(s); | ||
| result.insert_indexes.emplace_back(t, target[t]); | ||
| ++s; | ||
| ++t; | ||
| } else if (t + 1 < target.size() && source[s] == target[t + 1]) { | ||
| // source equals next target, insert current target | ||
| assert(t <= std::numeric_limits<SizeType>::max()); | ||
| result.insert_indexes.emplace_back(t, target[t]); | ||
| ++t; | ||
| } else { // source[s + 1] == target[t] | ||
| // target matches next source, remove current source | ||
| assert(s <= std::numeric_limits<SizeType>::max()); | ||
| result.remove_indexes.push_back(s); | ||
| ++s; | ||
| } | ||
| } | ||
| } else if (s < source.size()) { | ||
| // remove extra in source | ||
| assert(s <= std::numeric_limits<SizeType>::max()); | ||
| result.remove_indexes.push_back(s); | ||
| ++s; | ||
| } else if (t < target.size()) { | ||
| // insert extra in target | ||
| assert(t <= std::numeric_limits<SizeType>::max()); | ||
| result.insert_indexes.emplace_back(t, target[t]); | ||
| ++t; | ||
| } | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| /// @param diff the diff_result created from diff(source, target), apply_diff(std::move(source), diff_result) => target | ||
| /// @param container the source of diff(source, target) to modify using the diff_result to produce original target | ||
| /// @return the modified container now equal to original target | ||
| template <typename X> | ||
| requires std::same_as<std::decay_t<X>, diff_result> | ||
| static Container<T> apply_diff(Container<T>&& container, X&& diff) { | ||
| // Remove from the source based on diff.remove_indexes | ||
| std::ptrdiff_t offset = 0; | ||
| for (SizeType index : diff.remove_indexes) { | ||
| container.erase(container.begin() + index + offset); | ||
| --offset; | ||
| } | ||
|
|
||
| // Insert into the source based on diff.insert_indexes | ||
| for (auto& [index, value] : diff.insert_indexes) { | ||
| container.insert(container.begin() + index, std::move(value)); | ||
| } | ||
| return container; | ||
| } | ||
|
|
||
| }; // class ordered_diff | ||
|
|
||
| } // namespace fc |
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
Oops, something went wrong.