Code cleanup to use concept serial / parallel to replace single-threaded / multi-threaded as task execution modes #10792
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
facebook-github-bot
added
the
CLA Signed
✅ Deploy Preview for meta-velox canceled.
|
zhztheplayer
force-pushed
the
wip-execmodes
branch
from
93ee298
to
ec7fadd
Compare
zhztheplayer
changed the title
|
@tanjialiang Would you review this? Thanks. |
xiaoxmeng
reviewed
Aug 28, 2024
There was a problem hiding this comment.
@zhztheplayer thanks for the refactor. Not sure if we want to rename things in test code.
velox/exec/Driver.h
Outdated
| @@ -241,7 +241,7 @@ class BlockingState { | |||
| } | |||
|
|
|||
| /// Moves out the blocking future stored inside. Can be called only once. | |||
| /// Used in single-threaded execution. | |||
| /// Used in serial execution. | |||
| }; | ||
| } // namespace | ||
|
|
||
| /// A test fixture that runs cases within multi-threaded execution mode. | ||
| /// A test fixture that runs cases within parallel execution mode. | ||
| class SharedArbitrationTest : public SharedArbitrationTestBase { |
There was a problem hiding this comment.
Can we remove SharedArbitrationTestBase? Let's do this first?
There was a problem hiding this comment.
Will open a pr asap
velox/exec/tests/TableScanTest.cpp
Outdated
| @@ -3277,7 +3277,7 @@ TEST_F(TableScanTest, remainingFilterLazyWithMultiReferences) { | |||
| writeToFile(file->getPath(), {vector}); | |||
| CursorParameters params; | |||
| params.copyResult = false; | |||
| params.singleThreaded = true; | |||
| params.serial = true; | |||
There was a problem hiding this comment.
s/serial/serialExecutionMode/
velox/exec/tests/utils/Cursor.h
Outdated
| @@ -63,8 +63,8 @@ struct CursorParameters { | |||
|
|
|||
| bool copyResult = true; | |||
|
|
|||
| /// If true, use single threaded execution. | |||
| bool singleThreaded = false; | |||
| /// If true, use serial execution. Use parallel execution otherwise. | |||
There was a problem hiding this comment.
use serial execution mode.
velox/exec/tests/utils/Cursor.h
Outdated
| /// If true, use single threaded execution. | ||
| bool singleThreaded = false; | ||
| /// If true, use serial execution. Use parallel execution otherwise. | ||
| bool serial = false; |
There was a problem hiding this comment.
s/serial/serialExecutionMode/
velox/exec/tests/utils/Cursor.cpp
Outdated
| @@ -204,20 +204,20 @@ class TaskCursorBase : public TaskCursor { | |||
| std::shared_ptr<folly::Executor> executor_; | |||
| }; | |||
|
|
|||
| class MultiThreadedTaskCursor : public TaskCursorBase { | |||
| class ParallelTaskCursor : public TaskCursorBase { | |||
There was a problem hiding this comment.
Do we want to rename this?
velox/exec/Task.cpp
Outdated
| @@ -943,7 +947,7 @@ void Task::resume(std::shared_ptr<Task> self) { | |||
| // event. The Driver gets enqueued by the promise realization. | |||
| // | |||
| // Do not continue the driver if no executor is supplied, | |||
| // This usually happens in single-threaded execution. | |||
| // This usually happens in serial execution. | |||
zhztheplayer
force-pushed
the
wip-execmodes
branch
from
97a8b8e
to
cc0d038
Compare
xiaoxmeng
approved these changes
Aug 28, 2024
| @@ -34,17 +34,17 @@ TEST_F(AssertQueryBuilderTest, basic) { | |||
| .assertResults(data); | |||
| } | |||
|
|
|||
| TEST_F(AssertQueryBuilderTest, singleThreaded) { | |||
| TEST_F(AssertQueryBuilderTest, serial) { | |||
There was a problem hiding this comment.
s/serial/serialExecution/
|
@xiaoxmeng has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
@xiaoxmeng has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
@xiaoxmeng merged this pull request in ede7d0b. |
|
Conbench analyzed the 1 benchmark run on commit There were no benchmark performance regressions. 🎉 The full Conbench report has more details. |
Joe-Abraham
pushed a commit
to Joe-Abraham/velox
that referenced
this pull request
Sep 2, 2024
…ded / multi-threaded as task execution modes (facebookincubator#10792) Summary: A code cleanup for task execution mode concepts, to uniformly use `serial` / `parallel`. Remove usages of `single-threaded` / `multi-threaded`. Fixes facebookincubator#10745 Pull Request resolved: facebookincubator#10792 Reviewed By: Yuhta, bikramSingh91 Differential Revision: D61956385 Pulled By: xiaoxmeng fbshipit-source-id: c601451cc5059aaec304d9e7c34506856f51fbdf
Joe-Abraham
pushed a commit
to Joe-Abraham/velox
that referenced
this pull request
Sep 3, 2024
…ded / multi-threaded as task execution modes (facebookincubator#10792) Summary: A code cleanup for task execution mode concepts, to uniformly use `serial` / `parallel`. Remove usages of `single-threaded` / `multi-threaded`. Fixes facebookincubator#10745 Pull Request resolved: facebookincubator#10792 Reviewed By: Yuhta, bikramSingh91 Differential Revision: D61956385 Pulled By: xiaoxmeng fbshipit-source-id: c601451cc5059aaec304d9e7c34506856f51fbdf
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A code cleanup for task execution mode concepts, to uniformly use
serial/parallel. Remove usages ofsingle-threaded/multi-threaded.Fixes #10745