github-actions[bot] commented on code in PR #28781:
URL: https://github.com/apache/doris/pull/28781#discussion_r1433616346
##########
be/src/vec/exec/scan/scan_task_queue.cpp:
##########
@@ -23,35 +23,28 @@
namespace doris {
namespace taskgroup {
+
static void empty_function() {}
-ScanTask::ScanTask() : ScanTask(empty_function, nullptr, nullptr, 1) {}
+ScanTask::ScanTask() : ScanTask(empty_function, nullptr) {}
ScanTask::ScanTask(WorkFunction scan_func,
- std::shared_ptr<vectorized::ScannerContext> scanner_context,
- TGSTEntityPtr scan_entity, int priority)
- : scan_func(std::move(scan_func)),
- scanner_context(scanner_context),
- scan_entity(scan_entity),
- priority(priority) {}
-
-ScanTaskQueue::ScanTaskQueue() :
_queue(config::doris_scanner_thread_pool_queue_size) {}
+ std::shared_ptr<vectorized::ScannerContext> scanner_context)
+ : scan_func(std::move(scan_func)), scanner_context(scanner_context) {}
Status ScanTaskQueue::try_push_back(ScanTask scan_task) {
- if (_queue.try_put(std::move(scan_task))) {
- VLOG_DEBUG << "try_push_back scan task " <<
scan_task.scanner_context->ctx_id << " "
- << scan_task.priority;
- return Status::OK();
- } else {
- return Status::InternalError("failed to submit scan task to
ScanTaskQueue");
- }
+ _queue.emplace(scan_task);
+ VLOG_DEBUG << "try_push_back scan task " <<
scan_task.scanner_context->ctx_id;
+ return Status::OK();
}
-bool ScanTaskQueue::try_get(ScanTask* scan_task, uint32_t timeout_ms) {
- auto r = _queue.blocking_get(scan_task, timeout_ms);
- if (r) {
- VLOG_DEBUG << "try get scan task " <<
scan_task->scanner_context->ctx_id << " "
- << scan_task->priority;
+
+bool ScanTaskQueue::try_get(ScanTask* scan_task) {
+ size_t queue_size = _queue.size();
+ if (queue_size > 0) {
+ *scan_task = _queue.front();
+ _queue.pop();
+ return true;
Review Comment:
warning: redundant boolean literal in conditional return statement
[readability-simplify-boolean-expr]
be/src/vec/exec/scan/scan_task_queue.cpp:41:
```diff
- if (queue_size > 0) {
- *scan_task = _queue.front();
- _queue.pop();
- return true;
- }
- return false;
+ return queue_size > 0;
```
##########
be/src/vec/exec/scan/scan_task_queue.cpp:
##########
@@ -23,35 +23,28 @@
namespace doris {
namespace taskgroup {
+
static void empty_function() {}
-ScanTask::ScanTask() : ScanTask(empty_function, nullptr, nullptr, 1) {}
+ScanTask::ScanTask() : ScanTask(empty_function, nullptr) {}
ScanTask::ScanTask(WorkFunction scan_func,
- std::shared_ptr<vectorized::ScannerContext> scanner_context,
- TGSTEntityPtr scan_entity, int priority)
- : scan_func(std::move(scan_func)),
- scanner_context(scanner_context),
- scan_entity(scan_entity),
- priority(priority) {}
-
-ScanTaskQueue::ScanTaskQueue() :
_queue(config::doris_scanner_thread_pool_queue_size) {}
+ std::shared_ptr<vectorized::ScannerContext> scanner_context)
+ : scan_func(std::move(scan_func)), scanner_context(scanner_context) {}
Status ScanTaskQueue::try_push_back(ScanTask scan_task) {
- if (_queue.try_put(std::move(scan_task))) {
- VLOG_DEBUG << "try_push_back scan task " <<
scan_task.scanner_context->ctx_id << " "
- << scan_task.priority;
- return Status::OK();
- } else {
- return Status::InternalError("failed to submit scan task to
ScanTaskQueue");
- }
+ _queue.emplace(scan_task);
+ VLOG_DEBUG << "try_push_back scan task " <<
scan_task.scanner_context->ctx_id;
+ return Status::OK();
}
-bool ScanTaskQueue::try_get(ScanTask* scan_task, uint32_t timeout_ms) {
- auto r = _queue.blocking_get(scan_task, timeout_ms);
- if (r) {
- VLOG_DEBUG << "try get scan task " <<
scan_task->scanner_context->ctx_id << " "
- << scan_task->priority;
+
+bool ScanTaskQueue::try_get(ScanTask* scan_task) {
Review Comment:
warning: method 'try_get' can be made static
[readability-convert-member-functions-to-static]
be/src/vec/exec/scan/scan_task_queue.h:42:
```diff
- bool try_get(ScanTask* scan_task);
+ static bool try_get(ScanTask* scan_task);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
