diff --git a/deps/oblib/src/lib/container/ob_vector.ipp b/deps/oblib/src/lib/container/ob_vector.ipp index f5c03d7de..27160ab8c 100644 --- a/deps/oblib/src/lib/container/ob_vector.ipp +++ b/deps/oblib/src/lib/container/ob_vector.ipp @@ -145,7 +145,7 @@ int ObVector::expand(int64_t size) copy(new_mem, mem_begin_, mem_end_); } - // deallocate old memeory + // deallocate old memory destroy(); mem_begin_ = new_mem; diff --git a/deps/oblib/src/lib/thread_local/thread_buffer.cpp b/deps/oblib/src/lib/thread_local/thread_buffer.cpp index 8b2429734..142225339 100644 --- a/deps/oblib/src/lib/thread_local/thread_buffer.cpp +++ b/deps/oblib/src/lib/thread_local/thread_buffer.cpp @@ -80,7 +80,7 @@ ThreadSpecificBuffer::Buffer *ThreadSpecificBuffer::get_buffer() const ptr = ob_malloc(size_ + sizeof(Buffer), ObModIds::OB_THREAD_BUFFER); if (NULL == ptr) { // malloc failed; - _OB_LOG_RET(ERROR, OB_ALLOCATE_MEMORY_FAILED, "malloc thread specific memeory failed."); + _OB_LOG_RET(ERROR, OB_ALLOCATE_MEMORY_FAILED, "malloc thread specific memory failed."); } else { int ret = pthread_setspecific(key_, ptr); if (0 != ret) { diff --git a/src/sql/rewrite/ob_query_range.cpp b/src/sql/rewrite/ob_query_range.cpp index 295476712..f5ec77b68 100644 --- a/src/sql/rewrite/ob_query_range.cpp +++ b/src/sql/rewrite/ob_query_range.cpp @@ -196,7 +196,7 @@ int ObQueryRange::init_query_range_ctx(ObIAllocator &allocator, LOG_WARN("expr result type is null", K(ret)); } else if (OB_ISNULL(ptr = allocator.alloc(sizeof(ObKeyPartPos)))) { ret = OB_ALLOCATE_MEMORY_FAILED; - LOG_WARN("failed to allocate memeory for ObKeyPartPos", K(ret)); + LOG_WARN("failed to allocate memory for ObKeyPartPos", K(ret)); } else { ObExprResType tmp_expr_type = *expr_res_type; if (tmp_expr_type.is_lob_locator()) { diff --git a/unittest/storage/mockcontainer/mock_ob_iterator.cpp b/unittest/storage/mockcontainer/mock_ob_iterator.cpp index 97c0e542b..420f81775 100644 --- a/unittest/storage/mockcontainer/mock_ob_iterator.cpp +++ b/unittest/storage/mockcontainer/mock_ob_iterator.cpp @@ -859,7 +859,7 @@ int ObMockIteratorBuilder::static_init() && OB_SUCCESS != (ret = str_to_flag_.create( cal_next_prime(FLAG_NUM * 2), ObModIds::OB_HASH_BUCKET))) { - STORAGE_LOG(WARN, "out of memeory"); + STORAGE_LOG(WARN, "out of memory"); } else if (OB_SUCCESS != str_to_flag_.set_refactored( ObString::make_string("RF_ROW_DOES_NOT_EXIST"), ObDmlFlag::DF_NOT_EXIST) @@ -894,7 +894,7 @@ int ObMockIteratorBuilder::static_init() && OB_SUCCESS != (ret = str_to_dml_.create( cal_next_prime(DML_NUM * 2), ObModIds::OB_HASH_BUCKET))) { - STORAGE_LOG(WARN, "out of memeory"); + STORAGE_LOG(WARN, "out of memory"); } else if (OB_SUCCESS != str_to_dml_.set_refactored( ObString::make_string("INSERT"), DF_INSERT) || OB_SUCCESS != str_to_dml_.set_refactored( @@ -913,7 +913,7 @@ int ObMockIteratorBuilder::static_init() && OB_SUCCESS != (ret = str_to_base_.create( cal_next_prime(BASE_NUM * 2), ObModIds::OB_HASH_BUCKET))) { - STORAGE_LOG(WARN, "out of memeory"); + STORAGE_LOG(WARN, "out of memory"); } else if (OB_SUCCESS != str_to_base_.set_refactored( ObString::make_string("TRUE"), true) || OB_SUCCESS != str_to_base_.set_refactored( @@ -928,7 +928,7 @@ int ObMockIteratorBuilder::static_init() && OB_SUCCESS != (ret = str_to_is_get_.create( cal_next_prime(BASE_NUM * 2), ObModIds::OB_HASH_BUCKET))) { - STORAGE_LOG(WARN, "out of memeory"); + STORAGE_LOG(WARN, "out of memory"); } else if (OB_SUCCESS != str_to_is_get_.set_refactored( ObString::make_string("TRUE"), true) || OB_SUCCESS != str_to_is_get_.set_refactored( @@ -943,7 +943,7 @@ int ObMockIteratorBuilder::static_init() && OB_SUCCESS != (ret = str_to_trans_id_.create( cal_next_prime(BASE_NUM * 3), ObModIds::OB_HASH_BUCKET))) { - STORAGE_LOG(WARN, "out of memeory"); + STORAGE_LOG(WARN, "out of memory"); } else if (OB_SUCCESS != str_to_trans_id_.set_refactored( ObString::make_string("trans_id_1"), trans_id_list_[0]) || OB_SUCCESS != str_to_trans_id_.set_refactored( @@ -981,7 +981,7 @@ int ObMockIteratorBuilder::static_init() if (ret == OB_SUCCESS && OB_SUCCESS != (ret = str_to_multi_version_row_flag_.create( cal_next_prime(MULTI_VERSION_ROW_FLAG_NUM * 2), ObModIds::OB_HASH_BUCKET))) { - STORAGE_LOG(WARN, "out of memeory"); + STORAGE_LOG(WARN, "out of memory"); } else if (OB_SUCCESS != str_to_multi_version_row_flag_.set_refactored(ObString::make_string("N"), 0) || OB_SUCCESS != str_to_multi_version_row_flag_.set_refactored(ObString::make_string("C"), 8) || OB_SUCCESS != str_to_multi_version_row_flag_.set_refactored(ObString::make_string("L"), 32)