patch 4.0

This commit is contained in:
wangzelin.wzl
2022-10-24 10:34:53 +08:00
parent 4ad6e00ec3
commit 93a1074b0c
10533 changed files with 2588271 additions and 2299373 deletions

View File

@ -13,19 +13,22 @@
#include "sql/executor/ob_execution_id.h"
#include "lib/json/ob_yson.h"
using namespace oceanbase::common;
namespace oceanbase {
namespace sql {
const common::ObAddr& ObExecutionID::global_id_addr()
namespace oceanbase
{
static ObAddr global_addr(1, 1); // 1.0.0.0:1
namespace sql
{
const common::ObAddr &ObExecutionID::global_id_addr()
{
static ObAddr global_addr(1, 1); // 1.0.0.0:1
return global_addr;
}
DEFINE_TO_YSON_KV(ObExecutionID, OB_ID(addr), server_, OB_ID(execution_id), execution_id_);
DEFINE_TO_YSON_KV(ObExecutionID, OB_ID(addr), server_,
OB_ID(execution_id), execution_id_);
OB_SERIALIZE_MEMBER(ObExecutionID, server_, execution_id_, execution_flag_);
int ObExecutionID::compare(const ObExecutionID& other) const
int ObExecutionID::compare(const ObExecutionID &other) const
{
int cmp_ret = 0;
if (execution_id_ > other.execution_id_) {
@ -36,5 +39,7 @@ int ObExecutionID::compare(const ObExecutionID& other) const
return cmp_ret;
}
} // namespace sql
} // namespace oceanbase
}/* ns sql*/
}/* ns oceanbase */