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

[FEAT MERGE] Merge syslog user experience improvement to master

Browse Source 
Co-authored-by: Charles0429 <xiezhenjiang@gmail.com>
Co-authored-by: tino247 <tino247@126.com>
Co-authored-by: chaser-ch <chaser.ch@antgroup.com>
This commit is contained in:
stdliu
2023-02-06 15:52:23 +08:00
committed by ob-robot
parent 1de9266dd0
commit f8c5c2647f
796 changed files with 4465 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/engine/aggregate/ob_aggregate_function.cpp
View File

@ -38,7 +38,7 @@ uint64_t ObAggregateDistinctItem::hash() const
{
uint64_t hash_id = 0;
if (OB_ISNULL(cells_) || OB_ISNULL(cs_type_list_)) {
LOG_ERROR("cells or cs type list is null");
LOG_ERROR_RET(OB_INVALID_ARGUMENT, "cells or cs type list is null");
} else {
hash_id = group_id_ + col_idx_;
for (int64_t i = 0; i < cs_type_list_->count(); ++i) {
@ -52,7 +52,7 @@ bool ObAggregateDistinctItem::operator==(const ObAggregateDistinctItem &other) c
{
bool bool_ret = true;
if (OB_ISNULL(cells_) || OB_ISNULL(cs_type_list_)) {
LOG_ERROR("cells or cs type list is null");
LOG_ERROR_RET(OB_INVALID_ARGUMENT, "cells or cs type list is null");
} else {
bool_ret = (group_id_ == other.group_id_ && col_idx_ == other.col_idx_);
if (bool_ret && cs_type_list_->count() != other.cs_type_list_->count()) {