Skip to content
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

Capture KeepAlive instead of Executor in WriterOptions #115

Closed
wants to merge 1 commit into from
Closed

Capture KeepAlive instead of Executor in WriterOptions #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 19 additions & 5 deletions dwio/nimble/velox/VeloxWriterOptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,25 @@ struct VeloxWriterOptions {

const velox::common::SpillConfig* spillConfig{nullptr};

// If provided, internal encoding operations will happen in parallel using
// this executor.
std::shared_ptr<folly::Executor> encodingExecutor;
// If provided, internal ingestion operations will happen in parallel
std::shared_ptr<folly::Executor> writeExecutor;
// If provided, internal writing/encoding operations will happen in parallel
// using the specified executors.
//
// The KeepAlive wrappers ensures that the executor object will be kept alive
// (allocated), and that the pool will be open for receiving new tasks. A
// shared_ptr would only guarantee that the object is still allocated, but not
// necessarily open for new task (e.g. it could have been .join()'ed through a
// different reference). Because of that, many libraries only provide
// KeepAlive references to executors, not shared_ptr, so taking a KeepAlive
// also makes it more convenient to clients.
//
// As a result, if a KeepAlive is still being held, clients trying to destruct
// the last reference of a shared_ptr to that executor will block until all
// KeepAlive references are destructed.
//
// - encodingExecutor: execute stream encoding operations in parallel.
// - writeExecutor: execute FieldWriter::write() operations in parallel.
folly::Executor::KeepAlive<> encodingExecutor;
folly::Executor::KeepAlive<> writeExecutor;

bool enableChunking = false;

Expand Down
17 changes: 11 additions & 6 deletions dwio/nimble/velox/tests/VeloxReaderTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2426,14 +2426,17 @@ TEST_F(VeloxReaderTests, FuzzSimple) {
auto iterations = 20;
auto batches = 20;
std::mt19937 rng{seed};

for (auto parallelismFactor : {0U, 1U, std::thread::hardware_concurrency()}) {
LOG(INFO) << "Parallelism Factor: " << parallelismFactor;
nimble::VeloxWriterOptions writerOptions;
std::shared_ptr<folly::CPUThreadPoolExecutor> executor;

if (parallelismFactor > 0) {
auto executor =
executor =
std::make_shared<folly::CPUThreadPoolExecutor>(parallelismFactor);
writerOptions.encodingExecutor = executor;
writerOptions.writeExecutor = executor;
writerOptions.encodingExecutor = folly::getKeepAliveToken(*executor);
writerOptions.writeExecutor = folly::getKeepAliveToken(*executor);
}

for (auto i = 0; i < iterations; ++i) {
Expand Down Expand Up @@ -2527,11 +2530,13 @@ TEST_F(VeloxReaderTests, FuzzComplex) {

for (auto parallelismFactor : {0U, 1U, std::thread::hardware_concurrency()}) {
LOG(INFO) << "Parallelism Factor: " << parallelismFactor;
std::shared_ptr<folly::CPUThreadPoolExecutor> executor;

if (parallelismFactor > 0) {
auto executor =
executor =
std::make_shared<folly::CPUThreadPoolExecutor>(parallelismFactor);
writerOptions.encodingExecutor = executor;
writerOptions.writeExecutor = executor;
writerOptions.encodingExecutor = folly::getKeepAliveToken(*executor);
writerOptions.writeExecutor = folly::getKeepAliveToken(*executor);
}

for (auto i = 0; i < iterations; ++i) {
Expand Down
Loading