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

[FEAT MERGE] log4100 branch

Browse Source 
Co-authored-by: tino247 <tino247@126.com>
Co-authored-by: BinChenn <binchenn.bc@gmail.com>
Co-authored-by: HaHaJeff <jeffzhouhhh@gmail.com>
This commit is contained in:
obdev
2023-01-28 18:17:31 +08:00
committed by ob-robot
parent a269ffe6be
commit 50024b39cd
772 changed files with 60275 additions and 11301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtable/src/ob_table_service_client.cpp
View File

@ -957,8 +957,8 @@ int ObTableServiceClientImpl::get_tablet_location(const ObString &table_name, co
ObLSRestoreStatus role_status;
if (OB_FAIL(fake_leader_loc.init_without_check(client_env_->get_one_server(), ObRole::LEADER,
0, ObReplicaType::REPLICA_TYPE_FULL, ObReplicaProperty(),
role_status))) {
LOG_WARN("fail to init tablet replication location", K(ret));
role_status, 1))) {
LOG_WARN("fail to init tablet replication location", K(ret));
}
if (OB_FAIL(tablet_location.add_replica_location(fake_leader_loc))) {
LOG_WARN("failed to push back", K(ret));

5
src/libtable/src/ob_tablet_location_proxy.cpp
View File

@ -113,8 +113,11 @@ int ObTabletLocationProxy::cons_replica_location(const sqlclient::ObMySQLResult
EXTRACT_INT_FIELD_MYSQL(res, "replica_type", replica_type, int64_t);
ObReplicaProperty replica_property;
ObLSRestoreStatus restore_status;
int64_t proposal_id = (LEADER == role_value ? 1 : 0);
if (OB_SUCC(ret) && OB_FAIL(replica_location.init(server, static_cast<ObRole>(role_value), sql_port, static_cast<ObReplicaType>(replica_type), replica_property, restore_status))) {
if (OB_SUCC(ret) && OB_FAIL(replica_location.init(server, static_cast<ObRole>(role_value),
sql_port, static_cast<ObReplicaType>(replica_type),
replica_property, restore_status, proposal_id))) {
LOG_WARN("fail to init replica location", K(ret));
}
return ret;