Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion be/src/exec/csv_scan_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ Status CsvScanNode::get_next(RuntimeState* state, RowBatch* row_batch, bool* eos
RETURN_IF_ERROR(exec_debug_action(TExecNodePhase::GETNEXT));
RETURN_IF_CANCELLED(state);
SCOPED_TIMER(_runtime_profile->total_time_counter());
SCOPED_TIMER(materialize_tuple_timer());

if (reached_limit()) {
*eos = true;
Expand Down
1 change: 0 additions & 1 deletion be/src/exec/es_scan_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ Status EsScanNode::get_next(RuntimeState* state, RowBatch* row_batch, bool* eos)
RETURN_IF_ERROR(exec_debug_action(TExecNodePhase::GETNEXT));
RETURN_IF_CANCELLED(state);
SCOPED_TIMER(_runtime_profile->total_time_counter());
SCOPED_TIMER(materialize_tuple_timer());

// create tuple
MemPool* tuple_pool = row_batch->tuple_data_pool();
Expand Down
1 change: 0 additions & 1 deletion be/src/exec/mysql_scan_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ Status MysqlScanNode::get_next(RuntimeState* state, RowBatch* row_batch, bool* e
RETURN_IF_ERROR(exec_debug_action(TExecNodePhase::GETNEXT));
RETURN_IF_CANCELLED(state);
SCOPED_TIMER(_runtime_profile->total_time_counter());
SCOPED_TIMER(materialize_tuple_timer());

// create new tuple buffer for row_batch
int tuple_buffer_size = row_batch->capacity() * _tuple_desc->byte_size();
Expand Down
1 change: 0 additions & 1 deletion be/src/exec/odbc_scan_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ Status OdbcScanNode::get_next(RuntimeState* state, RowBatch* row_batch, bool* eo
RETURN_IF_ERROR(exec_debug_action(TExecNodePhase::GETNEXT));
RETURN_IF_CANCELLED(state);
SCOPED_TIMER(_runtime_profile->total_time_counter());
SCOPED_TIMER(materialize_tuple_timer());

if (reached_limit()) {
*eos = true;
Expand Down
6 changes: 0 additions & 6 deletions be/src/exec/scan_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ namespace doris {
const string ScanNode::_s_bytes_read_counter = "BytesRead";
const string ScanNode::_s_rows_read_counter = "RowsRead";
const string ScanNode::_s_total_throughput_counter = "TotalReadThroughput";
const string ScanNode::_s_materialize_tuple_timer = "MaterializeTupleTime(*)";
const string ScanNode::_s_num_disks_accessed_counter = "NumDiskAccess";
const string ScanNode::_s_scanner_thread_counters_prefix = "ScannerThreads";
const string ScanNode::_s_scanner_thread_total_wallclock_time =
"ScannerThreadsTotalWallClockTime";

Status ScanNode::prepare(RuntimeState* state) {
RETURN_IF_ERROR(ExecNode::prepare(state));
Expand All @@ -42,8 +38,6 @@ Status ScanNode::prepare(RuntimeState* state) {
_total_throughput_counter = runtime_profile()->add_rate_counter(
_s_total_throughput_counter, _bytes_read_counter);
#endif
_materialize_tuple_timer = ADD_CHILD_TIMER(runtime_profile(), _s_materialize_tuple_timer,
_s_scanner_thread_total_wallclock_time);
_num_disks_accessed_counter =
ADD_COUNTER(runtime_profile(), _s_num_disks_accessed_counter, TUnit::UNIT);

Expand Down
16 changes: 0 additions & 16 deletions be/src/exec/scan_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,6 @@ class TScanRange;
//
// ScanRangesComplete - number of scan ranges completed
//
// MaterializeTupleTime - time spent in creating in-memory tuple format
//
// ScannerThreadsTotalWallClockTime - total time spent in all scanner threads.
//
// ScannerThreadsUserTime, ScannerThreadsSysTime,
// ScannerThreadsVoluntaryContextSwitches, ScannerThreadsInvoluntaryContextSwitches -
// these are aggregated counters across all scanner threads of this scan node. They
// are taken from getrusage. See RuntimeProfile::ThreadCounters for details.
//
class ScanNode : public ExecNode {
public:
ScanNode(ObjectPool* pool, const TPlanNode& tnode, const DescriptorTbl& descs)
Expand All @@ -99,18 +90,12 @@ class ScanNode : public ExecNode {
RuntimeProfile::Counter* total_throughput_counter() const {
return _total_throughput_counter;
}
RuntimeProfile::Counter* materialize_tuple_timer() const {
return _materialize_tuple_timer;
}

// names of ScanNode common counters
static const std::string _s_bytes_read_counter;
static const std::string _s_rows_read_counter;
static const std::string _s_total_throughput_counter;
static const std::string _s_num_disks_accessed_counter;
static const std::string _s_materialize_tuple_timer;
static const std::string _s_scanner_thread_counters_prefix;
static const std::string _s_scanner_thread_total_wallclock_time;

protected:
RuntimeProfile::Counter* _bytes_read_counter; // # bytes read from the scanner
Expand All @@ -119,7 +104,6 @@ class ScanNode : public ExecNode {
// Wall based aggregate read throughput [bytes/sec]
RuntimeProfile::Counter* _total_throughput_counter;
RuntimeProfile::Counter* _num_disks_accessed_counter;
RuntimeProfile::Counter* _materialize_tuple_timer; // time writing tuple slots
};

}
Expand Down
1 change: 0 additions & 1 deletion be/src/exec/schema_scan_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ Status SchemaScanNode::get_next(RuntimeState* state, RowBatch* row_batch,

RETURN_IF_CANCELLED(state);
SCOPED_TIMER(_runtime_profile->total_time_counter());
SCOPED_TIMER(materialize_tuple_timer());

if (reached_limit()) {
*eos = true;
Expand Down