-
Notifications
You must be signed in to change notification settings - Fork 123
feat: add fallible iterator utility #905
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
be8c5f5
feat: add fallible iterator utility
manuzhang dd09c46
fix: address iterator review feedback
manuzhang 5a6ca6f
fix: make iterator termination sticky
manuzhang de45a78
fix: simplify iterator customization
manuzhang dc47277
perf: collect iterator values directly
manuzhang cc2fdeb
fix: support copy-only iterator values with libc++
manuzhang 2ccc53d
Clarify comments on vector growth for copy-only types
wgtmac 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 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 |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| #include "iceberg/util/iterator.h" | ||
|
|
||
| #include <memory> | ||
| #include <optional> | ||
| #include <type_traits> | ||
| #include <vector> | ||
|
|
||
| #include <gtest/gtest.h> | ||
|
|
||
| #include "iceberg/test/matchers.h" | ||
|
|
||
| namespace iceberg { | ||
| namespace { | ||
|
|
||
| class CopyOnly { | ||
| public: | ||
| explicit CopyOnly(int value) : value_(value) {} | ||
|
|
||
| CopyOnly(const CopyOnly&) = default; | ||
| CopyOnly& operator=(const CopyOnly&) = default; | ||
| CopyOnly(CopyOnly&&) = delete; | ||
| CopyOnly& operator=(CopyOnly&&) = delete; | ||
|
|
||
| int value() const { return value_; } | ||
|
|
||
| private: | ||
| int value_; | ||
| }; | ||
|
|
||
| static_assert(std::is_copy_constructible_v<CopyOnly>); | ||
| static_assert(!std::is_move_constructible_v<CopyOnly>); | ||
|
|
||
| class CopyOnlyIterator final : public Iterator<CopyOnly> { | ||
| public: | ||
| Result<std::optional<CopyOnly>> Next() override { | ||
| if (next_ == 3) { | ||
| return Result<std::optional<CopyOnly>>(std::in_place, std::nullopt); | ||
| } | ||
| return Result<std::optional<CopyOnly>>(std::in_place, std::in_place, next_++); | ||
| } | ||
|
|
||
| private: | ||
| int next_ = 0; | ||
| }; | ||
|
|
||
| class MoveOnlyIterator final : public Iterator<std::unique_ptr<int>> { | ||
| public: | ||
| Result<std::optional<std::unique_ptr<int>>> Next() override { | ||
| if (next_ == 3) { | ||
| return Result<std::optional<std::unique_ptr<int>>>(std::in_place, | ||
| std::nullopt); | ||
| } | ||
| return Result<std::optional<std::unique_ptr<int>>>( | ||
| std::in_place, std::in_place, std::make_unique<int>(next_++)); | ||
| } | ||
|
|
||
| private: | ||
| int next_ = 0; | ||
| }; | ||
|
|
||
| class FailingIterator final : public Iterator<int> { | ||
| public: | ||
| Result<std::optional<int>> Next() override { return Invalid("iteration failed"); } | ||
| }; | ||
|
|
||
| TEST(IteratorTest, ToVectorSupportsCopyOnlyValues) { | ||
| CopyOnlyIterator iterator; | ||
|
|
||
| ICEBERG_UNWRAP_OR_FAIL(auto values, iterator.ToVector()); | ||
|
|
||
| ASSERT_EQ(values.size(), 3); | ||
| EXPECT_EQ(values[0].value(), 0); | ||
| EXPECT_EQ(values[1].value(), 1); | ||
| EXPECT_EQ(values[2].value(), 2); | ||
| } | ||
|
|
||
| TEST(IteratorTest, ToVectorSupportsMoveOnlyValues) { | ||
| MoveOnlyIterator iterator; | ||
|
|
||
| ICEBERG_UNWRAP_OR_FAIL(auto values, iterator.ToVector()); | ||
|
|
||
| ASSERT_EQ(values.size(), 3); | ||
| EXPECT_EQ(*values[0], 0); | ||
| EXPECT_EQ(*values[1], 1); | ||
| EXPECT_EQ(*values[2], 2); | ||
| } | ||
|
|
||
| TEST(IteratorTest, ToVectorPropagatesErrors) { | ||
| FailingIterator iterator; | ||
|
|
||
| auto result = iterator.ToVector(); | ||
|
|
||
| EXPECT_THAT(result, IsError(ErrorKind::kInvalid)); | ||
| EXPECT_THAT(result, HasErrorMessage("iteration failed")); | ||
| } | ||
|
|
||
| } // namespace | ||
| } // namespace iceberg | ||
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 |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| /// \file iceberg/util/iterator.h | ||
| /// \brief Pull-based iterator interface for fallible, lazily produced values. | ||
|
|
||
| #include <deque> | ||
| #include <optional> | ||
| #include <type_traits> | ||
| #include <utility> | ||
| #include <vector> | ||
|
|
||
| #include "iceberg/result.h" | ||
| #include "iceberg/util/macros.h" | ||
|
manuzhang marked this conversation as resolved.
Outdated
|
||
|
|
||
| namespace iceberg { | ||
|
|
||
| /// \brief A pull-based iterator whose reads may fail. | ||
| /// | ||
| /// Iterator implementations own any resources needed to produce values. Destroying an | ||
| /// iterator releases those resources, including when iteration stops before reaching the | ||
| /// end. Iterators are not thread-safe unless an implementation explicitly says otherwise. | ||
| /// | ||
| /// \tparam T Value returned by the iterator. | ||
| template <typename T> | ||
| class Iterator { | ||
| public: | ||
| virtual ~Iterator() = default; | ||
|
|
||
| Iterator() = default; | ||
| Iterator(const Iterator&) = delete; | ||
|
manuzhang marked this conversation as resolved.
|
||
| Iterator& operator=(const Iterator&) = delete; | ||
|
|
||
| /// \brief Return the next value, or std::nullopt when the iterator is exhausted. | ||
| virtual Result<std::optional<T>> Next() = 0; | ||
|
manuzhang marked this conversation as resolved.
Outdated
|
||
|
|
||
| /// \brief Consume the remaining values into a vector. | ||
| Result<std::vector<T>> ToVector() { | ||
| if constexpr (!std::is_move_constructible_v<T>) { | ||
| static_assert(std::is_copy_constructible_v<T>, | ||
| "Iterator::ToVector requires T to be move- or copy-constructible"); | ||
|
|
||
| // A vector cannot grow portably when T has an explicitly deleted move | ||
| // constructor. Stage copy-only values in a deque, then use vector's | ||
| // forward-range constructor to allocate the final storage once. | ||
|
manuzhang marked this conversation as resolved.
Outdated
|
||
| std::deque<T> values; | ||
| while (true) { | ||
| auto result = Next(); | ||
| if (!result.has_value()) { | ||
| return std::unexpected(std::move(result.error())); | ||
| } | ||
| auto& value = result.value(); | ||
| if (!value.has_value()) { | ||
| return std::vector<T>(values.cbegin(), values.cend()); | ||
| } | ||
| values.push_back(value.value()); | ||
| } | ||
| } else { | ||
|
Copilot marked this conversation as resolved.
|
||
| std::vector<T> values; | ||
| while (true) { | ||
| auto result = Next(); | ||
| if (!result.has_value()) { | ||
| return std::unexpected(std::move(result.error())); | ||
| } | ||
| auto& value = result.value(); | ||
| if (!value.has_value()) { | ||
| return values; | ||
| } | ||
| values.push_back(std::move_if_noexcept(value.value())); | ||
| } | ||
| } | ||
| } | ||
|
Copilot marked this conversation as resolved.
|
||
| }; | ||
|
|
||
| } // namespace iceberg | ||
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
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.