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

[CP] fix update with non-strict mode core

Browse Source 
Co-authored-by: leslieyuchen <leslieyuchen@gmail.com>
This commit is contained in:
obdev
2024-02-08 18:57:49 +00:00
committed by ob-robot
parent bb9dd9dcde
commit 65d5b08606
8 changed files with 128 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sql/das/ob_das_utils.cpp
View File

@ -257,10 +257,23 @@ int ObDASUtils::reshape_storage_value(const ObObjMeta &col_type,
const ObAccuracy &col_accuracy,
ObIAllocator &allocator,
ObObj &value)
{
int ret = OB_SUCCESS;
if (lib::is_oracle_mode() && value.is_character_type() && value.get_string_len() == 0) {
// Oracle compatibility mode: '' as null
LOG_DEBUG("reshape empty string to null", K(value));
value.set_null();
} else if (OB_FAIL(padding_fixed_string_value(col_accuracy.get_length(), allocator, value))) {
LOG_WARN("padding char value failed", K(ret), K(col_accuracy), K(value));
}
return ret;
}
int ObDASUtils::padding_fixed_string_value(int64_t max_len, ObIAllocator &allocator, ObObj &value)
{
int ret = OB_SUCCESS;
if (value.is_binary()) {
int32_t binary_len = col_accuracy.get_length();
int32_t binary_len = max_len;
int32_t len = value.get_string_len();
if (binary_len > len) {
char *dest_str = NULL;
@ -275,10 +288,6 @@ int ObDASUtils::reshape_storage_value(const ObObjMeta &col_type,
value.set_binary(ObString(binary_len, dest_str));
}
}
} else if (lib::is_oracle_mode() && value.is_character_type() && value.get_string_len() == 0) {
// Oracle compatibility mode: '' as null
LOG_DEBUG("reshape empty string to null", K(value));
value.set_null();
} else if (value.is_fixed_len_char_type()) {
const char *str = value.get_string_ptr();
int32_t len = value.get_string_len();

1
src/sql/das/ob_das_utils.h
View File

@ -62,6 +62,7 @@ public:
const bool enable_oracle_empty_char_reshape_to_null,
ObIAllocator &allocator,
blocksstable::ObStorageDatum &datum_value);
static int padding_fixed_string_value(int64_t max_len, ObIAllocator &alloc, ObObj &value);
static int generate_spatial_index_rows(ObIAllocator &allocator,
const ObDASDMLBaseCtDef &das_ctdef,
const ObString &wkb_str,