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

[CP] [Bugfix]auto increment column fill null return OB_BAD_NULL_ERROR

Browse Source
This commit is contained in:
obdev
2024-02-06 23:08:05 +00:00
committed by ob-robot
parent 9732eb9d9c
commit 911d0d6744
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/observer/table/ob_table_context.cpp
View File

@ -533,7 +533,8 @@ int ObTableCtx::read_real_lob(ObIAllocator &allocator, ObObj &obj)
- check accuracy
*/
int ObTableCtx::adjust_column_type(const ObExprResType &column_type,
ObObj &obj)
ObObj &obj,
bool is_autoincrement/*=false*/)
{
int ret = OB_SUCCESS;
const bool is_not_nullable = column_type.is_not_null_for_read();
@ -541,7 +542,9 @@ int ObTableCtx::adjust_column_type(const ObExprResType &column_type,
// 1. check nullable
if (is_not_nullable && obj.is_null()) {
if (!is_autoincrement) {
ret = OB_BAD_NULL_ERROR;
}
} else if (obj.is_null()) {
// continue
} else if (column_type.get_type() != obj.get_type()
@ -601,7 +604,7 @@ int ObTableCtx::adjust_column(const ObColumnSchemaV2 &col_schema, ObObj &obj)
if (OB_FAIL(cons_column_type(col_schema, column_type))) {
LOG_WARN("fail to construct column type", K(ret), K(col_schema));
} else if (OB_FAIL(adjust_column_type(column_type, obj))) {
} else if (OB_FAIL(adjust_column_type(column_type, obj, col_schema.is_autoincrement()))) {
LOG_WARN("fail to adjust rowkey column type", K(ret), K(obj));
}

2
src/observer/table/ob_table_context.h
View File

@ -389,7 +389,7 @@ private:
int construct_column_items();
int cons_column_type(const share::schema::ObColumnSchemaV2 &column_schema,
sql::ObExprResType &column_type);
int adjust_column_type(const ObExprResType &column_type, ObObj &obj);
int adjust_column_type(const ObExprResType &column_type, ObObj &obj, bool is_autoincrement = false);
int adjust_column(const ObColumnSchemaV2 &col_schema, ObObj &obj);
int adjust_rowkey();
int adjust_properties();