提交 ab496ba2 编写于 作者: O obdev 提交者: wangzelin.wzl

fix build_minor_tables in rebuilding

上级 9abca6cd
...@@ -214,9 +214,9 @@ int ObExprToOutfileRow::extract_fisrt_wchar_from_varhcar(const ObObj &obj, int32 ...@@ -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.
......
...@@ -790,7 +790,8 @@ int ObTabletTableStore::build_minor_tables( ...@@ -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));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册