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

fix merge 4103

Browse Source
This commit is contained in:
z404289981
2024-03-18 06:15:59 +00:00
committed by ob-robot
parent 4390e56ec0
commit 7d023cf96b
6 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/storage/ob_storage_schema.cpp
View File

@ -1493,6 +1493,7 @@ int ObStorageSchema::init_column_meta_array(
int ObStorageSchema::get_orig_default_row(
const common::ObIArray<ObColDesc> &column_ids,
bool need_trim,
blocksstable::ObDatumRow &default_row) const
{
int ret = OB_SUCCESS;
@ -1513,12 +1514,30 @@ int ObStorageSchema::get_orig_default_row(
STORAGE_LOG(WARN, "column id not found", K(ret), K(column_ids.at(i)));
} else if (OB_FAIL(default_row.storage_datums_[i].from_obj_enhance(col_schema->get_orig_default_value()))) {
STORAGE_LOG(WARN, "Failed to transfer obj to datum", K(ret));
} else if (need_trim && col_schema->get_orig_default_value().is_fixed_len_char_type()) {
trim(col_schema->get_orig_default_value().get_collation_type(), default_row.storage_datums_[i]);
}
}
}
return ret;
}
void ObStorageSchema::trim(const ObCollationType type, blocksstable::ObStorageDatum &storage_datum) const
{
const char *str = storage_datum.ptr_;
int32_t len = storage_datum.len_;
ObString space_pattern = ObCharsetUtils::get_const_str(type, ' ');
for (; len >= space_pattern.length(); len -= space_pattern.length()) {
if (0 != MEMCMP(str + len - space_pattern.length(),
space_pattern.ptr(),
space_pattern.length())) {
break;
}
}
storage_datum.len_ = len;
}
const ObStorageColumnSchema *ObStorageSchema::get_column_schema(const int64_t column_idx) const
{
const ObStorageColumnSchema *found_col = nullptr;