database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Unify the print method of TUniqueId (#487)

Browse Source
This commit is contained in:
Mingyu Chen
2018-12-29 16:22:38 +08:00
committed by ZHAO Chun
parent 7380483394
commit ff7d3e5878
17 changed files with 83 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
be/src/runtime/data_spliter.cpp
View File

@ -31,6 +31,7 @@
#include "runtime/dpp_sink.h"
#include "runtime/load_path_mgr.h"
#include "runtime/mem_tracker.h"
#include "util/uid_util.h"
#include "util/runtime_profile.h"
#include "util/file_utils.h"
#include "gen_cpp/DataSinks_types.h"
@ -86,7 +87,7 @@ Status DataSpliter::from_thrift(
Status DataSpliter::prepare(RuntimeState* state) {
std::stringstream title;
title << "DataSplitSink (dst_id=" << state->fragment_instance_id() << ")";
title << "DataSplitSink (dst_fragment_instance_id=" << print_id(state->fragment_instance_id()) << ")";
RETURN_IF_ERROR(DataSink::prepare(state));
RETURN_IF_ERROR(Expr::prepare(
_partition_expr_ctxs, state, _row_desc, _expr_mem_tracker.get()));

4
be/src/runtime/data_stream_mgr.cpp
View File

@ -26,7 +26,7 @@
#include "runtime/data_stream_recvr.h"
#include "runtime/raw_value.h"
#include "runtime/runtime_state.h"
#include "util/debug_util.h"
#include "util/uid_util.h"
#include "gen_cpp/types.pb.h" // PUniqueId
#include "gen_cpp/BackendService.h"
@ -98,7 +98,7 @@ Status DataStreamMgr::add_data(
const PRowBatch& pb_batch, int32_t sender_id,
int be_number, int64_t packet_seq,
::google::protobuf::Closure** done) {
VLOG_ROW << "add_data(): finst_id=" << print_id(finst_id)
VLOG_ROW << "add_data(): fragment_instance_id=" << print_id(finst_id)
<< " node=" << node_id;
TUniqueId t_finst_id;
t_finst_id.hi = finst_id.hi();

2
be/src/runtime/etl_job_mgr.cpp
View File

@ -23,7 +23,7 @@
#include "gen_cpp/Status_types.h"
#include "gen_cpp/Types_types.h"
#include "service/backend_options.h"
#include "util/debug_util.h"
#include "util/uid_util.h"
#include "runtime/exec_env.h"
#include "runtime/plan_fragment_executor.h"
#include "runtime/fragment_mgr.h"

1
be/src/runtime/export_task_mgr.cpp
View File

@ -21,6 +21,7 @@
#include "runtime/fragment_mgr.h"
#include "runtime/plan_fragment_executor.h"
#include "runtime/runtime_state.h"
#include "util/uid_util.h"
#include "gen_cpp/FrontendService.h"
#include "gen_cpp/BackendService.h"

2
be/src/runtime/initial_reservations.cc
View File

@ -26,7 +26,7 @@
#include "common/object_pool.h"
#include "runtime/exec_env.h"
#include "runtime/mem_tracker.h"
#include "util/debug_util.h"
#include "util/uid_util.h"
#include "util/pretty_printer.h"
#include "common/names.h"

8
be/src/runtime/plan_fragment_executor.cpp
View File

@ -37,7 +37,7 @@
#include "runtime/row_batch.h"
#include "runtime/mem_tracker.h"
#include "util/cpu_info.h"
#include "util/debug_util.h"
#include "util/uid_util.h"
#include "util/container_util.hpp"
#include "util/parse_util.h"
#include "util/pretty_printer.h"
@ -70,7 +70,7 @@ Status PlanFragmentExecutor::prepare(const TExecPlanFragmentParams& request) {
_query_id = params.query_id;
LOG(INFO) << "Prepare(): query_id=" << print_id(_query_id)
<< " instance_id=" << print_id(params.fragment_instance_id)
<< " fragment_instance_id=" << print_id(params.fragment_instance_id)
<< " backend_num=" << request.backend_num;
// VLOG(2) << "request:\n" << apache::thrift::ThriftDebugString(request);
@ -254,7 +254,7 @@ void PlanFragmentExecutor::print_volume_ids(
}
Status PlanFragmentExecutor::open() {
LOG(INFO) << "Open(): instance_id=" << _runtime_state->fragment_instance_id();
LOG(INFO) << "Open(): fragment_instance_id=" << print_id(_runtime_state->fragment_instance_id());
// we need to start the profile-reporting thread before calling Open(), since it
// may block
@ -493,7 +493,7 @@ void PlanFragmentExecutor::update_status(const Status& status) {
}
void PlanFragmentExecutor::cancel() {
LOG(INFO) << "cancel(): instance_id=" << _runtime_state->fragment_instance_id();
LOG(INFO) << "cancel(): fragment_instance_id=" << print_id(_runtime_state->fragment_instance_id());
DCHECK(_prepared);
_runtime_state->set_is_cancelled(true);
_runtime_state->exec_env()->stream_mgr()->cancel(_runtime_state->fragment_instance_id());

4
be/src/runtime/result_sink.cpp
View File

@ -18,7 +18,7 @@
#include "runtime/result_sink.h"
#include "common/config.h"
#include "util/debug_util.h"
#include "util/uid_util.h"
#include "exprs/expr.h"
#include "runtime/row_batch.h"
#include "runtime/runtime_state.h"
@ -53,7 +53,7 @@ Status ResultSink::prepare_exprs(RuntimeState* state) {
Status ResultSink::prepare(RuntimeState* state) {
RETURN_IF_ERROR(DataSink::prepare(state));
std::stringstream title;
title << "DataBufferSender (dst_id=" << state->fragment_instance_id() << ")";
title << "DataBufferSender (dst_fragment_instance_id=" << print_id(state->fragment_instance_id()) << ")";
// create profile
_profile = state->obj_pool()->add(new RuntimeProfile(state->obj_pool(), title.str()));
// prepare output_expr

2
be/src/runtime/runtime_state.cpp
View File

@ -36,7 +36,7 @@
#include "runtime/load_path_mgr.h"
#include "util/cpu_info.h"
#include "util/mem_info.h"
#include "util/debug_util.h"
#include "util/uid_util.h"
#include "util/disk_info.h"
#include "util/file_utils.h"
#include "util/pretty_printer.h"

2
be/src/runtime/tmp_file_mgr.cc
View File

@ -28,7 +28,7 @@
// #include <gutil/strings/join.h>
#include "olap/olap_engine.h"
#include "util/debug_util.h"
#include "util/uid_util.h"
#include "util/disk_info.h"
#include "util/filesystem_util.h"
#include "runtime/exec_env.h"

5
be/src/service/internal_service.cpp
View File

@ -24,6 +24,7 @@
#include "runtime/data_stream_mgr.h"
#include "runtime/fragment_mgr.h"
#include "service/brpc.h"
#include "util/uid_util.h"
#include "util/thrift_util.h"
#include "runtime/buffer_control_block.h"
#include "runtime/result_buffer_mgr.h"
@ -150,7 +151,7 @@ Status PInternalServiceImpl<T>::_exec_plan_fragment(brpc::Controller* cntl) {
uint32_t len = ser_request.size();
RETURN_IF_ERROR(deserialize_thrift_msg(buf, &len, false, &t_request));
}
LOG(INFO) << "exec plan fragment, finst_id=" << t_request.params.fragment_instance_id
LOG(INFO) << "exec plan fragment, fragment_instance_id=" << print_id(t_request.params.fragment_instance_id)
<< ", coord=" << t_request.coord << ", backend=" << t_request.backend_num;
return _exec_env->fragment_mgr()->exec_plan_fragment(t_request);
}
@ -165,7 +166,7 @@ void PInternalServiceImpl<T>::cancel_plan_fragment(
TUniqueId tid;
tid.__set_hi(request->finst_id().hi());
tid.__set_lo(request->finst_id().lo());
LOG(INFO) << "cancel framgent, finst_id=" << tid;
LOG(INFO) << "cancel framgent, fragment_instance_id=" << print_id(tid);
auto st = _exec_env->fragment_mgr()->cancel(tid);
if (!st.ok()) {
LOG(WARNING) << "cancel plan fragment failed, errmsg=" << st.get_error_msg();

35
be/src/util/debug_util.cpp
View File

@ -78,41 +78,6 @@ THRIFT_ENUM_PRINT_FN(QueryState);
THRIFT_ENUM_PRINT_FN(TMetricKind);
THRIFT_ENUM_PRINT_FN(TUnit);
std::string print_id(const TUniqueId& id) {
std::stringstream out;
out << std::hex << id.hi << ":" << id.lo;
return out.str();
}
std::string print_id(const PUniqueId& id) {
std::stringstream out;
out << std::hex << id.hi() << ":" << id.lo();
return out.str();
}
bool parse_id(const std::string& s, TUniqueId* id) {
DCHECK(id != NULL);
const char* hi_part = s.c_str();
char* colon = const_cast<char*>(strchr(hi_part, ':'));
if (colon == NULL) {
return false;
}
const char* lo_part = colon + 1;
*colon = '\0';
char* error_hi = NULL;
char* error_lo = NULL;
id->hi = strtoul(hi_part, &error_hi, 16);
id->lo = strtoul(lo_part, &error_lo, 16);
bool valid = *error_hi == '\0' && *error_lo == '\0';
*colon = ':';
return valid;
}
std::string print_plan_node_type(const TPlanNodeType::type& type) {
std::map<int, const char*>::const_iterator i;
i = _TPlanNodeType_VALUES_TO_NAMES.find(type);

7
be/src/util/debug_util.h
View File

@ -34,19 +34,12 @@ namespace doris {
class PUniqueId;
std::string print_id(const TUniqueId& id);
std::string print_id(const PUniqueId& id);
std::string print_plan_node_type(const TPlanNodeType::type& type);
std::string print_tstmt_type(const TStmtType::type& type);
std::string print_query_state(const QueryState::type& type);
std::string PrintTUnit(const TUnit::type& type);
std::string PrintTMetricKind(const TMetricKind::type& type);
// Parse 's' into a TUniqueId object. The format of s needs to be the output format
// from PrintId. (<hi_part>:<low_part>)
// Returns true if parse succeeded.
bool parse_id(const std::string& s, TUniqueId* id);
// Returns a string "<product version number> (build <build hash>)"
// If compact == false, this string is appended: "\nBuilt on <build time>"
// This is used to set gflags build version

35
be/src/util/uid_util.cpp
View File

@ -24,4 +24,39 @@ std::ostream& operator<<(std::ostream& os, const UniqueId& uid) {
return os;
}
std::string print_id(const TUniqueId& id) {
std::stringstream out;
out << std::hex << id.hi << ":" << id.lo;
return out.str();
}
std::string print_id(const PUniqueId& id) {
std::stringstream out;
out << std::hex << id.hi() << ":" << id.lo();
return out.str();
}
bool parse_id(const std::string& s, TUniqueId* id) {
DCHECK(id != NULL);
const char* hi_part = s.c_str();
char* colon = const_cast<char*>(strchr(hi_part, ':'));
if (colon == NULL) {
return false;
}
const char* lo_part = colon + 1;
*colon = '\0';
char* error_hi = NULL;
char* error_lo = NULL;
id->hi = strtoul(hi_part, &error_hi, 16);
id->lo = strtoul(lo_part, &error_lo, 16);
bool valid = *error_hi == '\0' && *error_lo == '\0';
*colon = ':';
return valid;
}
}

13
be/src/util/uid_util.h
View File

@ -27,7 +27,7 @@
#include "gen_cpp/Types_types.h" // for TUniqueId
#include "gen_cpp/types.pb.h" // for PUniqueId
#include "util/debug_util.h"
// #include "util/debug_util.h"
#include "util/hash_util.hpp"
namespace doris {
@ -35,7 +35,7 @@ namespace doris {
// convert int to a hex format string, buf must enough to hold coverted hex string
template<typename T>
inline void to_hex(T val, char* buf) {
static const char* digits = "0123456789ABCDEF";
static const char* digits = "0123456789abcdef";
for (int i = 0; i < 2 * sizeof(T); ++i) {
buf[2 * sizeof(T) - 1 - i] = digits[val & 0x0F];
val >>= 4;
@ -111,6 +111,15 @@ inline TUniqueId generate_uuid() {
std::ostream& operator<<(std::ostream& os, const UniqueId& uid);
std::string print_id(const TUniqueId& id);
std::string print_id(const PUniqueId& id);
// Parse 's' into a TUniqueId object. The format of s needs to be the output format
// from PrintId. (<hi_part>:<low_part>)
// Returns true if parse succeeded.
bool parse_id(const std::string& s, TUniqueId* id);
} // namespace doris
namespace std {

8
be/test/util/uid_util_test.cpp
View File

@ -37,7 +37,7 @@ TEST_F(UidUtilTest, UniqueId) {
{
UniqueId id(123456789, 987654321);
std::string hex_str = id.to_string();
ASSERT_STREQ("00000000075BCD15:000000003ADE68B1", hex_str.c_str());
ASSERT_STREQ("00000000075bcd15:000000003ade68b1", hex_str.c_str());
}
{
PUniqueId puid;
@ -45,7 +45,7 @@ TEST_F(UidUtilTest, UniqueId) {
puid.set_lo(98765432123456789);
UniqueId id(puid);
std::string hex_str = id.to_string();
ASSERT_STREQ("002BDC546291F4B1:015EE2A321CE7D15", hex_str.c_str());
ASSERT_STREQ("002bdc546291f4b1:015ee2a321ce7d15", hex_str.c_str());
}
{
TUniqueId tuid;
@ -53,7 +53,7 @@ TEST_F(UidUtilTest, UniqueId) {
tuid.__set_lo(98765432123456789);
UniqueId id(tuid);
std::string hex_str = id.to_string();
ASSERT_STREQ("002BDC546291F4B1:015EE2A321CE7D15", hex_str.c_str());
ASSERT_STREQ("002bdc546291f4b1:015ee2a321ce7d15", hex_str.c_str());
}
{
TUniqueId tuid;
@ -61,7 +61,7 @@ TEST_F(UidUtilTest, UniqueId) {
tuid.__set_lo(98765432123456789);
std::stringstream ss;
ss << UniqueId(tuid);
ASSERT_STREQ("002BDC546291F4B1:015EE2A321CE7D15", ss.str().c_str());
ASSERT_STREQ("002bdc546291f4b1:015ee2a321ce7d15", ss.str().c_str());
}
}

6
fe/src/main/java/org/apache/doris/qe/Coordinator.java
View File

@ -349,11 +349,13 @@ public class Coordinator {
// A call to Exec() must precede all other member function calls.
public void exec() throws Exception {
if (!scanNodes.isEmpty()) {
LOG.debug("debug: in Coordinator::exec. planNode: {}", scanNodes.get(0).treeToThrift());
LOG.debug("debug: in Coordinator::exec. query id: {}, planNode: {}",
DebugUtil.printId(queryId), scanNodes.get(0).treeToThrift());
}
if (!fragments.isEmpty()) {
LOG.debug("debug: in Coordinator::exec. fragment: {}", fragments.get(0).toThrift());
LOG.debug("debug: in Coordinator::exec. query id: {}, fragment: {}",
DebugUtil.printId(queryId), fragments.get(0).toThrift());
}
// prepare information

16
fe/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
View File

@ -20,8 +20,14 @@ package org.apache.doris.qe;
import org.apache.doris.common.UserException;
import org.apache.doris.common.util.DebugUtil;
import org.apache.doris.thrift.*;
import org.apache.doris.thrift.TReportExecStatusParams;
import org.apache.doris.thrift.TReportExecStatusResult;
import org.apache.doris.thrift.TStatus;
import org.apache.doris.thrift.TStatusCode;
import org.apache.doris.thrift.TUniqueId;
import com.google.common.collect.Maps;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -49,7 +55,7 @@ public final class QeProcessorImpl implements QeProcessor {
@Override
public void registerQuery(TUniqueId queryId, QueryInfo info) throws UserException {
LOG.info("register query id = " + queryId.toString());
LOG.info("register query id = " + DebugUtil.printId(queryId));
final QueryInfo result = coordinatorMap.putIfAbsent(queryId, info);
if (result != null) {
throw new UserException("queryId " + queryId + " already exists");
@ -58,7 +64,7 @@ public final class QeProcessorImpl implements QeProcessor {
@Override
public void unregisterQuery(TUniqueId queryId) {
LOG.info("deregister query id = " + queryId.toString());
LOG.info("deregister query id = " + DebugUtil.printId(queryId));
coordinatorMap.remove(queryId);
}
@ -87,8 +93,8 @@ public final class QeProcessorImpl implements QeProcessor {
@Override
public TReportExecStatusResult reportExecStatus(TReportExecStatusParams params) {
LOG.info("ReportExecStatus(): instance_id=" + params.fragment_instance_id.toString()
+ "queryID=" + params.query_id.toString() + " params=" + params);
LOG.info("ReportExecStatus(): fragment_instance_id=" + DebugUtil.printId(params.fragment_instance_id)
+ ", query id=" + DebugUtil.printId(params.query_id) + " params=" + params);
final TReportExecStatusResult result = new TReportExecStatusResult();
final QueryInfo info = coordinatorMap.get(params.query_id);