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

fix build_minor_tables in rebuilding

Browse Source
This commit is contained in:
obdev
2022-11-14 12:08:00 +00:00
committed by wangzelin.wzl
parent 9abca6cd59
commit ab496ba235
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/engine/expr/ob_expr_to_outfile_row.cpp
View File

@ -214,9 +214,9 @@ int ObExprToOutfileRow::extract_fisrt_wchar_from_varhcar(const ObObj &obj, int32
ret = ObCharset::mb_wc(obj.get_collation_type(), str.ptr(), str.length(), length, wchar); ret = ObCharset::mb_wc(obj.get_collation_type(), str.ptr(), str.length(), length, wchar);
} }
} }
return ret; return ret;
} }
// If the FIELDS ESCAPED BY character is not empty, it is used to prefix the following // If the FIELDS ESCAPED BY character is not empty, it is used to prefix the following
// characters on output: // characters on output:
// 1. The FIELDS ESCAPED BY character. // 1. The FIELDS ESCAPED BY character.

3
src/storage/tablet/ob_tablet_table_store.cpp
View File

@ -790,7 +790,8 @@ int ObTabletTableStore::build_minor_tables(
LOG_INFO("new sstable max merge trans version not equal to old sstable, " LOG_INFO("new sstable max merge trans version not equal to old sstable, "
"need add new sstable when table key is same", KPC(sstable), KPC(new_sstable)); "need add new sstable when table key is same", KPC(sstable), KPC(new_sstable));
} else { } else {
need_add = true; // just keep old sstable ret = OB_NO_NEED_MERGE;
LOG_WARN("new table with old max merged trans version, no need to merge", K(ret), KPC(sstable), KPC(new_sstable));
} }
} else if (ObTableStoreUtil::check_include_by_log_ts_range(*new_table, *table)) { } else if (ObTableStoreUtil::check_include_by_log_ts_range(*new_table, *table)) {
LOG_DEBUG("table purged", K(*new_table), K(*table)); LOG_DEBUG("table purged", K(*new_table), K(*table));