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

[FEAT MERGE] 4.x Dup Table

Browse Source 
Co-authored-by: Minionyh <minions.yh@gmail.com>
Co-authored-by: BinChenn <binchenn.bc@gmail.com>
Co-authored-by: ChangerR <dingjinchengyx@163.com>
This commit is contained in:
KyrielightWei
2023-05-11 10:07:20 +00:00
committed by ob-robot
parent 0509c5f9fe
commit aaab6560a1
278 changed files with 20924 additions and 2857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/rootserver/ob_locality_util.cpp
View File

@ -657,18 +657,17 @@ int ObLocalityDistribution::RawLocalityIter::get_replica_arrangements(
while (OB_SUCC(ret)
&& OB_SUCC(get_next_replica_arrangement(
cursor, end, replica_type, replica_num, memstore_percent))) {
if (OB_UNLIKELY(replica_type != FULL_REPLICA)) {
// TODO: in 4.0 we only support f-replica in locality, other types will be supported later
if (OB_UNLIKELY(FULL_REPLICA != replica_type
&& READONLY_REPLICA != replica_type)) {
// TODO: F-replica is supported since 4.0,
// R-replica is supported since 4.2,
// other types will be supported later
INVALID_LOCALITY();
switch (replica_type) {
case LOGONLY_REPLICA:
ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "logonly-replica");
break;
case READONLY_REPLICA:
ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "readonly-replica");
break;
case ENCRYPTION_LOGONLY_REPLICA:
ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "encryption-logonly-replica");
@ -833,6 +832,10 @@ int ObLocalityDistribution::RawLocalityIter::get_replica_attribute_recursively(
// failed,
} else if (OB_FAIL(check_right_brace_and_afterwards_syntax(cursor, end))) {
LOG_WARN("fail to check right brace and afterwards syntax", K(ret));
} else if (replica_num > 1) {
// each zone should has only one replica
INVALID_LOCALITY();
LOG_USER_ERROR(OB_INVALID_ARGUMENT, "locality, each zone should has only one replica");
}
} else {
int64_t remain = end - cursor;
@ -925,15 +928,9 @@ int ObLocalityDistribution::RawLocalityIter::get_replica_attribute(
replica_num = 1;
memstore_percent = MAX_MEMSTORE_PERCENT;
} else if (COMMA_TOKEN == locality_str_[cursor]) {
// the keywords 'replica_num' and 'memstore_percent' are not specified
replica_num = 1;
memstore_percent = MAX_MEMSTORE_PERCENT;
inc_cursor(cursor); // pass comma
jump_over_blanks(cursor, end);
if (cursor >= end) {
INVALID_LOCALITY(); // a ',' token before the '@' token is not allowed
LOG_USER_ERROR(OB_INVALID_ARGUMENT, "locality, illegal , before @ token");
}
// in 4.x, we support only one replica in each zone as locality described
INVALID_LOCALITY(); // a ',' token before the '@' token is not allowed
LOG_USER_ERROR(OB_INVALID_ARGUMENT, "locality, each zone should have only one replica type");
} else if (LEFT_BRACE_TOKEN == locality_str_[cursor]) {
inc_cursor(cursor); // pass left brace token
jump_over_blanks(cursor, end);