ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable#12712

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

Closed
westonpace wants to merge 4 commits into from
Closed

ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable #12712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca54358
ARROW-16026: Adds the ability to run an async generator in a serial e…
westonpace Mar 18, 2022
b5e4863
ARROW-16026: Cleanup and commenting
westonpace Mar 25, 2022
7cd1de5
ARROW-16026: Address PR comments
westonpace Mar 29, 2022
18bda82
ARROW-16026: Minor modification to comment
westonpace Mar 29, 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
25 changes: 25 additions & 0 deletions cpp/src/arrow/testing/async_test_util.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,12 +20,37 @@
#include <atomic>
#include <memory>

#include "arrow/testing/gtest_util.h"
#include "arrow/util/async_generator.h"
#include "arrow/util/future.h"

namespace arrow {
namespace util {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailAt(AsyncGenerator<T> src, int failing_index) {
auto index = std::make_shared<std::atomic<int>>(0);
return [src, index, failing_index]() {
auto idx = index->fetch_add(1);
if (idx >= failing_index) {
return Future<T>::MakeFinished(Status::Invalid("XYZ"));
}
return src();
};
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
return MakeMappedGenerator(std::move(source), [](const T& res) {
return SleepABitAsync().Then([res]() { return res; });
});
}

template <typename T>
class TrackingGenerator {
public:
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/util/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ add_arrow_test(threading-utility-test
counting_semaphore_test.cc
future_test.cc
task_group_test.cc
test_common.cc
thread_pool_test.cc)

add_arrow_benchmark(bit_block_counter_benchmark)
Expand Down
95 changes: 36 additions & 59 deletions cpp/src/arrow/util/async_generator_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,6 @@

namespace arrow {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailsAt(AsyncGenerator<T> src, int failing_index) {
auto index = std::make_shared<std::atomic<int>>(0);
return [src, index, failing_index]() {
auto idx = index->fetch_add(1);
if (idx >= failing_index) {
return Future<T>::MakeFinished(Status::Invalid("XYZ"));
}
return src();
};
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
return MakeMappedGenerator(std::move(source), [](const T& res) {
return SleepABitAsync().Then([res]() { return res; });
});
}

template <typename T>
AsyncGenerator<T> MakeJittery(AsyncGenerator<T> source) {
auto latency_generator = arrow::io::LatencyGenerator::Make(0.01);
Expand DownExpand Up@@ -217,9 +193,9 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
protected:
AsyncGenerator<TestInt> MakeSource(const std::vector<TestInt>& items) {
std::vector<TestInt> wrapped(items.begin(), items.end());
auto gen = AsyncVectorIt(std::move(wrapped));
auto gen = util::AsyncVectorIt(std::move(wrapped));
if (IsSlow()) {
return SlowdownABit(std::move(gen));
return util::SlowdownABit(std::move(gen));
}
return gen;
}
Expand All@@ -231,7 +207,7 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
return Future<TestInt>::MakeFinished(Status::Invalid("XYZ"));
};
if (IsSlow()) {
return SlowdownABit(std::move(gen));
return util::SlowdownABit(std::move(gen));
}
return gen;
}
Expand DownExpand Up@@ -324,7 +300,7 @@ class ManualGenerator {
};

TEST(TestAsyncUtil, Visit) {
auto generator = AsyncVectorIt<TestInt>({1, 2, 3});
auto generator = util::AsyncVectorIt<TestInt>({1, 2, 3});
unsigned int sum = 0;
auto sum_future = VisitAsyncGenerator<TestInt>(generator, [&sum](TestInt item) {
sum += item.value;
Expand All@@ -336,15 +312,15 @@ TEST(TestAsyncUtil, Visit) {

TEST(TestAsyncUtil, Collect) {
std::vector<TestInt> expected = {1, 2, 3};
auto generator = AsyncVectorIt(expected);
auto generator = util::AsyncVectorIt(expected);
auto collected = CollectAsyncGenerator(generator);
ASSERT_FINISHES_OK_AND_ASSIGN(auto collected_val, collected);
ASSERT_EQ(expected, collected_val);
}

TEST(TestAsyncUtil, Map) {
std::vector<TestInt> input = {1, 2, 3};
auto generator = AsyncVectorIt(input);
auto generator = util::AsyncVectorIt(input);
std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
return std::to_string(in.value);
};
Expand All@@ -355,7 +331,7 @@ TEST(TestAsyncUtil, Map) {

TEST(TestAsyncUtil, MapAsync) {
std::vector<TestInt> input = {1, 2, 3};
auto generator = AsyncVectorIt(input);
auto generator = util::AsyncVectorIt(input);
std::function<Future<TestStr>(const TestInt&)> mapper = [](const TestInt& in) {
return SleepAsync(1e-3).Then([in]() { return TestStr(std::to_string(in.value)); });
};
Expand All@@ -366,7 +342,7 @@ TEST(TestAsyncUtil, MapAsync) {

TEST(TestAsyncUtil, MapReentrant) {
std::vector<TestInt> input = {1, 2};
auto source = AsyncVectorIt(input);
auto source = util::AsyncVectorIt(input);
util::TrackingGenerator<TestInt> tracker(std::move(source));
source = MakeTransferredGenerator(AsyncGenerator<TestInt>(tracker),
internal::GetCpuThreadPool());
Expand DownExpand Up@@ -408,7 +384,7 @@ TEST(TestAsyncUtil, MapParallelStress) {
constexpr int NITEMS = 10;
for (int i = 0; i < NTASKS; i++) {
auto gen = MakeVectorGenerator(RangeVector(NITEMS));
gen = SlowdownABit(std::move(gen));
gen = util::SlowdownABit(std::move(gen));
auto guard = ExpectNotAccessedReentrantly(&gen);
std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
SleepABit();
Expand All@@ -427,9 +403,9 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {
for (bool slow : {true, false}) {
for (int i = 0; i < NTASKS; i++) {
std::shared_ptr<std::atomic<bool>> done = std::make_shared<std::atomic<bool>>();
auto inner = AsyncVectorIt(RangeVector(NITEMS));
auto inner = util::AsyncVectorIt(RangeVector(NITEMS));
if (slow) inner = MakeJittery(inner);
auto gen = FailsAt(inner, NITEMS / 2);
auto gen = util::FailAt(inner, NITEMS / 2);
std::function<TestStr(const TestInt&)> mapper = [done](const TestInt& in) {
if (done->load()) {
ADD_FAILURE() << "Callback called after generator sent end signal";
Expand All@@ -446,7 +422,7 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {

TEST(TestAsyncUtil, MapTaskFail) {
std::vector<TestInt> input = {1, 2, 3};
auto generator = AsyncVectorIt(input);
auto generator = util::AsyncVectorIt(input);
std::function<Result<TestStr>(const TestInt&)> mapper =
[](const TestInt& in) -> Result<TestStr> {
if (in.value == 2) {
Expand DownExpand Up@@ -492,7 +468,7 @@ TEST(TestAsyncUtil, MapTaskDelayedFail) {

TEST(TestAsyncUtil, MapSourceFail) {
std::vector<TestInt> input = {1, 2, 3};
auto generator = FailsAt(AsyncVectorIt(input), 1);
auto generator = util::FailAt(util::AsyncVectorIt(input), 1);
std::function<Result<TestStr>(const TestInt&)> mapper =
[](const TestInt& in) -> Result<TestStr> {
return TestStr(std::to_string(in.value));
Expand All@@ -505,8 +481,8 @@ TEST(TestAsyncUtil, Concatenated) {
std::vector<TestInt> inputOne{1, 2, 3};
std::vector<TestInt> inputTwo{4, 5, 6};
std::vector<TestInt> expected{1, 2, 3, 4, 5, 6};
auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
{AsyncVectorIt<TestInt>(inputOne), AsyncVectorIt<TestInt>(inputTwo)});
auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
{util::AsyncVectorIt<TestInt>(inputOne), util::AsyncVectorIt<TestInt>(inputTwo)});
auto concat = MakeConcatenatedGenerator(gen);
AssertAsyncGeneratorMatch(expected, concat);
}
Expand All@@ -523,7 +499,7 @@ TEST_P(FromFutureFixture, Basic) {
auto to_gen = source.Then([slow](const std::vector<TestInt>& vec) {
auto vec_gen = MakeVectorGenerator(vec);
if (slow) {
return SlowdownABit(std::move(vec_gen));
return util::SlowdownABit(std::move(vec_gen));
}
return vec_gen;
});
Expand All@@ -538,7 +514,7 @@ INSTANTIATE_TEST_SUITE_P(FromFutureTests, FromFutureFixture,
class MergedGeneratorTestFixture : public GeneratorTestFixture {};

TEST_P(MergedGeneratorTestFixture, Merged) {
auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2, 3}), MakeSource({4, 5, 6})});

auto concat_gen = MakeMergedGenerator(gen, 10);
Expand All@@ -552,9 +528,9 @@ TEST_P(MergedGeneratorTestFixture, Merged) {
}

TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>({});
auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>({});
if (IsSlow()) {
gen = SlowdownABit(gen);
gen = util::SlowdownABit(gen);
}
auto merged_gen = MakeMergedGenerator(gen, 10);
ASSERT_FINISHES_OK_AND_ASSIGN(auto collected,
Expand All@@ -563,8 +539,9 @@ TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
}

TEST_P(MergedGeneratorTestFixture, MergedInnerFail) {
auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2, 3}), FailsAt(MakeSource({1, 2, 3}), 1), MakeSource({1, 2, 3})});
auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2, 3}), util::FailAt(MakeSource({1, 2, 3}), 1),
MakeSource({1, 2, 3})});
auto merged_gen = MakeMergedGenerator(gen, 10);
// Merged generator can be pulled async-reentrantly and we need to make
// sure, if it is, that all futures are marked complete, even if there is an error
Expand DownExpand Up@@ -672,23 +649,23 @@ TEST_P(MergedGeneratorTestFixture, MergedInnerFailCleanup) {

TEST_P(MergedGeneratorTestFixture, FinishesQuickly) {
// Testing a source that finishes on the first pull
auto source = AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
auto source = util::AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
auto merged = MakeMergedGenerator(std::move(source), 10);
ASSERT_FINISHES_OK_AND_EQ(TestInt(1), merged());
AssertGeneratorExhausted(merged);
}

TEST_P(MergedGeneratorTestFixture, MergedOuterFail) {
auto gen =
FailsAt(AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
1);
auto gen = util::FailAt(
util::AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
1);
auto merged_gen = MakeMergedGenerator(gen, 10);
ASSERT_FINISHES_AND_RAISES(Invalid, CollectAsyncGenerator(merged_gen));
}

TEST_P(MergedGeneratorTestFixture, MergedLimitedSubscriptions) {
auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2}), MakeSource({3, 4}), MakeSource({5, 6, 7, 8}),
MakeSource({9, 10, 11, 12})});
util::TrackingGenerator<AsyncGenerator<TestInt>> tracker(std::move(gen));
Expand DownExpand Up@@ -739,7 +716,7 @@ TEST_P(MergedGeneratorTestFixture, MergedStress) {
guards.push_back(ExpectNotAccessedReentrantly(&source));
sources.push_back(source);
}
AsyncGenerator<AsyncGenerator<TestInt>> source_gen = AsyncVectorIt(sources);
AsyncGenerator<AsyncGenerator<TestInt>> source_gen = util::AsyncVectorIt(sources);
auto outer_gaurd = ExpectNotAccessedReentrantly(&source_gen);

auto merged = MakeMergedGenerator(source_gen, 4);
Expand All@@ -756,7 +733,7 @@ TEST_P(MergedGeneratorTestFixture, MergedParallelStress) {
for (int j = 0; j < NGENERATORS; j++) {
sources.push_back(MakeSource(RangeVector(NITEMS)));
}
auto merged = MakeMergedGenerator(AsyncVectorIt(sources), 4);
auto merged = MakeMergedGenerator(util::AsyncVectorIt(sources), 4);
merged = MakeReadaheadGenerator(merged, 4);
ASSERT_FINISHES_OK_AND_ASSIGN(auto items, CollectAsyncGenerator(merged));
ASSERT_EQ(NITEMS * NGENERATORS, items.size());
Expand DownExpand Up@@ -1448,7 +1425,7 @@ TEST(TestAsyncUtil, ReadaheadOneItem) {
}

TEST(TestAsyncUtil, ReadaheadCopy) {
auto source = AsyncVectorIt<TestInt>(RangeVector(6));
auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
auto gen = MakeReadaheadGenerator(std::move(source), 2);

for (int i = 0; i < 2; i++) {
Expand All@@ -1466,7 +1443,7 @@ TEST(TestAsyncUtil, ReadaheadCopy) {
}

TEST(TestAsyncUtil, ReadaheadMove) {
auto source = AsyncVectorIt<TestInt>(RangeVector(6));
auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
auto gen = MakeReadaheadGenerator(std::move(source), 2);

for (int i = 0; i < 2; i++) {
Expand DownExpand Up@@ -1600,7 +1577,7 @@ TEST_P(EnumeratorTestFixture, Empty) {
}

TEST_P(EnumeratorTestFixture, Error) {
auto source = FailsAt(MakeSource({1, 2, 3}), 1);
auto source = util::FailAt(MakeSource({1, 2, 3}), 1);
auto enumerated = MakeEnumeratedGenerator(std::move(source));

// Even though the first item finishes ok the enumerator buffers it. The error then
Expand DownExpand Up@@ -1666,7 +1643,7 @@ class PauseableTestFixture : public GeneratorTestFixture {
AsyncGenerator<TestInt> GetSource() {
const auto& source = static_cast<AsyncGenerator<TestInt>>(generator_);
if (IsSlow()) {
return SlowdownABit(source);
return util::SlowdownABit(source);
} else {
return source;
}
Expand DownExpand Up@@ -1741,7 +1718,7 @@ TEST_P(SequencerTestFixture, SequenceLambda) {
TEST_P(SequencerTestFixture, SequenceError) {
{
auto original = MakeSource({6, 4, 2});
original = FailsAt(original, 1);
original = util::FailAt(original, 1);
auto sequenced = MakeSequencingGenerator(original, cmp_, is_next_, TestInt(0));
auto collected = CollectAsyncGenerator(sequenced);
ASSERT_FINISHES_AND_RAISES(Invalid, collected);
Expand DownExpand Up@@ -1824,7 +1801,7 @@ INSTANTIATE_TEST_SUITE_P(SequencerTests, SequencerTestFixture,
::testing::Values(false, true));

TEST(TestAsyncIteratorTransform, SkipSome) {
auto original = AsyncVectorIt<TestInt>({1, 2, 3});
auto original = util::AsyncVectorIt<TestInt>({1, 2, 3});
auto filter = MakeFilter([](TestInt& t) { return t.value != 2; });
auto filtered = MakeTransformedGenerator(std::move(original), filter);
AssertAsyncGeneratorMatch({"1", "3"}, std::move(filtered));
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable#12712

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

 Closed

westonpace
wants to merge
4
commits into

from

 Closed


ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable
#12712
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ca54358

ARROW-16026: Adds the ability to run an async generator in a serial e…


westonpace Mar 18, 2022
b5e4863

ARROW-16026: Cleanup and commenting


westonpace Mar 25, 2022
7cd1de5

ARROW-16026: Address PR comments


westonpace Mar 29, 2022
18bda82

ARROW-16026: Minor modification to comment


westonpace Mar 29, 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


25 changes: 25 additions & 0 deletions
cpp/src/arrow/testing/async_test_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,12 +20,37 @@
#include <atomic>
#include <memory>

#include "arrow/testing/gtest_util.h"
#include "arrow/util/async_generator.h"
#include "arrow/util/future.h"

namespace arrow {
namespace util {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
class TrackingGenerator {
 public:
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/util/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ add_arrow_test(threading-utility-test
 counting_semaphore_test.cc
 future_test.cc
 task_group_test.cc
 test_common.cc
 thread_pool_test.cc)

add_arrow_benchmark(bit_block_counter_benchmark)
Expand Down

95 changes: 36 additions & 59 deletions
cpp/src/arrow/util/async_generator_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,6 @@

namespace arrow {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailsAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
AsyncGenerator<T> MakeJittery(AsyncGenerator<T> source) {
 auto latency_generator = arrow::io::LatencyGenerator::Make(0.01);
Expand DownExpand Up@@ -217,9 +193,9 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 protected:
 AsyncGenerator<TestInt> MakeSource(const std::vector<TestInt>& items) {
 std::vector<TestInt> wrapped(items.begin(), items.end());
 auto gen = AsyncVectorIt(std::move(wrapped));
 auto gen = util::AsyncVectorIt(std::move(wrapped));
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand All@@ -231,7 +207,7 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 return Future<TestInt>::MakeFinished(Status::Invalid("XYZ"));
 };
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand DownExpand Up@@ -324,7 +300,7 @@ class ManualGenerator {
};

TEST(TestAsyncUtil, Visit) {
 auto generator = AsyncVectorIt<TestInt>({1, 2, 3});
 auto generator = util::AsyncVectorIt<TestInt>({1, 2, 3});
 unsigned int sum = 0;
 auto sum_future = VisitAsyncGenerator<TestInt>(generator, [&sum](TestInt item) {
 sum += item.value;
Expand All@@ -336,15 +312,15 @@ TEST(TestAsyncUtil, Visit) {

TEST(TestAsyncUtil, Collect) {
 std::vector<TestInt> expected = {1, 2, 3};
 auto generator = AsyncVectorIt(expected);
 auto generator = util::AsyncVectorIt(expected);
 auto collected = CollectAsyncGenerator(generator);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected_val, collected);
 ASSERT_EQ(expected, collected_val);
}

TEST(TestAsyncUtil, Map) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 return std::to_string(in.value);
 };
Expand All@@ -355,7 +331,7 @@ TEST(TestAsyncUtil, Map) {

TEST(TestAsyncUtil, MapAsync) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Future<TestStr>(const TestInt&)> mapper = [](const TestInt& in) {
 return SleepAsync(1e-3).Then([in]() { return TestStr(std::to_string(in.value)); });
 };
Expand All@@ -366,7 +342,7 @@ TEST(TestAsyncUtil, MapAsync) {

TEST(TestAsyncUtil, MapReentrant) {
 std::vector<TestInt> input = {1, 2};
 auto source = AsyncVectorIt(input);
 auto source = util::AsyncVectorIt(input);
 util::TrackingGenerator<TestInt> tracker(std::move(source));
 source = MakeTransferredGenerator(AsyncGenerator<TestInt>(tracker),
 internal::GetCpuThreadPool());
Expand DownExpand Up@@ -408,7 +384,7 @@ TEST(TestAsyncUtil, MapParallelStress) {
 constexpr int NITEMS = 10;
 for (int i = 0; i < NTASKS; i++) {
 auto gen = MakeVectorGenerator(RangeVector(NITEMS));
 gen = SlowdownABit(std::move(gen));
 gen = util::SlowdownABit(std::move(gen));
 auto guard = ExpectNotAccessedReentrantly(&gen);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 SleepABit();
Expand All@@ -427,9 +403,9 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {
 for (bool slow : {true, false}) {
 for (int i = 0; i < NTASKS; i++) {
 std::shared_ptr<std::atomic<bool>> done = std::make_shared<std::atomic<bool>>();
 auto inner = AsyncVectorIt(RangeVector(NITEMS));
 auto inner = util::AsyncVectorIt(RangeVector(NITEMS));
 if (slow) inner = MakeJittery(inner);
 auto gen = FailsAt(inner, NITEMS / 2);
 auto gen = util::FailAt(inner, NITEMS / 2);
 std::function<TestStr(const TestInt&)> mapper = [done](const TestInt& in) {
 if (done->load()) {
 ADD_FAILURE() << "Callback called after generator sent end signal";
Expand All@@ -446,7 +422,7 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {

TEST(TestAsyncUtil, MapTaskFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 if (in.value == 2) {
Expand DownExpand Up@@ -492,7 +468,7 @@ TEST(TestAsyncUtil, MapTaskDelayedFail) {

TEST(TestAsyncUtil, MapSourceFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = FailsAt(AsyncVectorIt(input), 1);
 auto generator = util::FailAt(util::AsyncVectorIt(input), 1);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 return TestStr(std::to_string(in.value));
Expand All@@ -505,8 +481,8 @@ TEST(TestAsyncUtil, Concatenated) {
 std::vector<TestInt> inputOne{1, 2, 3};
 std::vector<TestInt> inputTwo{4, 5, 6};
 std::vector<TestInt> expected{1, 2, 3, 4, 5, 6};
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {AsyncVectorIt<TestInt>(inputOne), AsyncVectorIt<TestInt>(inputTwo)});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {util::AsyncVectorIt<TestInt>(inputOne), util::AsyncVectorIt<TestInt>(inputTwo)});
 auto concat = MakeConcatenatedGenerator(gen);
 AssertAsyncGeneratorMatch(expected, concat);
}
Expand All@@ -523,7 +499,7 @@ TEST_P(FromFutureFixture, Basic) {
 auto to_gen = source.Then([slow](const std::vector<TestInt>& vec) {
 auto vec_gen = MakeVectorGenerator(vec);
 if (slow) {
 return SlowdownABit(std::move(vec_gen));
 return util::SlowdownABit(std::move(vec_gen));
 }
 return vec_gen;
 });
Expand All@@ -538,7 +514,7 @@ INSTANTIATE_TEST_SUITE_P(FromFutureTests, FromFutureFixture,
class MergedGeneratorTestFixture : public GeneratorTestFixture {};

TEST_P(MergedGeneratorTestFixture, Merged) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({4, 5, 6})});

 auto concat_gen = MakeMergedGenerator(gen, 10);
Expand All@@ -552,9 +528,9 @@ TEST_P(MergedGeneratorTestFixture, Merged) {
}

TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>({});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>({});
 if (IsSlow()) {
 gen = SlowdownABit(gen);
 gen = util::SlowdownABit(gen);
 }
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected,
Expand All@@ -563,8 +539,9 @@ TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
}

TEST_P(MergedGeneratorTestFixture, MergedInnerFail) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), FailsAt(MakeSource({1, 2, 3}), 1), MakeSource({1, 2, 3})});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), util::FailAt(MakeSource({1, 2, 3}), 1),
 MakeSource({1, 2, 3})});
 auto merged_gen = MakeMergedGenerator(gen, 10);
 // Merged generator can be pulled async-reentrantly and we need to make
 // sure, if it is, that all futures are marked complete, even if there is an error
Expand DownExpand Up@@ -672,23 +649,23 @@ TEST_P(MergedGeneratorTestFixture, MergedInnerFailCleanup) {

TEST_P(MergedGeneratorTestFixture, FinishesQuickly) {
 // Testing a source that finishes on the first pull
 auto source = AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto source = util::AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto merged = MakeMergedGenerator(std::move(source), 10);
 ASSERT_FINISHES_OK_AND_EQ(TestInt(1), merged());
 AssertGeneratorExhausted(merged);
}

TEST_P(MergedGeneratorTestFixture, MergedOuterFail) {
 auto gen =
FailsAt(AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
1);
 auto gen = util::FailAt(
util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
 1);
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_AND_RAISES(Invalid, CollectAsyncGenerator(merged_gen));
}

TEST_P(MergedGeneratorTestFixture, MergedLimitedSubscriptions) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2}), MakeSource({3, 4}), MakeSource({5, 6, 7, 8}),
 MakeSource({9, 10, 11, 12})});
 util::TrackingGenerator<AsyncGenerator<TestInt>> tracker(std::move(gen));
Expand DownExpand Up@@ -739,7 +716,7 @@ TEST_P(MergedGeneratorTestFixture, MergedStress) {
 guards.push_back(ExpectNotAccessedReentrantly(&source));
 sources.push_back(source);
 }
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = AsyncVectorIt(sources);
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = util::AsyncVectorIt(sources);
 auto outer_gaurd = ExpectNotAccessedReentrantly(&source_gen);

 auto merged = MakeMergedGenerator(source_gen, 4);
Expand All@@ -756,7 +733,7 @@ TEST_P(MergedGeneratorTestFixture, MergedParallelStress) {
 for (int j = 0; j < NGENERATORS; j++) {
 sources.push_back(MakeSource(RangeVector(NITEMS)));
 }
 auto merged = MakeMergedGenerator(AsyncVectorIt(sources), 4);
 auto merged = MakeMergedGenerator(util::AsyncVectorIt(sources), 4);
 merged = MakeReadaheadGenerator(merged, 4);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto items, CollectAsyncGenerator(merged));
 ASSERT_EQ(NITEMS * NGENERATORS, items.size());
Expand DownExpand Up@@ -1448,7 +1425,7 @@ TEST(TestAsyncUtil, ReadaheadOneItem) {
}

TEST(TestAsyncUtil, ReadaheadCopy) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand All@@ -1466,7 +1443,7 @@ TEST(TestAsyncUtil, ReadaheadCopy) {
}

TEST(TestAsyncUtil, ReadaheadMove) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand DownExpand Up@@ -1600,7 +1577,7 @@ TEST_P(EnumeratorTestFixture, Empty) {
}

TEST_P(EnumeratorTestFixture, Error) {
 auto source = FailsAt(MakeSource({1, 2, 3}), 1);
 auto source = util::FailAt(MakeSource({1, 2, 3}), 1);
 auto enumerated = MakeEnumeratedGenerator(std::move(source));

 // Even though the first item finishes ok the enumerator buffers it. The error then
Expand DownExpand Up@@ -1666,7 +1643,7 @@ class PauseableTestFixture : public GeneratorTestFixture {
 AsyncGenerator<TestInt> GetSource() {
 const auto& source = static_cast<AsyncGenerator<TestInt>>(generator_);
 if (IsSlow()) {
 return SlowdownABit(source);
 return util::SlowdownABit(source);
 } else {
 return source;
 }
Expand DownExpand Up@@ -1741,7 +1718,7 @@ TEST_P(SequencerTestFixture, SequenceLambda) {
TEST_P(SequencerTestFixture, SequenceError) {
 {
 auto original = MakeSource({6, 4, 2});
 original = FailsAt(original, 1);
 original = util::FailAt(original, 1);
 auto sequenced = MakeSequencingGenerator(original, cmp_, is_next_, TestInt(0));
 auto collected = CollectAsyncGenerator(sequenced);
 ASSERT_FINISHES_AND_RAISES(Invalid, collected);
Expand DownExpand Up@@ -1824,7 +1801,7 @@ INSTANTIATE_TEST_SUITE_P(SequencerTests, SequencerTestFixture,
 ::testing::Values(false, true));

TEST(TestAsyncIteratorTransform, SkipSome) {
 auto original = AsyncVectorIt<TestInt>({1, 2, 3});
 auto original = util::AsyncVectorIt<TestInt>({1, 2, 3});
 auto filter = MakeFilter([](TestInt& t) { return t.value != 2; });
 auto filtered = MakeTransformedGenerator(std::move(original), filter);
 AssertAsyncGeneratorMatch({"1", "3"}, std::move(filtered));
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable#12712

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

 Closed

westonpace
wants to merge
4
commits into

from

 Closed


ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable
#12712
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ca54358

ARROW-16026: Adds the ability to run an async generator in a serial e…


westonpace Mar 18, 2022
b5e4863

ARROW-16026: Cleanup and commenting


westonpace Mar 25, 2022
7cd1de5

ARROW-16026: Address PR comments


westonpace Mar 29, 2022
18bda82

ARROW-16026: Minor modification to comment


westonpace Mar 29, 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


25 changes: 25 additions & 0 deletions
cpp/src/arrow/testing/async_test_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,12 +20,37 @@
#include <atomic>
#include <memory>

#include "arrow/testing/gtest_util.h"
#include "arrow/util/async_generator.h"
#include "arrow/util/future.h"

namespace arrow {
namespace util {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
class TrackingGenerator {
 public:
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/util/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ add_arrow_test(threading-utility-test
 counting_semaphore_test.cc
 future_test.cc
 task_group_test.cc
 test_common.cc
 thread_pool_test.cc)

add_arrow_benchmark(bit_block_counter_benchmark)
Expand Down

95 changes: 36 additions & 59 deletions
cpp/src/arrow/util/async_generator_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,6 @@

namespace arrow {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailsAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
AsyncGenerator<T> MakeJittery(AsyncGenerator<T> source) {
 auto latency_generator = arrow::io::LatencyGenerator::Make(0.01);
Expand DownExpand Up@@ -217,9 +193,9 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 protected:
 AsyncGenerator<TestInt> MakeSource(const std::vector<TestInt>& items) {
 std::vector<TestInt> wrapped(items.begin(), items.end());
 auto gen = AsyncVectorIt(std::move(wrapped));
 auto gen = util::AsyncVectorIt(std::move(wrapped));
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand All@@ -231,7 +207,7 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 return Future<TestInt>::MakeFinished(Status::Invalid("XYZ"));
 };
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand DownExpand Up@@ -324,7 +300,7 @@ class ManualGenerator {
};

TEST(TestAsyncUtil, Visit) {
 auto generator = AsyncVectorIt<TestInt>({1, 2, 3});
 auto generator = util::AsyncVectorIt<TestInt>({1, 2, 3});
 unsigned int sum = 0;
 auto sum_future = VisitAsyncGenerator<TestInt>(generator, [&sum](TestInt item) {
 sum += item.value;
Expand All@@ -336,15 +312,15 @@ TEST(TestAsyncUtil, Visit) {

TEST(TestAsyncUtil, Collect) {
 std::vector<TestInt> expected = {1, 2, 3};
 auto generator = AsyncVectorIt(expected);
 auto generator = util::AsyncVectorIt(expected);
 auto collected = CollectAsyncGenerator(generator);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected_val, collected);
 ASSERT_EQ(expected, collected_val);
}

TEST(TestAsyncUtil, Map) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 return std::to_string(in.value);
 };
Expand All@@ -355,7 +331,7 @@ TEST(TestAsyncUtil, Map) {

TEST(TestAsyncUtil, MapAsync) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Future<TestStr>(const TestInt&)> mapper = [](const TestInt& in) {
 return SleepAsync(1e-3).Then([in]() { return TestStr(std::to_string(in.value)); });
 };
Expand All@@ -366,7 +342,7 @@ TEST(TestAsyncUtil, MapAsync) {

TEST(TestAsyncUtil, MapReentrant) {
 std::vector<TestInt> input = {1, 2};
 auto source = AsyncVectorIt(input);
 auto source = util::AsyncVectorIt(input);
 util::TrackingGenerator<TestInt> tracker(std::move(source));
 source = MakeTransferredGenerator(AsyncGenerator<TestInt>(tracker),
 internal::GetCpuThreadPool());
Expand DownExpand Up@@ -408,7 +384,7 @@ TEST(TestAsyncUtil, MapParallelStress) {
 constexpr int NITEMS = 10;
 for (int i = 0; i < NTASKS; i++) {
 auto gen = MakeVectorGenerator(RangeVector(NITEMS));
 gen = SlowdownABit(std::move(gen));
 gen = util::SlowdownABit(std::move(gen));
 auto guard = ExpectNotAccessedReentrantly(&gen);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 SleepABit();
Expand All@@ -427,9 +403,9 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {
 for (bool slow : {true, false}) {
 for (int i = 0; i < NTASKS; i++) {
 std::shared_ptr<std::atomic<bool>> done = std::make_shared<std::atomic<bool>>();
 auto inner = AsyncVectorIt(RangeVector(NITEMS));
 auto inner = util::AsyncVectorIt(RangeVector(NITEMS));
 if (slow) inner = MakeJittery(inner);
 auto gen = FailsAt(inner, NITEMS / 2);
 auto gen = util::FailAt(inner, NITEMS / 2);
 std::function<TestStr(const TestInt&)> mapper = [done](const TestInt& in) {
 if (done->load()) {
 ADD_FAILURE() << "Callback called after generator sent end signal";
Expand All@@ -446,7 +422,7 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {

TEST(TestAsyncUtil, MapTaskFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 if (in.value == 2) {
Expand DownExpand Up@@ -492,7 +468,7 @@ TEST(TestAsyncUtil, MapTaskDelayedFail) {

TEST(TestAsyncUtil, MapSourceFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = FailsAt(AsyncVectorIt(input), 1);
 auto generator = util::FailAt(util::AsyncVectorIt(input), 1);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 return TestStr(std::to_string(in.value));
Expand All@@ -505,8 +481,8 @@ TEST(TestAsyncUtil, Concatenated) {
 std::vector<TestInt> inputOne{1, 2, 3};
 std::vector<TestInt> inputTwo{4, 5, 6};
 std::vector<TestInt> expected{1, 2, 3, 4, 5, 6};
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {AsyncVectorIt<TestInt>(inputOne), AsyncVectorIt<TestInt>(inputTwo)});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {util::AsyncVectorIt<TestInt>(inputOne), util::AsyncVectorIt<TestInt>(inputTwo)});
 auto concat = MakeConcatenatedGenerator(gen);
 AssertAsyncGeneratorMatch(expected, concat);
}
Expand All@@ -523,7 +499,7 @@ TEST_P(FromFutureFixture, Basic) {
 auto to_gen = source.Then([slow](const std::vector<TestInt>& vec) {
 auto vec_gen = MakeVectorGenerator(vec);
 if (slow) {
 return SlowdownABit(std::move(vec_gen));
 return util::SlowdownABit(std::move(vec_gen));
 }
 return vec_gen;
 });
Expand All@@ -538,7 +514,7 @@ INSTANTIATE_TEST_SUITE_P(FromFutureTests, FromFutureFixture,
class MergedGeneratorTestFixture : public GeneratorTestFixture {};

TEST_P(MergedGeneratorTestFixture, Merged) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({4, 5, 6})});

 auto concat_gen = MakeMergedGenerator(gen, 10);
Expand All@@ -552,9 +528,9 @@ TEST_P(MergedGeneratorTestFixture, Merged) {
}

TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>({});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>({});
 if (IsSlow()) {
 gen = SlowdownABit(gen);
 gen = util::SlowdownABit(gen);
 }
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected,
Expand All@@ -563,8 +539,9 @@ TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
}

TEST_P(MergedGeneratorTestFixture, MergedInnerFail) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), FailsAt(MakeSource({1, 2, 3}), 1), MakeSource({1, 2, 3})});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), util::FailAt(MakeSource({1, 2, 3}), 1),
 MakeSource({1, 2, 3})});
 auto merged_gen = MakeMergedGenerator(gen, 10);
 // Merged generator can be pulled async-reentrantly and we need to make
 // sure, if it is, that all futures are marked complete, even if there is an error
Expand DownExpand Up@@ -672,23 +649,23 @@ TEST_P(MergedGeneratorTestFixture, MergedInnerFailCleanup) {

TEST_P(MergedGeneratorTestFixture, FinishesQuickly) {
 // Testing a source that finishes on the first pull
 auto source = AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto source = util::AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto merged = MakeMergedGenerator(std::move(source), 10);
 ASSERT_FINISHES_OK_AND_EQ(TestInt(1), merged());
 AssertGeneratorExhausted(merged);
}

TEST_P(MergedGeneratorTestFixture, MergedOuterFail) {
 auto gen =
FailsAt(AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
1);
 auto gen = util::FailAt(
util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
 1);
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_AND_RAISES(Invalid, CollectAsyncGenerator(merged_gen));
}

TEST_P(MergedGeneratorTestFixture, MergedLimitedSubscriptions) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2}), MakeSource({3, 4}), MakeSource({5, 6, 7, 8}),
 MakeSource({9, 10, 11, 12})});
 util::TrackingGenerator<AsyncGenerator<TestInt>> tracker(std::move(gen));
Expand DownExpand Up@@ -739,7 +716,7 @@ TEST_P(MergedGeneratorTestFixture, MergedStress) {
 guards.push_back(ExpectNotAccessedReentrantly(&source));
 sources.push_back(source);
 }
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = AsyncVectorIt(sources);
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = util::AsyncVectorIt(sources);
 auto outer_gaurd = ExpectNotAccessedReentrantly(&source_gen);

 auto merged = MakeMergedGenerator(source_gen, 4);
Expand All@@ -756,7 +733,7 @@ TEST_P(MergedGeneratorTestFixture, MergedParallelStress) {
 for (int j = 0; j < NGENERATORS; j++) {
 sources.push_back(MakeSource(RangeVector(NITEMS)));
 }
 auto merged = MakeMergedGenerator(AsyncVectorIt(sources), 4);
 auto merged = MakeMergedGenerator(util::AsyncVectorIt(sources), 4);
 merged = MakeReadaheadGenerator(merged, 4);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto items, CollectAsyncGenerator(merged));
 ASSERT_EQ(NITEMS * NGENERATORS, items.size());
Expand DownExpand Up@@ -1448,7 +1425,7 @@ TEST(TestAsyncUtil, ReadaheadOneItem) {
}

TEST(TestAsyncUtil, ReadaheadCopy) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand All@@ -1466,7 +1443,7 @@ TEST(TestAsyncUtil, ReadaheadCopy) {
}

TEST(TestAsyncUtil, ReadaheadMove) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand DownExpand Up@@ -1600,7 +1577,7 @@ TEST_P(EnumeratorTestFixture, Empty) {
}

TEST_P(EnumeratorTestFixture, Error) {
 auto source = FailsAt(MakeSource({1, 2, 3}), 1);
 auto source = util::FailAt(MakeSource({1, 2, 3}), 1);
 auto enumerated = MakeEnumeratedGenerator(std::move(source));

 // Even though the first item finishes ok the enumerator buffers it. The error then
Expand DownExpand Up@@ -1666,7 +1643,7 @@ class PauseableTestFixture : public GeneratorTestFixture {
 AsyncGenerator<TestInt> GetSource() {
 const auto& source = static_cast<AsyncGenerator<TestInt>>(generator_);
 if (IsSlow()) {
 return SlowdownABit(source);
 return util::SlowdownABit(source);
 } else {
 return source;
 }
Expand DownExpand Up@@ -1741,7 +1718,7 @@ TEST_P(SequencerTestFixture, SequenceLambda) {
TEST_P(SequencerTestFixture, SequenceError) {
 {
 auto original = MakeSource({6, 4, 2});
 original = FailsAt(original, 1);
 original = util::FailAt(original, 1);
 auto sequenced = MakeSequencingGenerator(original, cmp_, is_next_, TestInt(0));
 auto collected = CollectAsyncGenerator(sequenced);
 ASSERT_FINISHES_AND_RAISES(Invalid, collected);
Expand DownExpand Up@@ -1824,7 +1801,7 @@ INSTANTIATE_TEST_SUITE_P(SequencerTests, SequencerTestFixture,
 ::testing::Values(false, true));

TEST(TestAsyncIteratorTransform, SkipSome) {
 auto original = AsyncVectorIt<TestInt>({1, 2, 3});
 auto original = util::AsyncVectorIt<TestInt>({1, 2, 3});
 auto filter = MakeFilter([](TestInt& t) { return t.value != 2; });
 auto filtered = MakeTransformedGenerator(std::move(original), filter);
 AssertAsyncGeneratorMatch({"1", "3"}, std::move(filtered));
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable#12712

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

 Closed

westonpace
wants to merge
4
commits into

from

 Closed


ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable
#12712
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ca54358

ARROW-16026: Adds the ability to run an async generator in a serial e…


westonpace Mar 18, 2022
b5e4863

ARROW-16026: Cleanup and commenting


westonpace Mar 25, 2022
7cd1de5

ARROW-16026: Address PR comments


westonpace Mar 29, 2022
18bda82

ARROW-16026: Minor modification to comment


westonpace Mar 29, 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


25 changes: 25 additions & 0 deletions
cpp/src/arrow/testing/async_test_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,12 +20,37 @@
#include <atomic>
#include <memory>

#include "arrow/testing/gtest_util.h"
#include "arrow/util/async_generator.h"
#include "arrow/util/future.h"

namespace arrow {
namespace util {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
class TrackingGenerator {
 public:
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/util/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ add_arrow_test(threading-utility-test
 counting_semaphore_test.cc
 future_test.cc
 task_group_test.cc
 test_common.cc
 thread_pool_test.cc)

add_arrow_benchmark(bit_block_counter_benchmark)
Expand Down

95 changes: 36 additions & 59 deletions
cpp/src/arrow/util/async_generator_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,6 @@

namespace arrow {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailsAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
AsyncGenerator<T> MakeJittery(AsyncGenerator<T> source) {
 auto latency_generator = arrow::io::LatencyGenerator::Make(0.01);
Expand DownExpand Up@@ -217,9 +193,9 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 protected:
 AsyncGenerator<TestInt> MakeSource(const std::vector<TestInt>& items) {
 std::vector<TestInt> wrapped(items.begin(), items.end());
 auto gen = AsyncVectorIt(std::move(wrapped));
 auto gen = util::AsyncVectorIt(std::move(wrapped));
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand All@@ -231,7 +207,7 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 return Future<TestInt>::MakeFinished(Status::Invalid("XYZ"));
 };
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand DownExpand Up@@ -324,7 +300,7 @@ class ManualGenerator {
};

TEST(TestAsyncUtil, Visit) {
 auto generator = AsyncVectorIt<TestInt>({1, 2, 3});
 auto generator = util::AsyncVectorIt<TestInt>({1, 2, 3});
 unsigned int sum = 0;
 auto sum_future = VisitAsyncGenerator<TestInt>(generator, [&sum](TestInt item) {
 sum += item.value;
Expand All@@ -336,15 +312,15 @@ TEST(TestAsyncUtil, Visit) {

TEST(TestAsyncUtil, Collect) {
 std::vector<TestInt> expected = {1, 2, 3};
 auto generator = AsyncVectorIt(expected);
 auto generator = util::AsyncVectorIt(expected);
 auto collected = CollectAsyncGenerator(generator);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected_val, collected);
 ASSERT_EQ(expected, collected_val);
}

TEST(TestAsyncUtil, Map) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 return std::to_string(in.value);
 };
Expand All@@ -355,7 +331,7 @@ TEST(TestAsyncUtil, Map) {

TEST(TestAsyncUtil, MapAsync) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Future<TestStr>(const TestInt&)> mapper = [](const TestInt& in) {
 return SleepAsync(1e-3).Then([in]() { return TestStr(std::to_string(in.value)); });
 };
Expand All@@ -366,7 +342,7 @@ TEST(TestAsyncUtil, MapAsync) {

TEST(TestAsyncUtil, MapReentrant) {
 std::vector<TestInt> input = {1, 2};
 auto source = AsyncVectorIt(input);
 auto source = util::AsyncVectorIt(input);
 util::TrackingGenerator<TestInt> tracker(std::move(source));
 source = MakeTransferredGenerator(AsyncGenerator<TestInt>(tracker),
 internal::GetCpuThreadPool());
Expand DownExpand Up@@ -408,7 +384,7 @@ TEST(TestAsyncUtil, MapParallelStress) {
 constexpr int NITEMS = 10;
 for (int i = 0; i < NTASKS; i++) {
 auto gen = MakeVectorGenerator(RangeVector(NITEMS));
 gen = SlowdownABit(std::move(gen));
 gen = util::SlowdownABit(std::move(gen));
 auto guard = ExpectNotAccessedReentrantly(&gen);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 SleepABit();
Expand All@@ -427,9 +403,9 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {
 for (bool slow : {true, false}) {
 for (int i = 0; i < NTASKS; i++) {
 std::shared_ptr<std::atomic<bool>> done = std::make_shared<std::atomic<bool>>();
 auto inner = AsyncVectorIt(RangeVector(NITEMS));
 auto inner = util::AsyncVectorIt(RangeVector(NITEMS));
 if (slow) inner = MakeJittery(inner);
 auto gen = FailsAt(inner, NITEMS / 2);
 auto gen = util::FailAt(inner, NITEMS / 2);
 std::function<TestStr(const TestInt&)> mapper = [done](const TestInt& in) {
 if (done->load()) {
 ADD_FAILURE() << "Callback called after generator sent end signal";
Expand All@@ -446,7 +422,7 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {

TEST(TestAsyncUtil, MapTaskFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 if (in.value == 2) {
Expand DownExpand Up@@ -492,7 +468,7 @@ TEST(TestAsyncUtil, MapTaskDelayedFail) {

TEST(TestAsyncUtil, MapSourceFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = FailsAt(AsyncVectorIt(input), 1);
 auto generator = util::FailAt(util::AsyncVectorIt(input), 1);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 return TestStr(std::to_string(in.value));
Expand All@@ -505,8 +481,8 @@ TEST(TestAsyncUtil, Concatenated) {
 std::vector<TestInt> inputOne{1, 2, 3};
 std::vector<TestInt> inputTwo{4, 5, 6};
 std::vector<TestInt> expected{1, 2, 3, 4, 5, 6};
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {AsyncVectorIt<TestInt>(inputOne), AsyncVectorIt<TestInt>(inputTwo)});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {util::AsyncVectorIt<TestInt>(inputOne), util::AsyncVectorIt<TestInt>(inputTwo)});
 auto concat = MakeConcatenatedGenerator(gen);
 AssertAsyncGeneratorMatch(expected, concat);
}
Expand All@@ -523,7 +499,7 @@ TEST_P(FromFutureFixture, Basic) {
 auto to_gen = source.Then([slow](const std::vector<TestInt>& vec) {
 auto vec_gen = MakeVectorGenerator(vec);
 if (slow) {
 return SlowdownABit(std::move(vec_gen));
 return util::SlowdownABit(std::move(vec_gen));
 }
 return vec_gen;
 });
Expand All@@ -538,7 +514,7 @@ INSTANTIATE_TEST_SUITE_P(FromFutureTests, FromFutureFixture,
class MergedGeneratorTestFixture : public GeneratorTestFixture {};

TEST_P(MergedGeneratorTestFixture, Merged) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({4, 5, 6})});

 auto concat_gen = MakeMergedGenerator(gen, 10);
Expand All@@ -552,9 +528,9 @@ TEST_P(MergedGeneratorTestFixture, Merged) {
}

TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>({});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>({});
 if (IsSlow()) {
 gen = SlowdownABit(gen);
 gen = util::SlowdownABit(gen);
 }
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected,
Expand All@@ -563,8 +539,9 @@ TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
}

TEST_P(MergedGeneratorTestFixture, MergedInnerFail) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), FailsAt(MakeSource({1, 2, 3}), 1), MakeSource({1, 2, 3})});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), util::FailAt(MakeSource({1, 2, 3}), 1),
 MakeSource({1, 2, 3})});
 auto merged_gen = MakeMergedGenerator(gen, 10);
 // Merged generator can be pulled async-reentrantly and we need to make
 // sure, if it is, that all futures are marked complete, even if there is an error
Expand DownExpand Up@@ -672,23 +649,23 @@ TEST_P(MergedGeneratorTestFixture, MergedInnerFailCleanup) {

TEST_P(MergedGeneratorTestFixture, FinishesQuickly) {
 // Testing a source that finishes on the first pull
 auto source = AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto source = util::AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto merged = MakeMergedGenerator(std::move(source), 10);
 ASSERT_FINISHES_OK_AND_EQ(TestInt(1), merged());
 AssertGeneratorExhausted(merged);
}

TEST_P(MergedGeneratorTestFixture, MergedOuterFail) {
 auto gen =
FailsAt(AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
1);
 auto gen = util::FailAt(
util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
 1);
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_AND_RAISES(Invalid, CollectAsyncGenerator(merged_gen));
}

TEST_P(MergedGeneratorTestFixture, MergedLimitedSubscriptions) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2}), MakeSource({3, 4}), MakeSource({5, 6, 7, 8}),
 MakeSource({9, 10, 11, 12})});
 util::TrackingGenerator<AsyncGenerator<TestInt>> tracker(std::move(gen));
Expand DownExpand Up@@ -739,7 +716,7 @@ TEST_P(MergedGeneratorTestFixture, MergedStress) {
 guards.push_back(ExpectNotAccessedReentrantly(&source));
 sources.push_back(source);
 }
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = AsyncVectorIt(sources);
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = util::AsyncVectorIt(sources);
 auto outer_gaurd = ExpectNotAccessedReentrantly(&source_gen);

 auto merged = MakeMergedGenerator(source_gen, 4);
Expand All@@ -756,7 +733,7 @@ TEST_P(MergedGeneratorTestFixture, MergedParallelStress) {
 for (int j = 0; j < NGENERATORS; j++) {
 sources.push_back(MakeSource(RangeVector(NITEMS)));
 }
 auto merged = MakeMergedGenerator(AsyncVectorIt(sources), 4);
 auto merged = MakeMergedGenerator(util::AsyncVectorIt(sources), 4);
 merged = MakeReadaheadGenerator(merged, 4);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto items, CollectAsyncGenerator(merged));
 ASSERT_EQ(NITEMS * NGENERATORS, items.size());
Expand DownExpand Up@@ -1448,7 +1425,7 @@ TEST(TestAsyncUtil, ReadaheadOneItem) {
}

TEST(TestAsyncUtil, ReadaheadCopy) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand All@@ -1466,7 +1443,7 @@ TEST(TestAsyncUtil, ReadaheadCopy) {
}

TEST(TestAsyncUtil, ReadaheadMove) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand DownExpand Up@@ -1600,7 +1577,7 @@ TEST_P(EnumeratorTestFixture, Empty) {
}

TEST_P(EnumeratorTestFixture, Error) {
 auto source = FailsAt(MakeSource({1, 2, 3}), 1);
 auto source = util::FailAt(MakeSource({1, 2, 3}), 1);
 auto enumerated = MakeEnumeratedGenerator(std::move(source));

 // Even though the first item finishes ok the enumerator buffers it. The error then
Expand DownExpand Up@@ -1666,7 +1643,7 @@ class PauseableTestFixture : public GeneratorTestFixture {
 AsyncGenerator<TestInt> GetSource() {
 const auto& source = static_cast<AsyncGenerator<TestInt>>(generator_);
 if (IsSlow()) {
 return SlowdownABit(source);
 return util::SlowdownABit(source);
 } else {
 return source;
 }
Expand DownExpand Up@@ -1741,7 +1718,7 @@ TEST_P(SequencerTestFixture, SequenceLambda) {
TEST_P(SequencerTestFixture, SequenceError) {
 {
 auto original = MakeSource({6, 4, 2});
 original = FailsAt(original, 1);
 original = util::FailAt(original, 1);
 auto sequenced = MakeSequencingGenerator(original, cmp_, is_next_, TestInt(0));
 auto collected = CollectAsyncGenerator(sequenced);
 ASSERT_FINISHES_AND_RAISES(Invalid, collected);
Expand DownExpand Up@@ -1824,7 +1801,7 @@ INSTANTIATE_TEST_SUITE_P(SequencerTests, SequencerTestFixture,
 ::testing::Values(false, true));

TEST(TestAsyncIteratorTransform, SkipSome) {
 auto original = AsyncVectorIt<TestInt>({1, 2, 3});
 auto original = util::AsyncVectorIt<TestInt>({1, 2, 3});
 auto filter = MakeFilter([](TestInt& t) { return t.value != 2; });
 auto filtered = MakeTransformedGenerator(std::move(original), filter);
 AssertAsyncGeneratorMatch({"1", "3"}, std::move(filtered));
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable#12712

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

 Closed

westonpace
wants to merge
4
commits into

from

 Closed


ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable
#12712
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ca54358

ARROW-16026: Adds the ability to run an async generator in a serial e…


westonpace Mar 18, 2022
b5e4863

ARROW-16026: Cleanup and commenting


westonpace Mar 25, 2022
7cd1de5

ARROW-16026: Address PR comments


westonpace Mar 29, 2022
18bda82

ARROW-16026: Minor modification to comment


westonpace Mar 29, 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


25 changes: 25 additions & 0 deletions
cpp/src/arrow/testing/async_test_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,12 +20,37 @@
#include <atomic>
#include <memory>

#include "arrow/testing/gtest_util.h"
#include "arrow/util/async_generator.h"
#include "arrow/util/future.h"

namespace arrow {
namespace util {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
class TrackingGenerator {
 public:
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/util/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ add_arrow_test(threading-utility-test
 counting_semaphore_test.cc
 future_test.cc
 task_group_test.cc
 test_common.cc
 thread_pool_test.cc)

add_arrow_benchmark(bit_block_counter_benchmark)
Expand Down

95 changes: 36 additions & 59 deletions
cpp/src/arrow/util/async_generator_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,6 @@

namespace arrow {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailsAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
AsyncGenerator<T> MakeJittery(AsyncGenerator<T> source) {
 auto latency_generator = arrow::io::LatencyGenerator::Make(0.01);
Expand DownExpand Up@@ -217,9 +193,9 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 protected:
 AsyncGenerator<TestInt> MakeSource(const std::vector<TestInt>& items) {
 std::vector<TestInt> wrapped(items.begin(), items.end());
 auto gen = AsyncVectorIt(std::move(wrapped));
 auto gen = util::AsyncVectorIt(std::move(wrapped));
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand All@@ -231,7 +207,7 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 return Future<TestInt>::MakeFinished(Status::Invalid("XYZ"));
 };
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand DownExpand Up@@ -324,7 +300,7 @@ class ManualGenerator {
};

TEST(TestAsyncUtil, Visit) {
 auto generator = AsyncVectorIt<TestInt>({1, 2, 3});
 auto generator = util::AsyncVectorIt<TestInt>({1, 2, 3});
 unsigned int sum = 0;
 auto sum_future = VisitAsyncGenerator<TestInt>(generator, [&sum](TestInt item) {
 sum += item.value;
Expand All@@ -336,15 +312,15 @@ TEST(TestAsyncUtil, Visit) {

TEST(TestAsyncUtil, Collect) {
 std::vector<TestInt> expected = {1, 2, 3};
 auto generator = AsyncVectorIt(expected);
 auto generator = util::AsyncVectorIt(expected);
 auto collected = CollectAsyncGenerator(generator);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected_val, collected);
 ASSERT_EQ(expected, collected_val);
}

TEST(TestAsyncUtil, Map) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 return std::to_string(in.value);
 };
Expand All@@ -355,7 +331,7 @@ TEST(TestAsyncUtil, Map) {

TEST(TestAsyncUtil, MapAsync) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Future<TestStr>(const TestInt&)> mapper = [](const TestInt& in) {
 return SleepAsync(1e-3).Then([in]() { return TestStr(std::to_string(in.value)); });
 };
Expand All@@ -366,7 +342,7 @@ TEST(TestAsyncUtil, MapAsync) {

TEST(TestAsyncUtil, MapReentrant) {
 std::vector<TestInt> input = {1, 2};
 auto source = AsyncVectorIt(input);
 auto source = util::AsyncVectorIt(input);
 util::TrackingGenerator<TestInt> tracker(std::move(source));
 source = MakeTransferredGenerator(AsyncGenerator<TestInt>(tracker),
 internal::GetCpuThreadPool());
Expand DownExpand Up@@ -408,7 +384,7 @@ TEST(TestAsyncUtil, MapParallelStress) {
 constexpr int NITEMS = 10;
 for (int i = 0; i < NTASKS; i++) {
 auto gen = MakeVectorGenerator(RangeVector(NITEMS));
 gen = SlowdownABit(std::move(gen));
 gen = util::SlowdownABit(std::move(gen));
 auto guard = ExpectNotAccessedReentrantly(&gen);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 SleepABit();
Expand All@@ -427,9 +403,9 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {
 for (bool slow : {true, false}) {
 for (int i = 0; i < NTASKS; i++) {
 std::shared_ptr<std::atomic<bool>> done = std::make_shared<std::atomic<bool>>();
 auto inner = AsyncVectorIt(RangeVector(NITEMS));
 auto inner = util::AsyncVectorIt(RangeVector(NITEMS));
 if (slow) inner = MakeJittery(inner);
 auto gen = FailsAt(inner, NITEMS / 2);
 auto gen = util::FailAt(inner, NITEMS / 2);
 std::function<TestStr(const TestInt&)> mapper = [done](const TestInt& in) {
 if (done->load()) {
 ADD_FAILURE() << "Callback called after generator sent end signal";
Expand All@@ -446,7 +422,7 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {

TEST(TestAsyncUtil, MapTaskFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 if (in.value == 2) {
Expand DownExpand Up@@ -492,7 +468,7 @@ TEST(TestAsyncUtil, MapTaskDelayedFail) {

TEST(TestAsyncUtil, MapSourceFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = FailsAt(AsyncVectorIt(input), 1);
 auto generator = util::FailAt(util::AsyncVectorIt(input), 1);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 return TestStr(std::to_string(in.value));
Expand All@@ -505,8 +481,8 @@ TEST(TestAsyncUtil, Concatenated) {
 std::vector<TestInt> inputOne{1, 2, 3};
 std::vector<TestInt> inputTwo{4, 5, 6};
 std::vector<TestInt> expected{1, 2, 3, 4, 5, 6};
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {AsyncVectorIt<TestInt>(inputOne), AsyncVectorIt<TestInt>(inputTwo)});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {util::AsyncVectorIt<TestInt>(inputOne), util::AsyncVectorIt<TestInt>(inputTwo)});
 auto concat = MakeConcatenatedGenerator(gen);
 AssertAsyncGeneratorMatch(expected, concat);
}
Expand All@@ -523,7 +499,7 @@ TEST_P(FromFutureFixture, Basic) {
 auto to_gen = source.Then([slow](const std::vector<TestInt>& vec) {
 auto vec_gen = MakeVectorGenerator(vec);
 if (slow) {
 return SlowdownABit(std::move(vec_gen));
 return util::SlowdownABit(std::move(vec_gen));
 }
 return vec_gen;
 });
Expand All@@ -538,7 +514,7 @@ INSTANTIATE_TEST_SUITE_P(FromFutureTests, FromFutureFixture,
class MergedGeneratorTestFixture : public GeneratorTestFixture {};

TEST_P(MergedGeneratorTestFixture, Merged) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({4, 5, 6})});

 auto concat_gen = MakeMergedGenerator(gen, 10);
Expand All@@ -552,9 +528,9 @@ TEST_P(MergedGeneratorTestFixture, Merged) {
}

TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>({});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>({});
 if (IsSlow()) {
 gen = SlowdownABit(gen);
 gen = util::SlowdownABit(gen);
 }
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected,
Expand All@@ -563,8 +539,9 @@ TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
}

TEST_P(MergedGeneratorTestFixture, MergedInnerFail) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), FailsAt(MakeSource({1, 2, 3}), 1), MakeSource({1, 2, 3})});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), util::FailAt(MakeSource({1, 2, 3}), 1),
 MakeSource({1, 2, 3})});
 auto merged_gen = MakeMergedGenerator(gen, 10);
 // Merged generator can be pulled async-reentrantly and we need to make
 // sure, if it is, that all futures are marked complete, even if there is an error
Expand DownExpand Up@@ -672,23 +649,23 @@ TEST_P(MergedGeneratorTestFixture, MergedInnerFailCleanup) {

TEST_P(MergedGeneratorTestFixture, FinishesQuickly) {
 // Testing a source that finishes on the first pull
 auto source = AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto source = util::AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto merged = MakeMergedGenerator(std::move(source), 10);
 ASSERT_FINISHES_OK_AND_EQ(TestInt(1), merged());
 AssertGeneratorExhausted(merged);
}

TEST_P(MergedGeneratorTestFixture, MergedOuterFail) {
 auto gen =
FailsAt(AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
1);
 auto gen = util::FailAt(
util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
 1);
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_AND_RAISES(Invalid, CollectAsyncGenerator(merged_gen));
}

TEST_P(MergedGeneratorTestFixture, MergedLimitedSubscriptions) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2}), MakeSource({3, 4}), MakeSource({5, 6, 7, 8}),
 MakeSource({9, 10, 11, 12})});
 util::TrackingGenerator<AsyncGenerator<TestInt>> tracker(std::move(gen));
Expand DownExpand Up@@ -739,7 +716,7 @@ TEST_P(MergedGeneratorTestFixture, MergedStress) {
 guards.push_back(ExpectNotAccessedReentrantly(&source));
 sources.push_back(source);
 }
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = AsyncVectorIt(sources);
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = util::AsyncVectorIt(sources);
 auto outer_gaurd = ExpectNotAccessedReentrantly(&source_gen);

 auto merged = MakeMergedGenerator(source_gen, 4);
Expand All@@ -756,7 +733,7 @@ TEST_P(MergedGeneratorTestFixture, MergedParallelStress) {
 for (int j = 0; j < NGENERATORS; j++) {
 sources.push_back(MakeSource(RangeVector(NITEMS)));
 }
 auto merged = MakeMergedGenerator(AsyncVectorIt(sources), 4);
 auto merged = MakeMergedGenerator(util::AsyncVectorIt(sources), 4);
 merged = MakeReadaheadGenerator(merged, 4);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto items, CollectAsyncGenerator(merged));
 ASSERT_EQ(NITEMS * NGENERATORS, items.size());
Expand DownExpand Up@@ -1448,7 +1425,7 @@ TEST(TestAsyncUtil, ReadaheadOneItem) {
}

TEST(TestAsyncUtil, ReadaheadCopy) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand All@@ -1466,7 +1443,7 @@ TEST(TestAsyncUtil, ReadaheadCopy) {
}

TEST(TestAsyncUtil, ReadaheadMove) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand DownExpand Up@@ -1600,7 +1577,7 @@ TEST_P(EnumeratorTestFixture, Empty) {
}

TEST_P(EnumeratorTestFixture, Error) {
 auto source = FailsAt(MakeSource({1, 2, 3}), 1);
 auto source = util::FailAt(MakeSource({1, 2, 3}), 1);
 auto enumerated = MakeEnumeratedGenerator(std::move(source));

 // Even though the first item finishes ok the enumerator buffers it. The error then
Expand DownExpand Up@@ -1666,7 +1643,7 @@ class PauseableTestFixture : public GeneratorTestFixture {
 AsyncGenerator<TestInt> GetSource() {
 const auto& source = static_cast<AsyncGenerator<TestInt>>(generator_);
 if (IsSlow()) {
 return SlowdownABit(source);
 return util::SlowdownABit(source);
 } else {
 return source;
 }
Expand DownExpand Up@@ -1741,7 +1718,7 @@ TEST_P(SequencerTestFixture, SequenceLambda) {
TEST_P(SequencerTestFixture, SequenceError) {
 {
 auto original = MakeSource({6, 4, 2});
 original = FailsAt(original, 1);
 original = util::FailAt(original, 1);
 auto sequenced = MakeSequencingGenerator(original, cmp_, is_next_, TestInt(0));
 auto collected = CollectAsyncGenerator(sequenced);
 ASSERT_FINISHES_AND_RAISES(Invalid, collected);
Expand DownExpand Up@@ -1824,7 +1801,7 @@ INSTANTIATE_TEST_SUITE_P(SequencerTests, SequencerTestFixture,
 ::testing::Values(false, true));

TEST(TestAsyncIteratorTransform, SkipSome) {
 auto original = AsyncVectorIt<TestInt>({1, 2, 3});
 auto original = util::AsyncVectorIt<TestInt>({1, 2, 3});
 auto filter = MakeFilter([](TestInt& t) { return t.value != 2; });
 auto filtered = MakeTransformedGenerator(std::move(original), filter);
 AssertAsyncGeneratorMatch({"1", "3"}, std::move(filtered));
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable#12712

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

 Closed

westonpace
wants to merge
4
commits into

from

 Closed


ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable
#12712
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ca54358

ARROW-16026: Adds the ability to run an async generator in a serial e…


westonpace Mar 18, 2022
b5e4863

ARROW-16026: Cleanup and commenting


westonpace Mar 25, 2022
7cd1de5

ARROW-16026: Address PR comments


westonpace Mar 29, 2022
18bda82

ARROW-16026: Minor modification to comment


westonpace Mar 29, 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


25 changes: 25 additions & 0 deletions
cpp/src/arrow/testing/async_test_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,12 +20,37 @@
#include <atomic>
#include <memory>

#include "arrow/testing/gtest_util.h"
#include "arrow/util/async_generator.h"
#include "arrow/util/future.h"

namespace arrow {
namespace util {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
class TrackingGenerator {
 public:
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/util/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ add_arrow_test(threading-utility-test
 counting_semaphore_test.cc
 future_test.cc
 task_group_test.cc
 test_common.cc
 thread_pool_test.cc)

add_arrow_benchmark(bit_block_counter_benchmark)
Expand Down

95 changes: 36 additions & 59 deletions
cpp/src/arrow/util/async_generator_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,6 @@

namespace arrow {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailsAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
AsyncGenerator<T> MakeJittery(AsyncGenerator<T> source) {
 auto latency_generator = arrow::io::LatencyGenerator::Make(0.01);
Expand DownExpand Up@@ -217,9 +193,9 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 protected:
 AsyncGenerator<TestInt> MakeSource(const std::vector<TestInt>& items) {
 std::vector<TestInt> wrapped(items.begin(), items.end());
 auto gen = AsyncVectorIt(std::move(wrapped));
 auto gen = util::AsyncVectorIt(std::move(wrapped));
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand All@@ -231,7 +207,7 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 return Future<TestInt>::MakeFinished(Status::Invalid("XYZ"));
 };
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand DownExpand Up@@ -324,7 +300,7 @@ class ManualGenerator {
};

TEST(TestAsyncUtil, Visit) {
 auto generator = AsyncVectorIt<TestInt>({1, 2, 3});
 auto generator = util::AsyncVectorIt<TestInt>({1, 2, 3});
 unsigned int sum = 0;
 auto sum_future = VisitAsyncGenerator<TestInt>(generator, [&sum](TestInt item) {
 sum += item.value;
Expand All@@ -336,15 +312,15 @@ TEST(TestAsyncUtil, Visit) {

TEST(TestAsyncUtil, Collect) {
 std::vector<TestInt> expected = {1, 2, 3};
 auto generator = AsyncVectorIt(expected);
 auto generator = util::AsyncVectorIt(expected);
 auto collected = CollectAsyncGenerator(generator);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected_val, collected);
 ASSERT_EQ(expected, collected_val);
}

TEST(TestAsyncUtil, Map) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 return std::to_string(in.value);
 };
Expand All@@ -355,7 +331,7 @@ TEST(TestAsyncUtil, Map) {

TEST(TestAsyncUtil, MapAsync) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Future<TestStr>(const TestInt&)> mapper = [](const TestInt& in) {
 return SleepAsync(1e-3).Then([in]() { return TestStr(std::to_string(in.value)); });
 };
Expand All@@ -366,7 +342,7 @@ TEST(TestAsyncUtil, MapAsync) {

TEST(TestAsyncUtil, MapReentrant) {
 std::vector<TestInt> input = {1, 2};
 auto source = AsyncVectorIt(input);
 auto source = util::AsyncVectorIt(input);
 util::TrackingGenerator<TestInt> tracker(std::move(source));
 source = MakeTransferredGenerator(AsyncGenerator<TestInt>(tracker),
 internal::GetCpuThreadPool());
Expand DownExpand Up@@ -408,7 +384,7 @@ TEST(TestAsyncUtil, MapParallelStress) {
 constexpr int NITEMS = 10;
 for (int i = 0; i < NTASKS; i++) {
 auto gen = MakeVectorGenerator(RangeVector(NITEMS));
 gen = SlowdownABit(std::move(gen));
 gen = util::SlowdownABit(std::move(gen));
 auto guard = ExpectNotAccessedReentrantly(&gen);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 SleepABit();
Expand All@@ -427,9 +403,9 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {
 for (bool slow : {true, false}) {
 for (int i = 0; i < NTASKS; i++) {
 std::shared_ptr<std::atomic<bool>> done = std::make_shared<std::atomic<bool>>();
 auto inner = AsyncVectorIt(RangeVector(NITEMS));
 auto inner = util::AsyncVectorIt(RangeVector(NITEMS));
 if (slow) inner = MakeJittery(inner);
 auto gen = FailsAt(inner, NITEMS / 2);
 auto gen = util::FailAt(inner, NITEMS / 2);
 std::function<TestStr(const TestInt&)> mapper = [done](const TestInt& in) {
 if (done->load()) {
 ADD_FAILURE() << "Callback called after generator sent end signal";
Expand All@@ -446,7 +422,7 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {

TEST(TestAsyncUtil, MapTaskFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 if (in.value == 2) {
Expand DownExpand Up@@ -492,7 +468,7 @@ TEST(TestAsyncUtil, MapTaskDelayedFail) {

TEST(TestAsyncUtil, MapSourceFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = FailsAt(AsyncVectorIt(input), 1);
 auto generator = util::FailAt(util::AsyncVectorIt(input), 1);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 return TestStr(std::to_string(in.value));
Expand All@@ -505,8 +481,8 @@ TEST(TestAsyncUtil, Concatenated) {
 std::vector<TestInt> inputOne{1, 2, 3};
 std::vector<TestInt> inputTwo{4, 5, 6};
 std::vector<TestInt> expected{1, 2, 3, 4, 5, 6};
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {AsyncVectorIt<TestInt>(inputOne), AsyncVectorIt<TestInt>(inputTwo)});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {util::AsyncVectorIt<TestInt>(inputOne), util::AsyncVectorIt<TestInt>(inputTwo)});
 auto concat = MakeConcatenatedGenerator(gen);
 AssertAsyncGeneratorMatch(expected, concat);
}
Expand All@@ -523,7 +499,7 @@ TEST_P(FromFutureFixture, Basic) {
 auto to_gen = source.Then([slow](const std::vector<TestInt>& vec) {
 auto vec_gen = MakeVectorGenerator(vec);
 if (slow) {
 return SlowdownABit(std::move(vec_gen));
 return util::SlowdownABit(std::move(vec_gen));
 }
 return vec_gen;
 });
Expand All@@ -538,7 +514,7 @@ INSTANTIATE_TEST_SUITE_P(FromFutureTests, FromFutureFixture,
class MergedGeneratorTestFixture : public GeneratorTestFixture {};

TEST_P(MergedGeneratorTestFixture, Merged) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({4, 5, 6})});

 auto concat_gen = MakeMergedGenerator(gen, 10);
Expand All@@ -552,9 +528,9 @@ TEST_P(MergedGeneratorTestFixture, Merged) {
}

TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>({});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>({});
 if (IsSlow()) {
 gen = SlowdownABit(gen);
 gen = util::SlowdownABit(gen);
 }
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected,
Expand All@@ -563,8 +539,9 @@ TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
}

TEST_P(MergedGeneratorTestFixture, MergedInnerFail) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), FailsAt(MakeSource({1, 2, 3}), 1), MakeSource({1, 2, 3})});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), util::FailAt(MakeSource({1, 2, 3}), 1),
 MakeSource({1, 2, 3})});
 auto merged_gen = MakeMergedGenerator(gen, 10);
 // Merged generator can be pulled async-reentrantly and we need to make
 // sure, if it is, that all futures are marked complete, even if there is an error
Expand DownExpand Up@@ -672,23 +649,23 @@ TEST_P(MergedGeneratorTestFixture, MergedInnerFailCleanup) {

TEST_P(MergedGeneratorTestFixture, FinishesQuickly) {
 // Testing a source that finishes on the first pull
 auto source = AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto source = util::AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto merged = MakeMergedGenerator(std::move(source), 10);
 ASSERT_FINISHES_OK_AND_EQ(TestInt(1), merged());
 AssertGeneratorExhausted(merged);
}

TEST_P(MergedGeneratorTestFixture, MergedOuterFail) {
 auto gen =
FailsAt(AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
1);
 auto gen = util::FailAt(
util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
 1);
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_AND_RAISES(Invalid, CollectAsyncGenerator(merged_gen));
}

TEST_P(MergedGeneratorTestFixture, MergedLimitedSubscriptions) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2}), MakeSource({3, 4}), MakeSource({5, 6, 7, 8}),
 MakeSource({9, 10, 11, 12})});
 util::TrackingGenerator<AsyncGenerator<TestInt>> tracker(std::move(gen));
Expand DownExpand Up@@ -739,7 +716,7 @@ TEST_P(MergedGeneratorTestFixture, MergedStress) {
 guards.push_back(ExpectNotAccessedReentrantly(&source));
 sources.push_back(source);
 }
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = AsyncVectorIt(sources);
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = util::AsyncVectorIt(sources);
 auto outer_gaurd = ExpectNotAccessedReentrantly(&source_gen);

 auto merged = MakeMergedGenerator(source_gen, 4);
Expand All@@ -756,7 +733,7 @@ TEST_P(MergedGeneratorTestFixture, MergedParallelStress) {
 for (int j = 0; j < NGENERATORS; j++) {
 sources.push_back(MakeSource(RangeVector(NITEMS)));
 }
 auto merged = MakeMergedGenerator(AsyncVectorIt(sources), 4);
 auto merged = MakeMergedGenerator(util::AsyncVectorIt(sources), 4);
 merged = MakeReadaheadGenerator(merged, 4);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto items, CollectAsyncGenerator(merged));
 ASSERT_EQ(NITEMS * NGENERATORS, items.size());
Expand DownExpand Up@@ -1448,7 +1425,7 @@ TEST(TestAsyncUtil, ReadaheadOneItem) {
}

TEST(TestAsyncUtil, ReadaheadCopy) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand All@@ -1466,7 +1443,7 @@ TEST(TestAsyncUtil, ReadaheadCopy) {
}

TEST(TestAsyncUtil, ReadaheadMove) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand DownExpand Up@@ -1600,7 +1577,7 @@ TEST_P(EnumeratorTestFixture, Empty) {
}

TEST_P(EnumeratorTestFixture, Error) {
 auto source = FailsAt(MakeSource({1, 2, 3}), 1);
 auto source = util::FailAt(MakeSource({1, 2, 3}), 1);
 auto enumerated = MakeEnumeratedGenerator(std::move(source));

 // Even though the first item finishes ok the enumerator buffers it. The error then
Expand DownExpand Up@@ -1666,7 +1643,7 @@ class PauseableTestFixture : public GeneratorTestFixture {
 AsyncGenerator<TestInt> GetSource() {
 const auto& source = static_cast<AsyncGenerator<TestInt>>(generator_);
 if (IsSlow()) {
 return SlowdownABit(source);
 return util::SlowdownABit(source);
 } else {
 return source;
 }
Expand DownExpand Up@@ -1741,7 +1718,7 @@ TEST_P(SequencerTestFixture, SequenceLambda) {
TEST_P(SequencerTestFixture, SequenceError) {
 {
 auto original = MakeSource({6, 4, 2});
 original = FailsAt(original, 1);
 original = util::FailAt(original, 1);
 auto sequenced = MakeSequencingGenerator(original, cmp_, is_next_, TestInt(0));
 auto collected = CollectAsyncGenerator(sequenced);
 ASSERT_FINISHES_AND_RAISES(Invalid, collected);
Expand DownExpand Up@@ -1824,7 +1801,7 @@ INSTANTIATE_TEST_SUITE_P(SequencerTests, SequencerTestFixture,
 ::testing::Values(false, true));

TEST(TestAsyncIteratorTransform, SkipSome) {
 auto original = AsyncVectorIt<TestInt>({1, 2, 3});
 auto original = util::AsyncVectorIt<TestInt>({1, 2, 3});
 auto filter = MakeFilter([](TestInt& t) { return t.value != 2; });
 auto filtered = MakeTransformedGenerator(std::move(original), filter);
 AssertAsyncGeneratorMatch({"1", "3"}, std::move(filtered));
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable#12712

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

 Closed

westonpace
wants to merge
4
commits into

from

 Closed


ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable
#12712
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ca54358

ARROW-16026: Adds the ability to run an async generator in a serial e…


westonpace Mar 18, 2022
b5e4863

ARROW-16026: Cleanup and commenting


westonpace Mar 25, 2022
7cd1de5

ARROW-16026: Address PR comments


westonpace Mar 29, 2022
18bda82

ARROW-16026: Minor modification to comment


westonpace Mar 29, 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


25 changes: 25 additions & 0 deletions
cpp/src/arrow/testing/async_test_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,12 +20,37 @@
#include <atomic>
#include <memory>

#include "arrow/testing/gtest_util.h"
#include "arrow/util/async_generator.h"
#include "arrow/util/future.h"

namespace arrow {
namespace util {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
class TrackingGenerator {
 public:
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/util/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ add_arrow_test(threading-utility-test
 counting_semaphore_test.cc
 future_test.cc
 task_group_test.cc
 test_common.cc
 thread_pool_test.cc)

add_arrow_benchmark(bit_block_counter_benchmark)
Expand Down

95 changes: 36 additions & 59 deletions
cpp/src/arrow/util/async_generator_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,6 @@

namespace arrow {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailsAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
AsyncGenerator<T> MakeJittery(AsyncGenerator<T> source) {
 auto latency_generator = arrow::io::LatencyGenerator::Make(0.01);
Expand DownExpand Up@@ -217,9 +193,9 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 protected:
 AsyncGenerator<TestInt> MakeSource(const std::vector<TestInt>& items) {
 std::vector<TestInt> wrapped(items.begin(), items.end());
 auto gen = AsyncVectorIt(std::move(wrapped));
 auto gen = util::AsyncVectorIt(std::move(wrapped));
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand All@@ -231,7 +207,7 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 return Future<TestInt>::MakeFinished(Status::Invalid("XYZ"));
 };
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand DownExpand Up@@ -324,7 +300,7 @@ class ManualGenerator {
};

TEST(TestAsyncUtil, Visit) {
 auto generator = AsyncVectorIt<TestInt>({1, 2, 3});
 auto generator = util::AsyncVectorIt<TestInt>({1, 2, 3});
 unsigned int sum = 0;
 auto sum_future = VisitAsyncGenerator<TestInt>(generator, [&sum](TestInt item) {
 sum += item.value;
Expand All@@ -336,15 +312,15 @@ TEST(TestAsyncUtil, Visit) {

TEST(TestAsyncUtil, Collect) {
 std::vector<TestInt> expected = {1, 2, 3};
 auto generator = AsyncVectorIt(expected);
 auto generator = util::AsyncVectorIt(expected);
 auto collected = CollectAsyncGenerator(generator);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected_val, collected);
 ASSERT_EQ(expected, collected_val);
}

TEST(TestAsyncUtil, Map) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 return std::to_string(in.value);
 };
Expand All@@ -355,7 +331,7 @@ TEST(TestAsyncUtil, Map) {

TEST(TestAsyncUtil, MapAsync) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Future<TestStr>(const TestInt&)> mapper = [](const TestInt& in) {
 return SleepAsync(1e-3).Then([in]() { return TestStr(std::to_string(in.value)); });
 };
Expand All@@ -366,7 +342,7 @@ TEST(TestAsyncUtil, MapAsync) {

TEST(TestAsyncUtil, MapReentrant) {
 std::vector<TestInt> input = {1, 2};
 auto source = AsyncVectorIt(input);
 auto source = util::AsyncVectorIt(input);
 util::TrackingGenerator<TestInt> tracker(std::move(source));
 source = MakeTransferredGenerator(AsyncGenerator<TestInt>(tracker),
 internal::GetCpuThreadPool());
Expand DownExpand Up@@ -408,7 +384,7 @@ TEST(TestAsyncUtil, MapParallelStress) {
 constexpr int NITEMS = 10;
 for (int i = 0; i < NTASKS; i++) {
 auto gen = MakeVectorGenerator(RangeVector(NITEMS));
 gen = SlowdownABit(std::move(gen));
 gen = util::SlowdownABit(std::move(gen));
 auto guard = ExpectNotAccessedReentrantly(&gen);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 SleepABit();
Expand All@@ -427,9 +403,9 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {
 for (bool slow : {true, false}) {
 for (int i = 0; i < NTASKS; i++) {
 std::shared_ptr<std::atomic<bool>> done = std::make_shared<std::atomic<bool>>();
 auto inner = AsyncVectorIt(RangeVector(NITEMS));
 auto inner = util::AsyncVectorIt(RangeVector(NITEMS));
 if (slow) inner = MakeJittery(inner);
 auto gen = FailsAt(inner, NITEMS / 2);
 auto gen = util::FailAt(inner, NITEMS / 2);
 std::function<TestStr(const TestInt&)> mapper = [done](const TestInt& in) {
 if (done->load()) {
 ADD_FAILURE() << "Callback called after generator sent end signal";
Expand All@@ -446,7 +422,7 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {

TEST(TestAsyncUtil, MapTaskFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 if (in.value == 2) {
Expand DownExpand Up@@ -492,7 +468,7 @@ TEST(TestAsyncUtil, MapTaskDelayedFail) {

TEST(TestAsyncUtil, MapSourceFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = FailsAt(AsyncVectorIt(input), 1);
 auto generator = util::FailAt(util::AsyncVectorIt(input), 1);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 return TestStr(std::to_string(in.value));
Expand All@@ -505,8 +481,8 @@ TEST(TestAsyncUtil, Concatenated) {
 std::vector<TestInt> inputOne{1, 2, 3};
 std::vector<TestInt> inputTwo{4, 5, 6};
 std::vector<TestInt> expected{1, 2, 3, 4, 5, 6};
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {AsyncVectorIt<TestInt>(inputOne), AsyncVectorIt<TestInt>(inputTwo)});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {util::AsyncVectorIt<TestInt>(inputOne), util::AsyncVectorIt<TestInt>(inputTwo)});
 auto concat = MakeConcatenatedGenerator(gen);
 AssertAsyncGeneratorMatch(expected, concat);
}
Expand All@@ -523,7 +499,7 @@ TEST_P(FromFutureFixture, Basic) {
 auto to_gen = source.Then([slow](const std::vector<TestInt>& vec) {
 auto vec_gen = MakeVectorGenerator(vec);
 if (slow) {
 return SlowdownABit(std::move(vec_gen));
 return util::SlowdownABit(std::move(vec_gen));
 }
 return vec_gen;
 });
Expand All@@ -538,7 +514,7 @@ INSTANTIATE_TEST_SUITE_P(FromFutureTests, FromFutureFixture,
class MergedGeneratorTestFixture : public GeneratorTestFixture {};

TEST_P(MergedGeneratorTestFixture, Merged) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({4, 5, 6})});

 auto concat_gen = MakeMergedGenerator(gen, 10);
Expand All@@ -552,9 +528,9 @@ TEST_P(MergedGeneratorTestFixture, Merged) {
}

TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>({});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>({});
 if (IsSlow()) {
 gen = SlowdownABit(gen);
 gen = util::SlowdownABit(gen);
 }
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected,
Expand All@@ -563,8 +539,9 @@ TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
}

TEST_P(MergedGeneratorTestFixture, MergedInnerFail) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), FailsAt(MakeSource({1, 2, 3}), 1), MakeSource({1, 2, 3})});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), util::FailAt(MakeSource({1, 2, 3}), 1),
 MakeSource({1, 2, 3})});
 auto merged_gen = MakeMergedGenerator(gen, 10);
 // Merged generator can be pulled async-reentrantly and we need to make
 // sure, if it is, that all futures are marked complete, even if there is an error
Expand DownExpand Up@@ -672,23 +649,23 @@ TEST_P(MergedGeneratorTestFixture, MergedInnerFailCleanup) {

TEST_P(MergedGeneratorTestFixture, FinishesQuickly) {
 // Testing a source that finishes on the first pull
 auto source = AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto source = util::AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto merged = MakeMergedGenerator(std::move(source), 10);
 ASSERT_FINISHES_OK_AND_EQ(TestInt(1), merged());
 AssertGeneratorExhausted(merged);
}

TEST_P(MergedGeneratorTestFixture, MergedOuterFail) {
 auto gen =
FailsAt(AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
1);
 auto gen = util::FailAt(
util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
 1);
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_AND_RAISES(Invalid, CollectAsyncGenerator(merged_gen));
}

TEST_P(MergedGeneratorTestFixture, MergedLimitedSubscriptions) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2}), MakeSource({3, 4}), MakeSource({5, 6, 7, 8}),
 MakeSource({9, 10, 11, 12})});
 util::TrackingGenerator<AsyncGenerator<TestInt>> tracker(std::move(gen));
Expand DownExpand Up@@ -739,7 +716,7 @@ TEST_P(MergedGeneratorTestFixture, MergedStress) {
 guards.push_back(ExpectNotAccessedReentrantly(&source));
 sources.push_back(source);
 }
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = AsyncVectorIt(sources);
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = util::AsyncVectorIt(sources);
 auto outer_gaurd = ExpectNotAccessedReentrantly(&source_gen);

 auto merged = MakeMergedGenerator(source_gen, 4);
Expand All@@ -756,7 +733,7 @@ TEST_P(MergedGeneratorTestFixture, MergedParallelStress) {
 for (int j = 0; j < NGENERATORS; j++) {
 sources.push_back(MakeSource(RangeVector(NITEMS)));
 }
 auto merged = MakeMergedGenerator(AsyncVectorIt(sources), 4);
 auto merged = MakeMergedGenerator(util::AsyncVectorIt(sources), 4);
 merged = MakeReadaheadGenerator(merged, 4);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto items, CollectAsyncGenerator(merged));
 ASSERT_EQ(NITEMS * NGENERATORS, items.size());
Expand DownExpand Up@@ -1448,7 +1425,7 @@ TEST(TestAsyncUtil, ReadaheadOneItem) {
}

TEST(TestAsyncUtil, ReadaheadCopy) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand All@@ -1466,7 +1443,7 @@ TEST(TestAsyncUtil, ReadaheadCopy) {
}

TEST(TestAsyncUtil, ReadaheadMove) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand DownExpand Up@@ -1600,7 +1577,7 @@ TEST_P(EnumeratorTestFixture, Empty) {
}

TEST_P(EnumeratorTestFixture, Error) {
 auto source = FailsAt(MakeSource({1, 2, 3}), 1);
 auto source = util::FailAt(MakeSource({1, 2, 3}), 1);
 auto enumerated = MakeEnumeratedGenerator(std::move(source));

 // Even though the first item finishes ok the enumerator buffers it. The error then
Expand DownExpand Up@@ -1666,7 +1643,7 @@ class PauseableTestFixture : public GeneratorTestFixture {
 AsyncGenerator<TestInt> GetSource() {
 const auto& source = static_cast<AsyncGenerator<TestInt>>(generator_);
 if (IsSlow()) {
 return SlowdownABit(source);
 return util::SlowdownABit(source);
 } else {
 return source;
 }
Expand DownExpand Up@@ -1741,7 +1718,7 @@ TEST_P(SequencerTestFixture, SequenceLambda) {
TEST_P(SequencerTestFixture, SequenceError) {
 {
 auto original = MakeSource({6, 4, 2});
 original = FailsAt(original, 1);
 original = util::FailAt(original, 1);
 auto sequenced = MakeSequencingGenerator(original, cmp_, is_next_, TestInt(0));
 auto collected = CollectAsyncGenerator(sequenced);
 ASSERT_FINISHES_AND_RAISES(Invalid, collected);
Expand DownExpand Up@@ -1824,7 +1801,7 @@ INSTANTIATE_TEST_SUITE_P(SequencerTests, SequencerTestFixture,
 ::testing::Values(false, true));

TEST(TestAsyncIteratorTransform, SkipSome) {
 auto original = AsyncVectorIt<TestInt>({1, 2, 3});
 auto original = util::AsyncVectorIt<TestInt>({1, 2, 3});
 auto filter = MakeFilter([](TestInt& t) { return t.value != 2; });
 auto filtered = MakeTransformedGenerator(std::move(original), filter);
 AssertAsyncGeneratorMatch({"1", "3"}, std::move(filtered));
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable#12712

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

 Closed

westonpace
wants to merge
4
commits into

from

 Closed


ARROW-16026: [C++] Add support for the serial executor to expose an async generator as an iterable
#12712
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ca54358

ARROW-16026: Adds the ability to run an async generator in a serial e…


westonpace Mar 18, 2022
b5e4863

ARROW-16026: Cleanup and commenting


westonpace Mar 25, 2022
7cd1de5

ARROW-16026: Address PR comments


westonpace Mar 29, 2022
18bda82

ARROW-16026: Minor modification to comment


westonpace Mar 29, 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


25 changes: 25 additions & 0 deletions
cpp/src/arrow/testing/async_test_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,12 +20,37 @@
#include <atomic>
#include <memory>

#include "arrow/testing/gtest_util.h"
#include "arrow/util/async_generator.h"
#include "arrow/util/future.h"

namespace arrow {
namespace util {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
class TrackingGenerator {
 public:
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/util/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ add_arrow_test(threading-utility-test
 counting_semaphore_test.cc
 future_test.cc
 task_group_test.cc
 test_common.cc
 thread_pool_test.cc)

add_arrow_benchmark(bit_block_counter_benchmark)
Expand Down

95 changes: 36 additions & 59 deletions
cpp/src/arrow/util/async_generator_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,6 @@

namespace arrow {

template <typename T>
AsyncGenerator<T> AsyncVectorIt(std::vector<T> v) {
 return MakeVectorGenerator(std::move(v));
}

template <typename T>
AsyncGenerator<T> FailsAt(AsyncGenerator<T> src, int failing_index) {
 auto index = std::make_shared<std::atomic<int>>(0);
 return [src, index, failing_index]() {
 auto idx = index->fetch_add(1);
 if (idx >= failing_index) {
 return Future<T>::MakeFinished(Status::Invalid("XYZ"));
 }
 return src();
 };
}

template <typename T>
AsyncGenerator<T> SlowdownABit(AsyncGenerator<T> source) {
 return MakeMappedGenerator(std::move(source), [](const T& res) {
 return SleepABitAsync().Then([res]() { return res; });
 });
}

template <typename T>
AsyncGenerator<T> MakeJittery(AsyncGenerator<T> source) {
 auto latency_generator = arrow::io::LatencyGenerator::Make(0.01);
Expand DownExpand Up@@ -217,9 +193,9 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 protected:
 AsyncGenerator<TestInt> MakeSource(const std::vector<TestInt>& items) {
 std::vector<TestInt> wrapped(items.begin(), items.end());
 auto gen = AsyncVectorIt(std::move(wrapped));
 auto gen = util::AsyncVectorIt(std::move(wrapped));
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand All@@ -231,7 +207,7 @@ class GeneratorTestFixture : public ::testing::TestWithParam<bool> {
 return Future<TestInt>::MakeFinished(Status::Invalid("XYZ"));
 };
 if (IsSlow()) {
 return SlowdownABit(std::move(gen));
 return util::SlowdownABit(std::move(gen));
 }
 return gen;
 }
Expand DownExpand Up@@ -324,7 +300,7 @@ class ManualGenerator {
};

TEST(TestAsyncUtil, Visit) {
 auto generator = AsyncVectorIt<TestInt>({1, 2, 3});
 auto generator = util::AsyncVectorIt<TestInt>({1, 2, 3});
 unsigned int sum = 0;
 auto sum_future = VisitAsyncGenerator<TestInt>(generator, [&sum](TestInt item) {
 sum += item.value;
Expand All@@ -336,15 +312,15 @@ TEST(TestAsyncUtil, Visit) {

TEST(TestAsyncUtil, Collect) {
 std::vector<TestInt> expected = {1, 2, 3};
 auto generator = AsyncVectorIt(expected);
 auto generator = util::AsyncVectorIt(expected);
 auto collected = CollectAsyncGenerator(generator);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected_val, collected);
 ASSERT_EQ(expected, collected_val);
}

TEST(TestAsyncUtil, Map) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 return std::to_string(in.value);
 };
Expand All@@ -355,7 +331,7 @@ TEST(TestAsyncUtil, Map) {

TEST(TestAsyncUtil, MapAsync) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Future<TestStr>(const TestInt&)> mapper = [](const TestInt& in) {
 return SleepAsync(1e-3).Then([in]() { return TestStr(std::to_string(in.value)); });
 };
Expand All@@ -366,7 +342,7 @@ TEST(TestAsyncUtil, MapAsync) {

TEST(TestAsyncUtil, MapReentrant) {
 std::vector<TestInt> input = {1, 2};
 auto source = AsyncVectorIt(input);
 auto source = util::AsyncVectorIt(input);
 util::TrackingGenerator<TestInt> tracker(std::move(source));
 source = MakeTransferredGenerator(AsyncGenerator<TestInt>(tracker),
 internal::GetCpuThreadPool());
Expand DownExpand Up@@ -408,7 +384,7 @@ TEST(TestAsyncUtil, MapParallelStress) {
 constexpr int NITEMS = 10;
 for (int i = 0; i < NTASKS; i++) {
 auto gen = MakeVectorGenerator(RangeVector(NITEMS));
 gen = SlowdownABit(std::move(gen));
 gen = util::SlowdownABit(std::move(gen));
 auto guard = ExpectNotAccessedReentrantly(&gen);
 std::function<TestStr(const TestInt&)> mapper = [](const TestInt& in) {
 SleepABit();
Expand All@@ -427,9 +403,9 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {
 for (bool slow : {true, false}) {
 for (int i = 0; i < NTASKS; i++) {
 std::shared_ptr<std::atomic<bool>> done = std::make_shared<std::atomic<bool>>();
 auto inner = AsyncVectorIt(RangeVector(NITEMS));
 auto inner = util::AsyncVectorIt(RangeVector(NITEMS));
 if (slow) inner = MakeJittery(inner);
 auto gen = FailsAt(inner, NITEMS / 2);
 auto gen = util::FailAt(inner, NITEMS / 2);
 std::function<TestStr(const TestInt&)> mapper = [done](const TestInt& in) {
 if (done->load()) {
 ADD_FAILURE() << "Callback called after generator sent end signal";
Expand All@@ -446,7 +422,7 @@ TEST(TestAsyncUtil, MapQueuingFailStress) {

TEST(TestAsyncUtil, MapTaskFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = AsyncVectorIt(input);
 auto generator = util::AsyncVectorIt(input);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 if (in.value == 2) {
Expand DownExpand Up@@ -492,7 +468,7 @@ TEST(TestAsyncUtil, MapTaskDelayedFail) {

TEST(TestAsyncUtil, MapSourceFail) {
 std::vector<TestInt> input = {1, 2, 3};
 auto generator = FailsAt(AsyncVectorIt(input), 1);
 auto generator = util::FailAt(util::AsyncVectorIt(input), 1);
 std::function<Result<TestStr>(const TestInt&)> mapper =
 [](const TestInt& in) -> Result<TestStr> {
 return TestStr(std::to_string(in.value));
Expand All@@ -505,8 +481,8 @@ TEST(TestAsyncUtil, Concatenated) {
 std::vector<TestInt> inputOne{1, 2, 3};
 std::vector<TestInt> inputTwo{4, 5, 6};
 std::vector<TestInt> expected{1, 2, 3, 4, 5, 6};
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {AsyncVectorIt<TestInt>(inputOne), AsyncVectorIt<TestInt>(inputTwo)});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {util::AsyncVectorIt<TestInt>(inputOne), util::AsyncVectorIt<TestInt>(inputTwo)});
 auto concat = MakeConcatenatedGenerator(gen);
 AssertAsyncGeneratorMatch(expected, concat);
}
Expand All@@ -523,7 +499,7 @@ TEST_P(FromFutureFixture, Basic) {
 auto to_gen = source.Then([slow](const std::vector<TestInt>& vec) {
 auto vec_gen = MakeVectorGenerator(vec);
 if (slow) {
 return SlowdownABit(std::move(vec_gen));
 return util::SlowdownABit(std::move(vec_gen));
 }
 return vec_gen;
 });
Expand All@@ -538,7 +514,7 @@ INSTANTIATE_TEST_SUITE_P(FromFutureTests, FromFutureFixture,
class MergedGeneratorTestFixture : public GeneratorTestFixture {};

TEST_P(MergedGeneratorTestFixture, Merged) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({4, 5, 6})});

 auto concat_gen = MakeMergedGenerator(gen, 10);
Expand All@@ -552,9 +528,9 @@ TEST_P(MergedGeneratorTestFixture, Merged) {
}

TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>({});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>({});
 if (IsSlow()) {
 gen = SlowdownABit(gen);
 gen = util::SlowdownABit(gen);
 }
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto collected,
Expand All@@ -563,8 +539,9 @@ TEST_P(MergedGeneratorTestFixture, OuterSubscriptionEmpty) {
}

TEST_P(MergedGeneratorTestFixture, MergedInnerFail) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), FailsAt(MakeSource({1, 2, 3}), 1), MakeSource({1, 2, 3})});
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), util::FailAt(MakeSource({1, 2, 3}), 1),
 MakeSource({1, 2, 3})});
 auto merged_gen = MakeMergedGenerator(gen, 10);
 // Merged generator can be pulled async-reentrantly and we need to make
 // sure, if it is, that all futures are marked complete, even if there is an error
Expand DownExpand Up@@ -672,23 +649,23 @@ TEST_P(MergedGeneratorTestFixture, MergedInnerFailCleanup) {

TEST_P(MergedGeneratorTestFixture, FinishesQuickly) {
 // Testing a source that finishes on the first pull
 auto source = AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto source = util::AsyncVectorIt<AsyncGenerator<TestInt>>({MakeSource({1})});
 auto merged = MakeMergedGenerator(std::move(source), 10);
 ASSERT_FINISHES_OK_AND_EQ(TestInt(1), merged());
 AssertGeneratorExhausted(merged);
}

TEST_P(MergedGeneratorTestFixture, MergedOuterFail) {
 auto gen =
FailsAt(AsyncVectorIt<AsyncGenerator<TestInt>>(
{MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
1);
 auto gen = util::FailAt(
util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2, 3}), MakeSource({1, 2, 3}), MakeSource({1, 2, 3})}),
 1);
 auto merged_gen = MakeMergedGenerator(gen, 10);
 ASSERT_FINISHES_AND_RAISES(Invalid, CollectAsyncGenerator(merged_gen));
}

TEST_P(MergedGeneratorTestFixture, MergedLimitedSubscriptions) {
 auto gen = AsyncVectorIt<AsyncGenerator<TestInt>>(
 auto gen = util::AsyncVectorIt<AsyncGenerator<TestInt>>(
 {MakeSource({1, 2}), MakeSource({3, 4}), MakeSource({5, 6, 7, 8}),
 MakeSource({9, 10, 11, 12})});
 util::TrackingGenerator<AsyncGenerator<TestInt>> tracker(std::move(gen));
Expand DownExpand Up@@ -739,7 +716,7 @@ TEST_P(MergedGeneratorTestFixture, MergedStress) {
 guards.push_back(ExpectNotAccessedReentrantly(&source));
 sources.push_back(source);
 }
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = AsyncVectorIt(sources);
 AsyncGenerator<AsyncGenerator<TestInt>> source_gen = util::AsyncVectorIt(sources);
 auto outer_gaurd = ExpectNotAccessedReentrantly(&source_gen);

 auto merged = MakeMergedGenerator(source_gen, 4);
Expand All@@ -756,7 +733,7 @@ TEST_P(MergedGeneratorTestFixture, MergedParallelStress) {
 for (int j = 0; j < NGENERATORS; j++) {
 sources.push_back(MakeSource(RangeVector(NITEMS)));
 }
 auto merged = MakeMergedGenerator(AsyncVectorIt(sources), 4);
 auto merged = MakeMergedGenerator(util::AsyncVectorIt(sources), 4);
 merged = MakeReadaheadGenerator(merged, 4);
 ASSERT_FINISHES_OK_AND_ASSIGN(auto items, CollectAsyncGenerator(merged));
 ASSERT_EQ(NITEMS * NGENERATORS, items.size());
Expand DownExpand Up@@ -1448,7 +1425,7 @@ TEST(TestAsyncUtil, ReadaheadOneItem) {
}

TEST(TestAsyncUtil, ReadaheadCopy) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand All@@ -1466,7 +1443,7 @@ TEST(TestAsyncUtil, ReadaheadCopy) {
}

TEST(TestAsyncUtil, ReadaheadMove) {
 auto source = AsyncVectorIt<TestInt>(RangeVector(6));
 auto source = util::AsyncVectorIt<TestInt>(RangeVector(6));
 auto gen = MakeReadaheadGenerator(std::move(source), 2);

 for (int i = 0; i < 2; i++) {
Expand DownExpand Up@@ -1600,7 +1577,7 @@ TEST_P(EnumeratorTestFixture, Empty) {
}

TEST_P(EnumeratorTestFixture, Error) {
 auto source = FailsAt(MakeSource({1, 2, 3}), 1);
 auto source = util::FailAt(MakeSource({1, 2, 3}), 1);
 auto enumerated = MakeEnumeratedGenerator(std::move(source));

 // Even though the first item finishes ok the enumerator buffers it. The error then
Expand DownExpand Up@@ -1666,7 +1643,7 @@ class PauseableTestFixture : public GeneratorTestFixture {
 AsyncGenerator<TestInt> GetSource() {
 const auto& source = static_cast<AsyncGenerator<TestInt>>(generator_);
 if (IsSlow()) {
 return SlowdownABit(source);
 return util::SlowdownABit(source);
 } else {
 return source;
 }
Expand DownExpand Up@@ -1741,7 +1718,7 @@ TEST_P(SequencerTestFixture, SequenceLambda) {
TEST_P(SequencerTestFixture, SequenceError) {
 {
 auto original = MakeSource({6, 4, 2});
 original = FailsAt(original, 1);
 original = util::FailAt(original, 1);
 auto sequenced = MakeSequencingGenerator(original, cmp_, is_next_, TestInt(0));
 auto collected = CollectAsyncGenerator(sequenced);
 ASSERT_FINISHES_AND_RAISES(Invalid, collected);
Expand DownExpand Up@@ -1824,7 +1801,7 @@ INSTANTIATE_TEST_SUITE_P(SequencerTests, SequencerTestFixture,
 ::testing::Values(false, true));

TEST(TestAsyncIteratorTransform, SkipSome) {
 auto original = AsyncVectorIt<TestInt>({1, 2, 3});
 auto original = util::AsyncVectorIt<TestInt>({1, 2, 3});
 auto filter = MakeFilter([](TestInt& t) { return t.value != 2; });
 auto filtered = MakeTransformedGenerator(std::move(original), filter);
 AssertAsyncGeneratorMatch({"1", "3"}, std::move(filtered));
Expand Down
Loading