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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
GH-34871: [C++] Fixed the add_dataset_test function to properly refer to the test file by westonpace · Pull Request #34872 · apache/arrow · GitHub
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
GH-34871: [C++] Fixed the add_dataset_test function to properly refer to the test file by westonpace · Pull Request #34872 · apache/arrow · GitHub
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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

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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
GH-34871: [C++] Fixed the add_dataset_test function to properly refer to the test file by westonpace · Pull Request #34872 · apache/arrow · GitHub
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
GH-34871: [C++] Fixed the add_dataset_test function to properly refer to the test file by westonpace · Pull Request #34872 · apache/arrow · GitHub
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
GH-34871: [C++] Fixed the add_dataset_test function to properly refer to the test file by westonpace · Pull Request #34872 · apache/arrow · GitHub
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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