Skip to content

[native] Refactor TaskManagerTest to not create common::WriterOptions instance #23480

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

Merged
kewang1024 merged 1 commit into from
Aug 22, 2024
Merged

[native] Refactor TaskManagerTest to not create common::WriterOptions instance #23480

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
10 changes: 7 additions & 3 deletions presto-native-execution/presto_cpp/main/tests/TaskManagerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "velox/dwio/common/FileSink.h"
#include "velox/dwio/common/WriterFactory.h"
#include "velox/dwio/common/tests/utils/BatchMaker.h"
#include "velox/dwio/dwrf/writer/Writer.h"
Copy link
Copy Markdown
Contributor

@yingsu00 yingsu00 Aug 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kewang1024 Can you please explain why making this change? The TaskManagerTest is file-format orthogonal and should NOT depend on DWRF. We've been trying to remove DWRF dependencies from HiveConnectorTest as well, e.g. facebookincubator/velox#10150

Copy link
Copy Markdown
Collaborator Author

@kewang1024 kewang1024 Aug 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Essentially we want to make common::WriterOptions::processConfigs function pure virtual to make sure every data format will implement its own.
As a result, common::WriterOptions can not be initiated.

cc: @xiaoxmeng

Copy link
Copy Markdown
Contributor

@xiaoxmeng xiaoxmeng Aug 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yingsu00 good point. We might need this change as we disable creation of dwio common writer options as it is an abstract class now. If we want to cover parquet file format here, then we can make this a parameterized test with different file formats. But I guess it is not required for TaskManagerTest.

Copy link
Copy Markdown
Contributor

@xiaoxmeng xiaoxmeng Aug 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will break Meta internal test as Velox side change on Writer options is landed.

Copy link
Copy Markdown
Collaborator

@majetideepak majetideepak Aug 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this header still?

#include "velox/exec/Exchange.h"
#include "velox/exec/Values.h"
#include "velox/exec/tests/utils/PlanBuilder.h"
Expand Down Expand Up @@ -270,6 +271,8 @@ class TaskManagerTest : public testing::Test {
"http://{}:{}",
serverAddress.getAddressStr(),
serverAddress.getPort()));
writerFactory_ =
dwio::common::getWriterFactory(dwio::common::FileFormat::DWRF);
}

void TearDown() override {
Expand Down Expand Up @@ -299,13 +302,13 @@ class TaskManagerTest : public testing::Test {
void writeToFile(
const std::string& filePath,
const std::vector<RowVectorPtr>& vectors) {
auto options = std::make_shared<dwio::common::WriterOptions>();
auto options = writerFactory_->createWriterOptions();
options->schema = rowType_;
options->memoryPool = rootPool_.get();
auto sink = std::make_unique<dwio::common::LocalFileSink>(
filePath, dwio::common::FileSink::Options{});
auto writer = dwio::common::getWriterFactory(dwio::common::FileFormat::DWRF)
->createWriter(std::move(sink), options);
auto writer =
writerFactory_->createWriter(std::move(sink), std::move(options));

for (size_t i = 0; i < vectors.size(); ++i) {
writer->write(vectors[i]);
Expand Down Expand Up @@ -674,6 +677,7 @@ class TaskManagerTest : public testing::Test {
long splitSequenceId_{0};
std::shared_ptr<http::HttpClientConnectionPool> connPool_ =
std::make_shared<http::HttpClientConnectionPool>();
std::shared_ptr<dwio::common::WriterFactory> writerFactory_;
};

// Runs "select * from t where c0 % 5 = 0" query.
Expand Down