diff --git a/velox/benchmarks/QueryBenchmarkBase.h b/velox/benchmarks/QueryBenchmarkBase.h index 30572ad0aa380..a5a172a8216cb 100644 --- a/velox/benchmarks/QueryBenchmarkBase.h +++ b/velox/benchmarks/QueryBenchmarkBase.h @@ -86,8 +86,8 @@ class QueryBenchmarkBase { virtual ~QueryBenchmarkBase() = default; virtual void initialize(); void shutdown(); - std::pair, std::vector> - run(const exec::test::TpchPlan& tpchPlan); + std::pair, std::vector> run( + const exec::test::TpchPlan& tpchPlan); virtual std::vector> listSplits( const std::string& path, diff --git a/velox/connectors/tpch/tests/SpeedTest.cpp b/velox/connectors/tpch/tests/SpeedTest.cpp index 3468b3cc93211..0e8216260a90c 100644 --- a/velox/connectors/tpch/tests/SpeedTest.cpp +++ b/velox/connectors/tpch/tests/SpeedTest.cpp @@ -94,11 +94,11 @@ class TpchSpeedTest { auto startTime = system_clock::now(); intervalStart_ = startTime; - CursorParameters params; + exec::CursorParameters params; params.planNode = plan; params.maxDrivers = FLAGS_max_drivers; - auto taskCursor = TaskCursor::create(params); + auto taskCursor = exec::TaskCursor::create(params); taskCursor->start(); auto task = taskCursor->task(); diff --git a/velox/exec/Cursor.cpp b/velox/exec/Cursor.cpp index 570c314e70f66..9b394b985d09b 100644 --- a/velox/exec/Cursor.cpp +++ b/velox/exec/Cursor.cpp @@ -19,7 +19,7 @@ #include -namespace facebook::velox::exec::test { +namespace facebook::velox::exec { bool waitForTaskDriversToFinish(exec::Task* task, uint64_t maxWaitMicros) { VELOX_USER_CHECK(!task->isRunning()); @@ -460,4 +460,4 @@ bool RowCursor::hasNext() { return currentRow_ < numRows_ || cursor_->hasNext(); } -} // namespace facebook::velox::exec::test +} // namespace facebook::velox::exec diff --git a/velox/exec/Cursor.h b/velox/exec/Cursor.h index 51fe73eb403c4..02bcb1d813cc2 100644 --- a/velox/exec/Cursor.h +++ b/velox/exec/Cursor.h @@ -18,7 +18,7 @@ #include "velox/core/PlanNode.h" #include "velox/exec/Task.h" -namespace facebook::velox::exec::test { +namespace facebook::velox::exec { /// Wait up to maxWaitMicros for all the task drivers to finish. The function /// returns true if all the drivers have finished, otherwise false. @@ -186,4 +186,4 @@ class RowCursor { vector_size_t numRows_ = 0; }; -} // namespace facebook::velox::exec::test +} // namespace facebook::velox::exec diff --git a/velox/exec/tests/AssignUniqueIdTest.cpp b/velox/exec/tests/AssignUniqueIdTest.cpp index a4f1f41eb13ca..d8dc8f4a36420 100644 --- a/velox/exec/tests/AssignUniqueIdTest.cpp +++ b/velox/exec/tests/AssignUniqueIdTest.cpp @@ -22,6 +22,7 @@ using namespace facebook::velox; using namespace facebook::velox::test; +using namespace facebook::velox::exec; using namespace facebook::velox::exec::test; class AssignUniqueIdTest : public OperatorTestBase { diff --git a/velox/exec/tests/EnforceSingleRowTest.cpp b/velox/exec/tests/EnforceSingleRowTest.cpp index 42cb7295c02d6..7e0909d02e2a1 100644 --- a/velox/exec/tests/EnforceSingleRowTest.cpp +++ b/velox/exec/tests/EnforceSingleRowTest.cpp @@ -17,6 +17,7 @@ #include "velox/exec/tests/utils/PlanBuilder.h" using namespace facebook::velox; +using namespace facebook::velox::exec; using namespace facebook::velox::exec::test; class EnforceSingleRowTest : public OperatorTestBase { diff --git a/velox/exec/tests/LimitTest.cpp b/velox/exec/tests/LimitTest.cpp index 0c1cae8fe15e4..68c27a5bafdd7 100644 --- a/velox/exec/tests/LimitTest.cpp +++ b/velox/exec/tests/LimitTest.cpp @@ -18,6 +18,7 @@ #include "velox/exec/tests/utils/PlanBuilder.h" using namespace facebook::velox; +using namespace facebook::velox::exec; using namespace facebook::velox::exec::test; class LimitTest : public HiveConnectorTestBase {}; diff --git a/velox/exec/tests/MergeTest.cpp b/velox/exec/tests/MergeTest.cpp index 743c462a37753..746ee87782768 100644 --- a/velox/exec/tests/MergeTest.cpp +++ b/velox/exec/tests/MergeTest.cpp @@ -17,6 +17,7 @@ #include "velox/exec/tests/utils/PlanBuilder.h" using namespace facebook::velox; +using namespace facebook::velox::exec; using namespace facebook::velox::exec::test; class MergeTest : public OperatorTestBase { diff --git a/velox/exec/tests/QueryAssertionsTest.cpp b/velox/exec/tests/QueryAssertionsTest.cpp index 8d063ea43a808..21b5d60099a08 100644 --- a/velox/exec/tests/QueryAssertionsTest.cpp +++ b/velox/exec/tests/QueryAssertionsTest.cpp @@ -22,6 +22,7 @@ #include "velox/vector/fuzzer/VectorFuzzer.h" #include "velox/vector/tests/utils/VectorTestBase.h" +using namespace facebook::velox::exec; using namespace facebook::velox::exec::test; using namespace facebook::velox; diff --git a/velox/exec/tests/TableScanTest.cpp b/velox/exec/tests/TableScanTest.cpp index d19b71760b195..92bb6016f6ad7 100644 --- a/velox/exec/tests/TableScanTest.cpp +++ b/velox/exec/tests/TableScanTest.cpp @@ -4100,14 +4100,14 @@ TEST_F(TableScanTest, addSplitsToFailedTask) { writeToFile(filePath->getPath(), {data}); core::PlanNodeId scanNodeId; - exec::test::CursorParameters params; + CursorParameters params; params.planNode = exec::test::PlanBuilder() .tableScan(ROW({"c0"}, {INTEGER()})) .capturePlanNodeId(scanNodeId) .project({"5 / c0"}) .planNode(); - auto cursor = exec::test::TaskCursor::create(params); + auto cursor = TaskCursor::create(params); cursor->task()->addSplit(scanNodeId, makeHiveSplit(filePath->getPath())); EXPECT_THROW(while (cursor->moveNext()){}, VeloxUserError); diff --git a/velox/exec/tests/TaskListenerTest.cpp b/velox/exec/tests/TaskListenerTest.cpp index 61bd7925a6895..9d75d0ad83202 100644 --- a/velox/exec/tests/TaskListenerTest.cpp +++ b/velox/exec/tests/TaskListenerTest.cpp @@ -17,6 +17,7 @@ #include "velox/exec/tests/utils/PlanBuilder.h" using namespace facebook::velox; +using namespace facebook::velox::exec; using namespace facebook::velox::exec::test; struct TaskCompletedEvent { diff --git a/velox/exec/tests/UnnestTest.cpp b/velox/exec/tests/UnnestTest.cpp index bef3e44e79202..7203fff8b2ddf 100644 --- a/velox/exec/tests/UnnestTest.cpp +++ b/velox/exec/tests/UnnestTest.cpp @@ -20,6 +20,7 @@ #include "velox/exec/tests/utils/PlanBuilder.h" using namespace facebook::velox; +using namespace facebook::velox::exec; using namespace facebook::velox::exec::test; class UnnestTest : public OperatorTestBase, diff --git a/velox/functions/lib/aggregates/tests/utils/AggregationTestBase.cpp b/velox/functions/lib/aggregates/tests/utils/AggregationTestBase.cpp index 95d3a267b12cf..e96b14c30b6e5 100644 --- a/velox/functions/lib/aggregates/tests/utils/AggregationTestBase.cpp +++ b/velox/functions/lib/aggregates/tests/utils/AggregationTestBase.cpp @@ -33,8 +33,8 @@ #include "velox/expression/Expr.h" #include "velox/expression/SignatureBinder.h" +using facebook::velox::exec::CursorParameters; using facebook::velox::exec::test::AssertQueryBuilder; -using facebook::velox::exec::test::CursorParameters; using facebook::velox::exec::test::PlanBuilder; using facebook::velox::test::VectorMaker; diff --git a/velox/runner/LocalRunner.cpp b/velox/runner/LocalRunner.cpp index b16da5fdc702d..d10658ebaaf55 100644 --- a/velox/runner/LocalRunner.cpp +++ b/velox/runner/LocalRunner.cpp @@ -61,7 +61,7 @@ void LocalRunner::start() { VELOX_CHECK_EQ(state_, State::kInitialized); auto lastStage = makeStages(); params_.planNode = plan_->fragments().back().fragment.planNode; - auto cursor = exec::test::TaskCursor::create(params_); + auto cursor = exec::TaskCursor::create(params_); stages_.push_back({cursor->task()}); // Add table scan splits to the final gathere stage. for (auto& scan : fragments_.back().scans) { diff --git a/velox/runner/LocalRunner.h b/velox/runner/LocalRunner.h index ca6481facfb4b..22efbe5de6ddb 100644 --- a/velox/runner/LocalRunner.h +++ b/velox/runner/LocalRunner.h @@ -100,11 +100,11 @@ class LocalRunner : public Runner, const std::vector fragments_; const MultiFragmentPlan::Options& options_; - exec::test::CursorParameters params_; + exec::CursorParameters params_; tsan_atomic state_{State::kInitialized}; - std::unique_ptr cursor_; + std::unique_ptr cursor_; std::vector>> stages_; std::exception_ptr error_; std::shared_ptr splitSourceFactory_; diff --git a/velox/substrait/tests/VeloxSubstraitRoundTripTest.cpp b/velox/substrait/tests/VeloxSubstraitRoundTripTest.cpp index d9af98c2e7bb8..f9a81ae45ceb6 100644 --- a/velox/substrait/tests/VeloxSubstraitRoundTripTest.cpp +++ b/velox/substrait/tests/VeloxSubstraitRoundTripTest.cpp @@ -28,6 +28,7 @@ using namespace facebook::velox; using namespace facebook::velox::test; +using namespace facebook::velox::exec; using namespace facebook::velox::exec::test; using namespace facebook::velox::substrait; diff --git a/velox/tool/trace/TraceReplayTaskRunner.cpp b/velox/tool/trace/TraceReplayTaskRunner.cpp index 0a5aa32eb05d6..b9876fdd36c6c 100644 --- a/velox/tool/trace/TraceReplayTaskRunner.cpp +++ b/velox/tool/trace/TraceReplayTaskRunner.cpp @@ -20,7 +20,7 @@ namespace facebook::velox::tool::trace { std::pair, RowVectorPtr> TraceReplayTaskRunner::run( bool copyResults) { - auto cursor = exec::test::TaskCursor::create(cursorParams_); + auto cursor = exec::TaskCursor::create(cursorParams_); std::vector results; auto* task = cursor->task().get(); addSplits(task); diff --git a/velox/tool/trace/TraceReplayTaskRunner.h b/velox/tool/trace/TraceReplayTaskRunner.h index a00b2d2311ea6..4f1232862572a 100644 --- a/velox/tool/trace/TraceReplayTaskRunner.h +++ b/velox/tool/trace/TraceReplayTaskRunner.h @@ -53,7 +53,7 @@ class TraceReplayTaskRunner { static std::shared_ptr copy( const std::vector& results); - exec::test::CursorParameters cursorParams_; + exec::CursorParameters cursorParams_; std::unordered_map> splits_; bool noMoreSplits_ = false; };