hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[placeholder] Add physical_row_count in rpc_arg for auto_split and data_complement progress display

Browse Source
This commit is contained in:
obdev
2024-02-09 21:22:36 +00:00
committed by ob-robot
parent e09f6aca8f
commit 9fc0488188
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/share/ob_rpc_struct.cpp
View File

@ -7941,7 +7941,7 @@ int ObDDLBuildSingleReplicaRequestArg::assign(const ObDDLBuildSingleReplicaReque
return ret;
}
OB_SERIALIZE_MEMBER(ObDDLBuildSingleReplicaRequestResult, ret_code_, row_inserted_, row_scanned_);
OB_SERIALIZE_MEMBER(ObDDLBuildSingleReplicaRequestResult, ret_code_, row_inserted_, row_scanned_, physical_row_count_);
int ObDDLBuildSingleReplicaRequestResult::assign(const ObDDLBuildSingleReplicaRequestResult &other)
{
@ -7949,13 +7949,14 @@ int ObDDLBuildSingleReplicaRequestResult::assign(const ObDDLBuildSingleReplicaRe
ret_code_ = other.ret_code_;
row_inserted_ = other.row_inserted_;
row_scanned_ = other.row_scanned_;
physical_row_count_ = other.physical_row_count_;
return ret;
}
OB_SERIALIZE_MEMBER(ObDDLBuildSingleReplicaResponseArg, tenant_id_, ls_id_, tablet_id_,
source_table_id_, dest_schema_id_, ret_code_, snapshot_version_, schema_version_,
task_id_, execution_id_, row_scanned_, row_inserted_, dest_tenant_id_, dest_ls_id_, dest_schema_version_,
server_addr_);
server_addr_, physical_row_count_);
int ObDDLBuildSingleReplicaResponseArg::assign(const ObDDLBuildSingleReplicaResponseArg &other)
{
@ -7976,6 +7977,7 @@ int ObDDLBuildSingleReplicaResponseArg::assign(const ObDDLBuildSingleReplicaResp
row_scanned_ = other.row_scanned_;
row_inserted_ = other.row_inserted_;
server_addr_ = other.server_addr_;
physical_row_count_ = other.physical_row_count_;
return ret;
}

28
src/share/ob_rpc_struct.h
View File

@ -9499,15 +9499,16 @@ struct ObDDLBuildSingleReplicaRequestResult final
OB_UNIS_VERSION(1);
public:
ObDDLBuildSingleReplicaRequestResult()
: ret_code_(OB_SUCCESS), row_inserted_(0), row_scanned_(0)
: ret_code_(OB_SUCCESS), row_inserted_(0), row_scanned_(0), physical_row_count_(0)
{}
~ObDDLBuildSingleReplicaRequestResult() = default;
int assign(const ObDDLBuildSingleReplicaRequestResult &other);
TO_STRING_KV(K_(ret_code), K_(row_inserted), K_(row_scanned))
TO_STRING_KV(K_(ret_code), K_(row_inserted), K_(row_scanned), K_(physical_row_count))
public:
int64_t ret_code_;
int64_t row_inserted_;
int64_t row_scanned_;
int64_t physical_row_count_;
};
struct ObDDLBuildSingleReplicaResponseArg final
@ -9515,9 +9516,23 @@ struct ObDDLBuildSingleReplicaResponseArg final
OB_UNIS_VERSION(1);
public:
ObDDLBuildSingleReplicaResponseArg()
: tenant_id_(OB_INVALID_ID), ls_id_(), tablet_id_(), source_table_id_(OB_INVALID_ID), dest_schema_id_(OB_INVALID_ID),
ret_code_(OB_SUCCESS), snapshot_version_(0), schema_version_(0), task_id_(0), execution_id_(-1), row_scanned_(0),
row_inserted_(0), dest_tenant_id_(OB_INVALID_ID), dest_ls_id_(), dest_schema_version_(0), server_addr_()
: tenant_id_(OB_INVALID_ID),
ls_id_(),
tablet_id_(),
source_table_id_(OB_INVALID_ID),
dest_schema_id_(OB_INVALID_ID),
ret_code_(OB_SUCCESS),
snapshot_version_(0),
schema_version_(0),
task_id_(0),
execution_id_(-1),
row_scanned_(0),
row_inserted_(0),
dest_tenant_id_(OB_INVALID_ID),
dest_ls_id_(),
dest_schema_version_(0),
server_addr_(),
physical_row_count_(0)
{}
~ObDDLBuildSingleReplicaResponseArg() = default;
bool is_valid() const { return OB_INVALID_ID != tenant_id_ && OB_INVALID_ID != dest_tenant_id_
@ -9529,7 +9544,7 @@ public:
TO_STRING_KV(K_(tenant_id), K_(dest_tenant_id), K_(ls_id), K_(dest_ls_id),
K_(tablet_id), K_(source_table_id), K_(dest_schema_id), K_(ret_code),
K_(snapshot_version), K_(schema_version), K_(dest_schema_version), K_(task_id),
K_(execution_id), K_(row_scanned), K_(row_inserted), K_(server_addr));
K_(execution_id), K_(row_scanned), K_(row_inserted), K_(server_addr), K_(physical_row_count));
public:
uint64_t tenant_id_;
share::ObLSID ls_id_;
@ -9547,6 +9562,7 @@ public:
share::ObLSID dest_ls_id_;
int64_t dest_schema_version_;
common::ObAddr server_addr_;
int64_t physical_row_count_;
};
struct ObLogReqLoadProxyRequest