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

[OBCDC] Fixed some error logs and add cases

Browse Source
This commit is contained in:
obdev
2023-02-13 03:44:02 +00:00
committed by ob-robot
parent 16eb893f90
commit 947377240e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/logservice/data_dictionary/ob_data_dict_storager.cpp
View File

@ -58,7 +58,7 @@ namespace datadict
const int64_t ObDataDictStorage::DEFAULT_PALF_BUF_SIZE = 2 * _M_;
const int64_t ObDataDictStorage::DEFAULT_DICT_BUF_SIZE = 4 * _M_;
const char *ObDataDictStorage::DEFAULT_DDL_MDS_MSG = "ddl_trans commit";
const int64_t ObDataDictStorage::DEFAULT_DDL_MDS_MSG_LEN = strlen(DEFAULT_DDL_MDS_MSG) + 1; // with '\0'
const int64_t ObDataDictStorage::DEFAULT_DDL_MDS_MSG_LEN = strlen(DEFAULT_DDL_MDS_MSG);
ObDataDictStorage::ObDataDictStorage(ObIAllocator &allocator)
: tenant_id_(OB_INVALID_TENANT_ID),
@ -239,16 +239,16 @@ int ObDataDictStorage::gen_and_serialize_dict_metas(
&& (0 >= database_schemas.count())
&& (0 >= table_schemas.count()))) {
DDLOG(INFO, "all schema_array is empty, use default msg", KCSTRING(DEFAULT_DDL_MDS_MSG));
buf = static_cast<char*>(allocator.alloc(DEFAULT_DDL_MDS_MSG_LEN));
buf = static_cast<char*>(allocator.alloc(DEFAULT_DDL_MDS_MSG_LEN + 1)); // with '\0'
if (OB_ISNULL(buf)) {
ret = OB_ALLOCATE_MEMORY_FAILED;
DDLOG(WARN, "expect valid buf", KR(ret), KP(buf), K(DEFAULT_DDL_MDS_MSG_LEN));
} else {
buf_len = DEFAULT_DDL_MDS_MSG_LEN;
pos = DEFAULT_DDL_MDS_MSG_LEN;
MEMCPY(buf, DEFAULT_DDL_MDS_MSG, DEFAULT_DDL_MDS_MSG_LEN - 1);
buf[DEFAULT_DDL_MDS_MSG_LEN - 1] = '\0';
buf_len = DEFAULT_DDL_MDS_MSG_LEN + 1;
pos = DEFAULT_DDL_MDS_MSG_LEN + 1;
MEMCPY(buf, DEFAULT_DDL_MDS_MSG, DEFAULT_DDL_MDS_MSG_LEN);
buf[DEFAULT_DDL_MDS_MSG_LEN] = '\0';
}
} else {
const static int64_t block_size = 2 * _M_;
@ -304,7 +304,7 @@ int ObDataDictStorage::parse_dict_metas(
DDLOG(WARN, "invalid args", KR(ret), KP(buf), K(pos), K(buf_len));
} else if (OB_FAIL(iterator.init(OB_SERVER_TENANT_ID))) {
DDLOG(WARN, "iterator init failed", KR(ret), KP(buf), K(pos), K(buf_len));
} else if (0 == strcmp(buf, DEFAULT_DDL_MDS_MSG)) {
} else if (0 == strncmp(buf, DEFAULT_DDL_MDS_MSG, DEFAULT_DDL_MDS_MSG_LEN)) {
// found DEFAULT_DDL_MDS_MSG, means ddl has no schema change.
// buf == DEFAULT_DDL_MDS_MSG if in OB4.0.0.0 or DDL doesn't change schema.
DDLOG(INFO, "detect default_ddl_msg", KR(ret), K(buf_len), KCSTRING(buf));

4
src/logservice/libobcdc/src/ob_log_part_trans_task.cpp
View File

@ -2533,8 +2533,8 @@ int PartTransTask::parse_multi_data_source_data_for_ddl(
const common::ObString &mds_data = tx_buf_node.get_data_buf();
int64_t pos = 0;
if (datadict::ObDataDictStorage::parse_dict_metas(allocator_, mds_data.ptr(), mds_data.length(), pos,
tenant_metas, database_metas, table_metas)) {
if (OB_FAIL(datadict::ObDataDictStorage::parse_dict_metas(allocator_, mds_data.ptr(), mds_data.length(), pos,
tenant_metas, database_metas, table_metas))) {
LOG_ERROR("ObDataDictStorage parse_dict_metas failed", KR(ret), K(caller), K(idx), KPC(this));
} else {
//TODO DEBUG