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

[FEAT MERGE] OB Support XMLType

Browse Source 
Co-authored-by: simonjoylet <simonjoylet@gmail.com>
This commit is contained in:
obdev
2023-04-28 03:45:10 +00:00
committed by ob-robot
parent 58bb3d34b7
commit 17abf2818a
405 changed files with 18839 additions and 1573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/sql/engine/basic/ob_hash_partitioning_infrastructure_op.cpp
View File

@ -17,12 +17,14 @@
using namespace oceanbase::common;
using namespace oceanbase::sql;
bool ObHashPartCols::equal(
int ObHashPartCols::equal(
const ObHashPartCols &other,
const ObIArray<ObSortFieldCollation> *sort_collations,
const ObIArray<ObCmpFunc> *cmp_funcs) const
const ObIArray<ObCmpFunc> *cmp_funcs,
bool &result) const
{
bool result = true;
int ret = OB_SUCCESS;
result = true;
if (OB_ISNULL(sort_collations) || OB_ISNULL(cmp_funcs)) {
result = false;
} else if (use_expr_ || other.use_expr_) {
@ -31,13 +33,15 @@ bool ObHashPartCols::equal(
int cmp_result = 0;
ObDatum *l_cells = store_row_->cells();
ObDatum *r_cells = other.store_row_->cells();
for (int64_t i = 0; i < sort_collations->count() && 0 == cmp_result; ++i) {
for (int64_t i = 0; OB_SUCC(ret) && i < sort_collations->count() && 0 == cmp_result; ++i) {
int64_t idx = sort_collations->at(i).field_idx_;
cmp_result = cmp_funcs->at(i).cmp_func_(l_cells[idx], r_cells[idx]);
if (OB_FAIL(cmp_funcs->at(i).cmp_func_(l_cells[idx], r_cells[idx], cmp_result))) {
LOG_WARN("do cmp failed", K(ret));
}
}
result = (0 == cmp_result);
}
return result;
return ret;
}
int ObHashPartCols::equal_distinct(
@ -63,14 +67,16 @@ int ObHashPartCols::equal_distinct(
ObDatum *r_cell = nullptr;
const int64_t right_batch_idx = eval_ctx->get_batch_idx();
const int64_t left_batch_idx = batch_idx_;
for (int64_t i = 0; i < sort_collations->count() && 0 == cmp_result; ++i) {
for (int64_t i = 0; OB_SUCC(ret) && i < sort_collations->count() && 0 == cmp_result; ++i) {
int64_t idx = sort_collations->at(i).field_idx_;
batch_info_guard.set_batch_idx(left_batch_idx);
//be careful left && right exprs are evaled in calc_hash_values
l_cell = &exprs->at(idx)->locate_expr_datum(*eval_ctx);
batch_info_guard.set_batch_idx(right_batch_idx);
r_cell = &exprs->at(idx)->locate_expr_datum(*eval_ctx);
cmp_result = cmp_funcs->at(i).cmp_func_(*l_cell, *r_cell);
if (OB_FAIL(cmp_funcs->at(i).cmp_func_(*l_cell, *r_cell, cmp_result))) {
LOG_WARN("do cmp failed", K(ret));
}
}
//reset batch_idx before return
batch_info_guard.set_batch_idx(right_batch_idx);
@ -79,10 +85,12 @@ int ObHashPartCols::equal_distinct(
ObDatum *l_cells = store_row_->cells();
ObDatum *r_cell = nullptr;
// must evaled in calc_hash_values
for (int64_t i = 0; i < sort_collations->count() && 0 == cmp_result; ++i) {
for (int64_t i = 0; i < OB_SUCC(ret) && sort_collations->count() && 0 == cmp_result; ++i) {
int64_t idx = sort_collations->at(i).field_idx_;
r_cell = &exprs->at(idx)->locate_expr_datum(*eval_ctx);
cmp_result = cmp_funcs->at(i).cmp_func_(l_cells[idx], *r_cell);
if (OB_FAIL(cmp_funcs->at(i).cmp_func_(l_cells[idx], *r_cell, cmp_result))) {
LOG_WARN("do cmp failed", K(ret));
}
}
result = (0 == cmp_result);
}

64
src/sql/engine/basic/ob_hash_partitioning_infrastructure_op.h
View File

@ -48,10 +48,13 @@ struct ObHashPartCols
return hash_value_;
}
bool equal(
int hash(uint64_t &hash_val) const { hash_val = hash(); return OB_SUCCESS; }
int equal(
const ObHashPartCols &other,
const common::ObIArray<ObSortFieldCollation> *sort_collations,
const common::ObIArray<ObCmpFunc> *cmp_funcs) const;
const common::ObIArray<ObCmpFunc> *cmp_funcs,
bool &result) const;
int equal_distinct(
const common::ObIArray<ObExpr *> *exprs,
const ObHashPartCols &other,
@ -270,6 +273,9 @@ public:
uint64_t hash() const
{ return common::murmurhash(&part_key_, sizeof(part_key_), 0); }
int hash(uint64_t &hash_val) const
{ hash_val = hash(); return OB_SUCCESS; }
bool operator==(const ObIntraPartKey &other) const
{
return part_shift_ == other.part_shift_
@ -1715,8 +1721,8 @@ int ObHashPartInfrastructure<HashCol, HashRowStore>::calc_hash_value(
const int64_t idx = sort_collations_->at(i).field_idx_;
if (OB_FAIL(exprs.at(idx)->eval(*eval_ctx_, datum))) {
SQL_ENG_LOG(WARN, "failed to eval expr", K(ret));
} else {
hash_value = hash_funcs_->at(i).hash_func_(*datum, hash_value);
} else if (OB_FAIL(hash_funcs_->at(i).hash_func_(*datum, hash_value, hash_value))) {
SQL_ENG_LOG(WARN, "failed to do hash", K(ret));
}
}
}
@ -2699,10 +2705,13 @@ int ObHashPartitionExtendHashTable<Item>::get(
} else {
common::hash::hash_func<Item> hf;
bool equal_res = false;
uint64_t bucket_hash_val = 0;
Item *bucket = buckets_->at(hash_value & (get_bucket_num() - 1));
ObEvalCtx::BatchInfoScopeGuard guard(*eval_ctx_);
while (OB_SUCC(ret) && NULL != bucket) {
if (hash_value == hf(*bucket)) {
if (OB_FAIL(hf(*bucket, bucket_hash_val))) {
SQL_ENG_LOG(WARN, "fail to get bucket hash val", K(ret));
} else if (hash_value == bucket_hash_val) {
if (OB_FAIL(bucket->equal_distinct(exprs_, part_cols, sort_collations_,
cmp_funcs_, eval_ctx_, equal_res, guard))) {
SQL_ENG_LOG(WARN, "compare info is null", K(ret));
@ -2721,6 +2730,7 @@ template <typename Item>
int ObHashPartitionExtendHashTable<Item>::set(Item &item)
{
int ret = common::OB_SUCCESS;
uint64_t hash_val = 0;
common::hash::hash_func<Item> hf;
if (!is_push_down_ && size_ >= get_bucket_num() * SIZE_BUCKET_PERCENT / 100) {
int64_t extend_bucket_num =
@ -2738,8 +2748,10 @@ int ObHashPartitionExtendHashTable<Item>::set(Item &item)
} else if (item.use_expr_) {
ret = OB_ERR_UNEXPECTED;
SQL_ENG_LOG(WARN, "unexpected status: store_row is null", K(ret));
} else if (OB_FAIL(hf(item, hash_val))) {
SQL_ENG_LOG(WARN, "hash failed", K(ret));
} else {
Item *&bucket = buckets_->at(hf(item) & (get_bucket_num() - 1));
Item *&bucket = buckets_->at(hash_val & (get_bucket_num() - 1));
item.next() = bucket;
bucket = &item;
size_ += 1;
@ -2757,18 +2769,23 @@ int ObHashPartitionExtendHashTable<Item>::set_distinct(Item &item, uint64_t hash
Item *&insert_bucket = buckets_->at(hash_value & (get_bucket_num() - 1));
Item *bucket = insert_bucket;
ObEvalCtx::BatchInfoScopeGuard guard(*eval_ctx_);
uint64_t bucket_hash_val = 0;
if (OB_NOT_NULL(bucket)) {
while(OB_SUCC(ret) && OB_NOT_NULL(bucket)) {
bool equal_res = (hash_value == hf(*bucket));
if (equal_res &&
OB_FAIL(bucket->equal_distinct(exprs_, item, sort_collations_,
cmp_funcs_, eval_ctx_, equal_res, guard))) {
SQL_ENG_LOG(WARN, "failed to compare items", K(ret));
} else if (equal_res) {
need_insert = false;
ret = OB_HASH_EXIST;
if (OB_FAIL(hf(*bucket, bucket_hash_val))) {
SQL_ENG_LOG(WARN, "failed to do bucket hash", K(ret));
} else {
bucket = bucket->next();
bool equal_res = (hash_value == bucket_hash_val);
if (equal_res &&
OB_FAIL(bucket->equal_distinct(exprs_, item, sort_collations_,
cmp_funcs_, eval_ctx_, equal_res, guard))) {
SQL_ENG_LOG(WARN, "failed to compare items", K(ret));
} else if (equal_res) {
need_insert = false;
ret = OB_HASH_EXIST;
} else {
bucket = bucket->next();
}
}
}
}
@ -2808,6 +2825,7 @@ int ObHashPartitionExtendHashTable<Item>::extend(const int64_t new_bucket_num)
{
int ret = common::OB_SUCCESS;
common::hash::hash_func<Item> hf;
uint64_t hash_val = 0;
BucketArray *new_buckets = NULL;
if (OB_FAIL(ret)) {
} else if (OB_ISNULL(buckets_)) {
@ -2820,7 +2838,7 @@ int ObHashPartitionExtendHashTable<Item>::extend(const int64_t new_bucket_num)
const int64_t tmp_new_bucket_num = new_buckets->count();
const int64_t old_bucket_num = get_bucket_num();
const int64_t BATCH_SIZE = 1024;
for (int64_t i = 0; i < old_bucket_num; i += BATCH_SIZE) {
for (int64_t i = 0; i < old_bucket_num && OB_SUCC(ret); i += BATCH_SIZE) {
int64_t batch_size = min(old_bucket_num - i, BATCH_SIZE);
for (int64_t j = 0; j < batch_size; ++j) {
Item *bucket = buckets_->at(i + j);
@ -2832,16 +2850,20 @@ int ObHashPartitionExtendHashTable<Item>::extend(const int64_t new_bucket_num)
__builtin_prefetch(bucket->next(), 0/* read */, 2 /*high temp locality*/);
}
}
for (int64_t j = 0; j < batch_size; ++j) {
for (int64_t j = 0; j < batch_size && OB_SUCC(ret); ++j) {
Item *bucket = buckets_->at(i + j);
if (nullptr != bucket) {
do {
Item *item = bucket;
bucket = bucket->next();
Item *&new_bucket = new_buckets->at(hf(*item) & (tmp_new_bucket_num - 1));
item->next() = new_bucket;
new_bucket = item;
} while (nullptr != bucket);
if (OB_FAIL(hf(*item, hash_val))) {
SQL_ENG_LOG(WARN, "fail to get item hash val", K(ret));
} else {
Item *&new_bucket = new_buckets->at(hash_val & (tmp_new_bucket_num - 1));
item->next() = new_bucket;
new_bucket = item;
}
} while (nullptr != bucket && OB_SUCC(ret));
}
}
}

17
src/sql/engine/basic/ob_limit_op.cpp
View File

@ -409,6 +409,7 @@ int ObLimitOp::inner_get_next_batch(const int64_t max_row_cnt)
int ObLimitOp::is_row_order_by_item_value_equal(bool &is_equal)
{
int ret = OB_SUCCESS;
int cmp_ret = 0;
if (MY_SPEC.sort_columns_.empty()) {
// %sort_columns_ is empty if order by const value, set is_equal to true directly.
// pre_sort_columns_.store_row_ is NULL here.
@ -422,9 +423,11 @@ int ObLimitOp::is_row_order_by_item_value_equal(bool &is_equal)
ObDatum *datum = NULL;
if (OB_FAIL(expr->eval(eval_ctx_, datum))) {
LOG_WARN("expression evaluate failed", K(ret));
} else if (expr->basic_funcs_->null_first_cmp_(
pre_sort_columns_.store_row_->cells()[i], *datum, cmp_ret)) {
LOG_WARN("compare failed", K(ret));
} else {
is_equal = 0 == expr->basic_funcs_->null_first_cmp_(
pre_sort_columns_.store_row_->cells()[i], *datum);
is_equal = 0 == cmp_ret;
}
}
}
@ -464,8 +467,14 @@ int ObLimitOp::compare_value_in_batch(bool &keep_iterating,
for (int64_t col_idx = 0; OB_SUCC(ret) && keep_iterating && col_idx < datum_vectors.count();
++col_idx) {
ObExpr *expr = MY_SPEC.sort_columns_.at(col_idx);
keep_iterating = (0 == expr->basic_funcs_->null_first_cmp_(
pre_sort_columns_.store_row_->cells()[col_idx], *(datum_vectors[col_idx].at(row_idx))));
int cmp_ret = 0;
if (OB_FAIL(expr->basic_funcs_->null_first_cmp_(
pre_sort_columns_.store_row_->cells()[col_idx],
*(datum_vectors[col_idx].at(row_idx)), cmp_ret))) {
LOG_WARN("compare failed", K(ret));
} else {
keep_iterating = (0 == cmp_ret);
}
}
if (keep_iterating) {
row_count_matched++;

7
src/sql/engine/basic/ob_monitoring_dump_op.cpp
View File

@ -162,7 +162,12 @@ int ObMonitoringDumpOp::calc_hash_value()
LOG_WARN("eval expr failed", K(ret));
} else {
uint64_t ori_hash_value = output_hash_.at(i);
output_hash_.at(i) = ori_hash_value + expr->basic_funcs_->default_hash_(*datum, 0);
uint64_t hash_value = 0;
if (OB_FAIL(expr->basic_funcs_->default_hash_(*datum, 0, hash_value))) {
LOG_WARN("do hash failed", K(ret));
} else {
output_hash_.at(i) = ori_hash_value + hash_value;
}
}
}
return ret;