Skip to content

GH-34871: [C++] Fixed the add_dataset_test function to properly refer to the test file #34872

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
kou merged 1 commit into from
Apr 4, 2023
Merged

GH-34871: [C++] Fixed the add_dataset_test function to properly refer to the test file #34872

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
2 changes: 2 additions & 0 deletions cpp/src/arrow/dataset/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,9 @@ function(ADD_ARROW_DATASET_TEST REL_TEST_NAME)
PREFIX
${PREFIX}
SOURCES
${REL_TEST_NAME}.cc
test_util_internal.cc
../acero/test_util_internal.cc
LABELS
${LABELS}
${ARG_UNPARSED_ARGUMENTS})
Expand Down
9 changes: 5 additions & 4 deletions cpp/src/arrow/dataset/file_csv_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <utility>
#include <vector>

#include "arrow/acero/exec_plan.h"
#include "arrow/csv/writer.h"
#include "arrow/dataset/dataset_internal.h"
#include "arrow/dataset/file_base.h"
Expand Down Expand Up @@ -135,10 +136,10 @@ class TestCsvFileFormat : public FileFormatFixtureMixin<CsvFormatHelper>,
if (UseScanV2()) {
ScanV2Options v2_options = MigrateLegacyOptions(fragment);
EXPECT_TRUE(ScanV2Options::AddFieldsNeededForFilter(&v2_options).ok());
EXPECT_OK_AND_ASSIGN(std::unique_ptr<RecordBatchReader> reader,
compute::DeclarationToReader(
compute::Declaration("scan2", std::move(v2_options)),
/*use_threads=*/false));
EXPECT_OK_AND_ASSIGN(
std::unique_ptr<RecordBatchReader> reader,
acero::DeclarationToReader(acero::Declaration("scan2", std::move(v2_options)),
/*use_threads=*/false));
struct ReaderIterator {
Result<std::shared_ptr<RecordBatch>> Next() { return reader->Next(); }
std::unique_ptr<RecordBatchReader> reader;
Expand Down
57 changes: 30 additions & 27 deletions cpp/src/arrow/dataset/file_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>

#include "arrow/acero/exec_plan.h"
#include "arrow/acero/test_util_internal.h"
#include "arrow/array/array_primitive.h"
#include "arrow/dataset/api.h"
#include "arrow/dataset/partition.h"
Expand Down Expand Up @@ -350,7 +352,7 @@ TEST_F(TestFileSystemDataset, WriteProjected) {
}

class FileSystemWriteTest : public testing::TestWithParam<std::tuple<bool, bool>> {
using PlanFactory = std::function<std::vector<cp::Declaration>(
using PlanFactory = std::function<std::vector<acero::Declaration>(
const FileSystemDatasetWriteOptions&,
std::function<Future<std::optional<cp::ExecBatch>>()>*)>;

Expand All @@ -373,30 +375,31 @@ class FileSystemWriteTest : public testing::TestWithParam<std::tuple<bool, bool>
write_options.basename_template = "{i}.feather";
const std::string kExpectedFilename = "root/0.feather";

cp::BatchesWithSchema source_data;
acero::BatchesWithSchema source_data;
source_data.batches = {
cp::ExecBatchFromJSON({int32(), boolean()}, "[[null, true], [4, false]]"),
cp::ExecBatchFromJSON({int32(), boolean()},
"[[5, null], [6, false], [7, false]]")};
acero::ExecBatchFromJSON({int32(), boolean()}, "[[null, true], [4, false]]"),
acero::ExecBatchFromJSON({int32(), boolean()},
"[[5, null], [6, false], [7, false]]")};
source_data.schema = schema({field("i32", int32()), field("bool", boolean())});

AsyncGenerator<std::optional<cp::ExecBatch>> sink_gen;

ASSERT_OK_AND_ASSIGN(auto plan, cp::ExecPlan::Make());
auto source_decl = cp::Declaration::Sequence(
{{"source", cp::SourceNodeOptions{source_data.schema,
source_data.gen(IsParallel(), IsSlow())}}});
ASSERT_OK_AND_ASSIGN(auto plan, acero::ExecPlan::Make());
auto source_decl = acero::Declaration::Sequence(
{{"source", acero::SourceNodeOptions{source_data.schema,
source_data.gen(IsParallel(), IsSlow())}}});
auto declarations = plan_factory(write_options, &sink_gen);
declarations.insert(declarations.begin(), std::move(source_decl));
ASSERT_OK(cp::Declaration::Sequence(std::move(declarations)).AddToPlan(plan.get()));
ASSERT_OK(
acero::Declaration::Sequence(std::move(declarations)).AddToPlan(plan.get()));

if (has_output) {
ASSERT_FINISHES_OK_AND_ASSIGN(auto out_batches,
cp::StartAndCollect(plan.get(), sink_gen));
cp::AssertExecBatchesEqualIgnoringOrder(source_data.schema, source_data.batches,
out_batches);
acero::StartAndCollect(plan.get(), sink_gen));
acero::AssertExecBatchesEqualIgnoringOrder(source_data.schema, source_data.batches,
out_batches);
} else {
ASSERT_FINISHES_OK(cp::StartAndFinish(plan.get()));
ASSERT_FINISHES_OK(acero::StartAndFinish(plan.get()));
}

// Read written dataset and make sure it matches
Expand All @@ -405,39 +408,39 @@ class FileSystemWriteTest : public testing::TestWithParam<std::tuple<bool, bool>
ASSERT_OK_AND_ASSIGN(auto written_dataset, dataset_factory->Finish(FinishOptions{}));
AssertSchemaEqual(*source_data.schema, *written_dataset->schema());

ASSERT_OK_AND_ASSIGN(plan, cp::ExecPlan::Make());
ASSERT_OK_AND_ASSIGN(plan, acero::ExecPlan::Make());
ASSERT_OK_AND_ASSIGN(auto scanner_builder, written_dataset->NewScan());
ASSERT_OK_AND_ASSIGN(auto scanner, scanner_builder->Finish());
ASSERT_OK(cp::Declaration::Sequence(
ASSERT_OK(acero::Declaration::Sequence(
{
{"scan", ScanNodeOptions{written_dataset, scanner->options()}},
{"sink", cp::SinkNodeOptions{&sink_gen}},
{"sink", acero::SinkNodeOptions{&sink_gen}},
})
.AddToPlan(plan.get()));

ASSERT_FINISHES_OK_AND_ASSIGN(auto written_batches,
cp::StartAndCollect(plan.get(), sink_gen));
cp::AssertExecBatchesEqualIgnoringOrder(source_data.schema, source_data.batches,
written_batches);
acero::StartAndCollect(plan.get(), sink_gen));
acero::AssertExecBatchesEqualIgnoringOrder(source_data.schema, source_data.batches,
written_batches);
}
};

TEST_P(FileSystemWriteTest, Write) {
auto plan_factory =
[](const FileSystemDatasetWriteOptions& write_options,
std::function<Future<std::optional<cp::ExecBatch>>()>* sink_gen) {
return std::vector<cp::Declaration>{{"write", WriteNodeOptions{write_options}}};
};
auto plan_factory = [](const FileSystemDatasetWriteOptions& write_options,
std::function<Future<std::optional<cp::ExecBatch>>()>*
sink_gen) {
return std::vector<acero::Declaration>{{"write", WriteNodeOptions{write_options}}};
};
TestDatasetWriteRoundTrip(plan_factory, /*has_output=*/false);
}

TEST_P(FileSystemWriteTest, TeeWrite) {
auto plan_factory =
[](const FileSystemDatasetWriteOptions& write_options,
std::function<Future<std::optional<cp::ExecBatch>>()>* sink_gen) {
return std::vector<cp::Declaration>{
return std::vector<acero::Declaration>{
{"tee", WriteNodeOptions{write_options}},
{"sink", cp::SinkNodeOptions{sink_gen}},
{"sink", acero::SinkNodeOptions{sink_gen}},
};
};
TestDatasetWriteRoundTrip(plan_factory, /*has_output=*/true);
Expand Down
Loading