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

修复ObSqiBitSet构造时吞错误码

Browse Source
This commit is contained in:
obdev
2023-01-12 02:38:11 +00:00
committed by ob-robot
parent ecef7bdcbc
commit eba0f8509b
1 changed files with 73 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/sql/resolver/expr/ob_raw_expr.h
View File

@ -169,14 +169,17 @@ public:
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (OB_FAIL(init_block_allocator())) { if (OB_FAIL(init_block_allocator())) {
desc_.init_errcode_ = ret;
SQL_RESV_LOG(WARN, "failed to init block allocator", K(ret)); SQL_RESV_LOG(WARN, "failed to init block allocator", K(ret));
} else if (OB_ISNULL(block_allocator_)) { } else if (OB_ISNULL(block_allocator_)) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
desc_.init_errcode_ = ret;
SQL_RESV_LOG(WARN, "invalid argument", K(ret)); SQL_RESV_LOG(WARN, "invalid argument", K(ret));
} else { } else {
int64_t words_size = sizeof(BitSetWord) * MAX_BITSETWORD; int64_t words_size = sizeof(BitSetWord) * MAX_BITSETWORD;
if (OB_ISNULL(bit_set_word_array_ = (BitSetWord *)block_allocator_->alloc(words_size))) { if (OB_ISNULL(bit_set_word_array_ = (BitSetWord *)block_allocator_->alloc(words_size))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
desc_.init_errcode_ = ret;
SQL_RESV_LOG(WARN, "failed to alloc memory", K(ret)); SQL_RESV_LOG(WARN, "failed to alloc memory", K(ret));
} else { } else {
MEMSET(bit_set_word_array_, 0, words_size); MEMSET(bit_set_word_array_, 0, words_size);
@ -191,13 +194,15 @@ public:
: block_allocator_(NULL), bit_set_word_array_(NULL), desc_() : block_allocator_(NULL), bit_set_word_array_(NULL), desc_()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
desc_.inited_ = false;
if (!other.is_valid()) { if (!other.is_valid()) {
ret = OB_NOT_INIT; desc_.init_errcode_ = other.desc_.init_errcode_;
SQL_RESV_LOG(WARN, "not intied", K(ret)); SQL_RESV_LOG(WARN, "other not intied", K(other.desc_.init_errcode_));
} else if (OB_FAIL(init_block_allocator())) { } else if (OB_FAIL(init_block_allocator())) {
desc_.init_errcode_ = ret;
SQL_RESV_LOG(WARN, "failed to init block allocator", K(ret)); SQL_RESV_LOG(WARN, "failed to init block allocator", K(ret));
} else if (OB_ISNULL(block_allocator_)) { } else if (OB_ISNULL(block_allocator_)) {
ret = OB_INVALID_ARGUMENT;
desc_.init_errcode_ = ret;
SQL_RESV_LOG(WARN, "block_allocator_ is null", K(ret)); SQL_RESV_LOG(WARN, "block_allocator_ is null", K(ret));
} else { } else {
int64_t cap = other.bitset_word_count() * 2; int64_t cap = other.bitset_word_count() * 2;
@ -207,6 +212,7 @@ public:
int64_t words_size = sizeof(BitSetWord) * cap; int64_t words_size = sizeof(BitSetWord) * cap;
if (OB_ISNULL(bit_set_word_array_ = (BitSetWord *)block_allocator_->alloc(words_size))) { if (OB_ISNULL(bit_set_word_array_ = (BitSetWord *)block_allocator_->alloc(words_size))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
desc_.init_errcode_ = ret;
SQL_RESV_LOG(WARN, "failed to alloc memory", K(ret)); SQL_RESV_LOG(WARN, "failed to alloc memory", K(ret));
} else { } else {
MEMSET(bit_set_word_array_, 0, words_size); MEMSET(bit_set_word_array_, 0, words_size);
@ -225,8 +231,10 @@ public:
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (bit_size < 0) { if (bit_size < 0) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
desc_.init_errcode_ = ret;
SQL_RESV_LOG(WARN, "invalid argument", K(ret)); SQL_RESV_LOG(WARN, "invalid argument", K(ret));
} else if (OB_FAIL(init_block_allocator())) { } else if (OB_FAIL(init_block_allocator())) {
desc_.init_errcode_ = ret;
SQL_RESV_LOG(WARN, "failed to init block allocator", K(ret)); SQL_RESV_LOG(WARN, "failed to init block allocator", K(ret));
} else { } else {
int64_t bitset_word_cnt = (bit_size <= N ? MAX_BITSETWORD int64_t bitset_word_cnt = (bit_size <= N ? MAX_BITSETWORD
@ -234,6 +242,7 @@ public:
int64_t words_size = sizeof(BitSetWord) * bitset_word_cnt; int64_t words_size = sizeof(BitSetWord) * bitset_word_cnt;
if (OB_ISNULL(bit_set_word_array_ = (BitSetWord *)block_allocator_->alloc(words_size))) { if (OB_ISNULL(bit_set_word_array_ = (BitSetWord *)block_allocator_->alloc(words_size))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
desc_.init_errcode_ = ret;
SQL_RESV_LOG(WARN, "failed to alloc memory", K(ret)); SQL_RESV_LOG(WARN, "failed to alloc memory", K(ret));
} else { } else {
MEMSET(bit_set_word_array_, 0, words_size); MEMSET(bit_set_word_array_, 0, words_size);
@ -316,9 +325,9 @@ public:
{ {
BitSetWord word = 0; BitSetWord word = 0;
if (!is_valid()) { if (!is_valid()) {
SQL_RESV_LOG(INFO, "not inited"); SQL_RESV_LOG(WARN, "not inited", K(desc_.init_errcode_));
} else if (index < 0 || index >= desc_.len_) { } else if (index < 0 || index >= desc_.len_) {
SQL_RESV_LOG(INFO, "bitmap word index exceeds scope", K(index), K(desc_.len_)); SQL_RESV_LOG(WARN, "bitmap word index exceeds scope", K(index), K(desc_.len_));
} else { } else {
word = bit_set_word_array_[index]; word = bit_set_word_array_[index];
} }
@ -354,7 +363,7 @@ public:
if (!is_valid()) { if (!is_valid()) {
// do nothing // do nothing
} else if (OB_UNLIKELY(index < 0)) { } else if (OB_UNLIKELY(index < 0)) {
SQL_RESV_LOG(INFO, "negative bitmap member not allowed"); SQL_RESV_LOG(WARN, "negative bitmap member not allowed");
} else { } else {
int64_t pos = index >> PER_BITSETWORD_MOD_BITS; int64_t pos = index >> PER_BITSETWORD_MOD_BITS;
if (pos >= desc_.len_) { if (pos >= desc_.len_) {
@ -371,8 +380,8 @@ public:
{ {
int ret = common::OB_SUCCESS; int ret = common::OB_SUCCESS;
if (!is_valid()) { if (!is_valid()) {
ret = OB_NOT_INIT; ret = desc_.init_errcode_;
SQL_RESV_LOG(WARN, "not inited", K(ret)); SQL_RESV_LOG(WARN, "got init error", K(desc_.init_errcode_));
} else if (OB_UNLIKELY (index < 0)) { } else if (OB_UNLIKELY (index < 0)) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
SQL_RESV_LOG(WARN, "negative bitmap member not allowed", K(ret), K(index)); SQL_RESV_LOG(WARN, "negative bitmap member not allowed", K(ret), K(index));
@ -397,8 +406,8 @@ public:
{ {
int ret = common::OB_SUCCESS; int ret = common::OB_SUCCESS;
if (!is_valid()) { if (!is_valid()) {
ret = common::OB_NOT_INIT; ret = desc_.init_errcode_;
SQL_RESV_LOG(WARN, "not inited", K(ret)); SQL_RESV_LOG(WARN, "got init error", K(desc_.init_errcode_));
} else if (OB_UNLIKELY(index < 0)) { } else if (OB_UNLIKELY(index < 0)) {
ret = common::OB_INVALID_ARGUMENT; ret = common::OB_INVALID_ARGUMENT;
SQL_RESV_LOG(WARN, "negative bitmap member not allowed", K(ret), K(index)); SQL_RESV_LOG(WARN, "negative bitmap member not allowed", K(ret), K(index));
@ -418,8 +427,8 @@ public:
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
int64_t max_bit_count = static_cast<int64_t>(desc_.len_) * PER_BITSETWORD_BITS; int64_t max_bit_count = static_cast<int64_t>(desc_.len_) * PER_BITSETWORD_BITS;
if (!is_valid()) { if (!is_valid()) {
ret = OB_NOT_INIT; ret = desc_.init_errcode_;
SQL_RESV_LOG(WARN, "not inited", K(ret)); SQL_RESV_LOG(WARN, "got init error", K(desc_.init_errcode_));
} else if (begin_index < 0 || begin_index >= max_bit_count } else if (begin_index < 0 || begin_index >= max_bit_count
|| end_index < 0 || end_index >= max_bit_count) { || end_index < 0 || end_index >= max_bit_count) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
@ -451,8 +460,8 @@ public:
{ {
int ret = common::OB_SUCCESS; int ret = common::OB_SUCCESS;
if (!is_valid()) { if (!is_valid()) {
ret = common::OB_NOT_INIT; ret = desc_.init_errcode_;
SQL_RESV_LOG(WARN, "not inited", K(ret)); SQL_RESV_LOG(WARN, "got init error", K(desc_.init_errcode_));
} else if (OB_ISNULL(bit_set_word_array_)) { } else if (OB_ISNULL(bit_set_word_array_)) {
ret = common::OB_INVALID_ARGUMENT; ret = common::OB_INVALID_ARGUMENT;
SQL_RESV_LOG(WARN, "invalid argument", K(ret), K(bit_set_word_array_)); SQL_RESV_LOG(WARN, "invalid argument", K(ret), K(bit_set_word_array_));
@ -497,8 +506,8 @@ public:
{ {
int ret = common::OB_SUCCESS; int ret = common::OB_SUCCESS;
if (!is_valid()) { if (!is_valid()) {
ret = common::OB_NOT_INIT; ret = desc_.init_errcode_;
SQL_RESV_LOG(WARN, "not inited", K(ret)); SQL_RESV_LOG(WARN, "got init error", K(desc_.init_errcode_));
} else { } else {
for (int64_t i = 0; i < desc_.len_; i++) { for (int64_t i = 0; i < desc_.len_; i++) {
bit_set_word_array_[i] &= ~(other.get_bitset_word(i)); bit_set_word_array_[i] &= ~(other.get_bitset_word(i));
@ -597,8 +606,8 @@ public:
{ {
int ret = common::OB_SUCCESS; int ret = common::OB_SUCCESS;
if (!is_valid()) { if (!is_valid()) {
ret = OB_NOT_INIT; ret = desc_.init_errcode_;
SQL_RESV_LOG(WARN, "not inited", K(ret)); SQL_RESV_LOG(WARN, "got init error", K(desc_.init_errcode_));
} else { } else {
arr.reuse(); arr.reuse();
int64_t num = num_members(); int64_t num = num_members();
@ -651,9 +660,15 @@ public:
const ObSqlBitSet<L, FlagType3, auto_free3> &right) const ObSqlBitSet<L, FlagType3, auto_free3> &right)
{ {
int ret = common::OB_SUCCESS; int ret = common::OB_SUCCESS;
if (!is_valid() || !left.is_valid() || !right.is_valid()) { if (!is_valid()) {
ret = common::OB_NOT_INIT; ret = desc_.init_errcode_;
SQL_RESV_LOG(WARN, "not inited", K(ret)); SQL_RESV_LOG(WARN, "init error", K(desc_.init_errcode_));
} else if (!left.is_valid()) {
ret = left.desc_.init_errcode_;
SQL_RESV_LOG(WARN, "left init error", K(left.desc_.init_errcode_));
} else if (!right.is_valid()) {
ret = right.desc_.init_errcode_;
SQL_RESV_LOG(WARN, "right init error", K(right.desc_.init_errcode_));
} else if (OB_ISNULL(bit_set_word_array_)) { } else if (OB_ISNULL(bit_set_word_array_)) {
ret = common::OB_INVALID_ARGUMENT; ret = common::OB_INVALID_ARGUMENT;
SQL_RESV_LOG(WARN, "invalid argument", K(ret), K(bit_set_word_array_)); SQL_RESV_LOG(WARN, "invalid argument", K(ret), K(bit_set_word_array_));
@ -685,9 +700,15 @@ public:
const ObSqlBitSet<L, FlagType3, auto_free3> &right) const ObSqlBitSet<L, FlagType3, auto_free3> &right)
{ {
int ret = common::OB_SUCCESS; int ret = common::OB_SUCCESS;
if (!is_valid() || !left.is_valid() || !right.is_valid()) { if (!is_valid()) {
ret = common::OB_NOT_INIT; ret = desc_.init_errcode_;
SQL_RESV_LOG(WARN, "not inited", K(ret)); SQL_RESV_LOG(WARN, "init error", K(desc_.init_errcode_));
} else if (!left.is_valid()) {
ret = left.desc_.init_errcode_;
SQL_RESV_LOG(WARN, "left init error", K(left.desc_.init_errcode_));
} else if (!right.is_valid()) {
ret = right.desc_.init_errcode_;
SQL_RESV_LOG(WARN, "right init error", K(right.desc_.init_errcode_));
} else if (OB_ISNULL(bit_set_word_array_)) { } else if (OB_ISNULL(bit_set_word_array_)) {
ret = common::OB_INVALID_ARGUMENT; ret = common::OB_INVALID_ARGUMENT;
SQL_RESV_LOG(WARN, "invalid argument", K(ret), K(bit_set_word_array_)); SQL_RESV_LOG(WARN, "invalid argument", K(ret), K(bit_set_word_array_));
@ -752,9 +773,12 @@ public:
ObSqlBitSet<N, FlagType, auto_free>& operator=(const ObSqlBitSet<N, FlagType, auto_free> &other) ObSqlBitSet<N, FlagType, auto_free>& operator=(const ObSqlBitSet<N, FlagType, auto_free> &other)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (!other.is_valid() || !is_valid()) { if (!is_valid()) {
ret = OB_NOT_INIT; ret = desc_.init_errcode_;
SQL_RESV_LOG(WARN, "invalid bitset", K(is_valid()), K(other.is_valid())); SQL_RESV_LOG(WARN, "init error", K(desc_.init_errcode_));
} else if (!other.is_valid()) {
ret = other.desc_.init_errcode_;
SQL_RESV_LOG(WARN, "init error", K(other.desc_.init_errcode_));
} else if (&other == this) { } else if (&other == this) {
// do nothing // do nothing
} else { } else {
@ -772,6 +796,7 @@ public:
} }
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
// error happened, set inited flag to be false // error happened, set inited flag to be false
desc_.init_errcode_ = ret;
desc_.inited_ = false; desc_.inited_ = false;
} }
return *this; return *this;
@ -784,9 +809,10 @@ private:
BitSetWord *new_buf = NULL; BitSetWord *new_buf = NULL;
ObIAllocator *allocator = get_block_allocator(); ObIAllocator *allocator = get_block_allocator();
if (!is_valid()) { if (!is_valid()) {
ret = OB_NOT_INIT; ret = desc_.init_errcode_;
SQL_RESV_LOG(WARN, "not inited", K(ret)); SQL_RESV_LOG(WARN, "not inited", K(ret));
} else if (OB_ISNULL(allocator)) { } else if (OB_ISNULL(allocator)) {
ret = OB_ERR_UNEXPECTED;
SQL_RESV_LOG(WARN, "invalid allocator", K(ret)); SQL_RESV_LOG(WARN, "invalid allocator", K(ret));
} else if (OB_ISNULL(new_buf = (BitSetWord *)allocator->alloc(words_size))) { } else if (OB_ISNULL(new_buf = (BitSetWord *)allocator->alloc(words_size))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
@ -833,20 +859,31 @@ private:
return ret; return ret;
} }
private: private:
template<int64_t N2, typename FlagType2, bool auto_free2>
friend struct ObSqlBitSet;
static const int64_t PER_BITSETWORD_BITS = 32; static const int64_t PER_BITSETWORD_BITS = 32;
static const int64_t PER_BITSETWORD_MOD_BITS = 5; static const int64_t PER_BITSETWORD_MOD_BITS = 5;
static const int64_t PER_BITSETWORD_MASK = PER_BITSETWORD_BITS - 1; static const int64_t PER_BITSETWORD_MASK = PER_BITSETWORD_BITS - 1;
static const int64_t MAX_BITSETWORD = ((N <= 0 ? DEFAULT_SQL_BITSET_SIZE : N) - 1) static const int64_t MAX_BITSETWORD = ((N <= 0 ? DEFAULT_SQL_BITSET_SIZE : N) - 1)
/ PER_BITSETWORD_BITS + 1; / PER_BITSETWORD_BITS + 1;
struct SqlBitSetDesc { struct SqlBitSetDesc
int16_t len_; {
int16_t cap_; union
{
int32_t init_errcode_;
struct
{
int16_t len_;
int16_t cap_;
};
};
bool inited_; bool inited_;
SqlBitSetDesc() SqlBitSetDesc() : len_(0), cap_(0), inited_(false)
: len_(0), cap_(0), inited_(false) {} {}
}; };
private: private:
ObIAllocator *block_allocator_; ObIAllocator *block_allocator_;
BitSetWord *bit_set_word_array_; BitSetWord *bit_set_word_array_;
@ -3522,6 +3559,7 @@ public:
params_type_(), params_type_(),
database_name_(), database_name_(),
package_name_(), package_name_(),
is_deterministic_(false),
is_parallel_enable_(false), is_parallel_enable_(false),
is_udt_udf_(false), is_udt_udf_(false),
is_pkg_body_udf_(false), is_pkg_body_udf_(false),
@ -3548,6 +3586,7 @@ public:
params_type_(), params_type_(),
database_name_(), database_name_(),
package_name_(), package_name_(),
is_deterministic_(false),
is_parallel_enable_(false), is_parallel_enable_(false),
is_udt_udf_(false), is_udt_udf_(false),
is_pkg_body_udf_(false), is_pkg_body_udf_(false),
@ -3724,6 +3763,7 @@ private:
common::ObSEArray<ObExprResType, 5, common::ModulePageAllocator, true> params_type_; common::ObSEArray<ObExprResType, 5, common::ModulePageAllocator, true> params_type_;
common::ObString database_name_; common::ObString database_name_;
common::ObString package_name_; common::ObString package_name_;
bool is_deterministic_;
bool is_parallel_enable_; bool is_parallel_enable_;
bool is_udt_udf_; bool is_udt_udf_;
bool is_pkg_body_udf_; bool is_pkg_body_udf_;