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

[FTS][BUG.FIX] Fix both full-text and multi-value indexs in data table.

Browse Source
This commit is contained in:
Tyshawn
2024-04-23 13:49:51 +00:00
committed by ob-robot
parent 8aade630d8
commit f3d6b18e58
4 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/das/ob_das_dml_ctx_define.cpp
View File

@ -234,7 +234,16 @@ void ObDASDMLIterator::set_ctdef(const ObDASDMLBaseCtDef *das_ctdef)
&das_ctdef_->old_row_projector_ : &das_ctdef_->old_row_projector_ :
&das_ctdef_->new_row_projector_; &das_ctdef_->new_row_projector_;
if (OB_NOT_NULL(domain_iter_)) { if (OB_NOT_NULL(domain_iter_)) {
domain_iter_->set_ctdef(das_ctdef, row_projector_); if (!das_ctdef->table_param_.get_data_table().is_domain_index()) {
// This table isn't domain index, nothing to do.
} else if (domain_iter_->is_same_domain_type(das_ctdef)) {
// The das_ctdef and das_ctdef_ are either full-text search or multi-value index.
domain_iter_->set_ctdef(das_ctdef, row_projector_);
} else {
// need to reset domain iter
domain_iter_->~ObDomainDMLIterator();
domain_iter_ = nullptr;
}
} }
} }

14
src/sql/das/ob_das_domain_utils.cpp
View File

@ -490,6 +490,20 @@ void ObDomainDMLIterator::set_ctdef(
row_projector_ = row_projector; row_projector_ = row_projector;
} }
bool ObDomainDMLIterator::is_same_domain_type(const ObDASDMLBaseCtDef *das_ctdef) const
{
bool is_same_domain_type = false;
if (OB_NOT_NULL(das_ctdef) && OB_NOT_NULL(das_ctdef_)) {
const ObTableSchemaParam &table_param = das_ctdef->table_param_.get_data_table();
const ObTableSchemaParam &my_table_param = das_ctdef_->table_param_.get_data_table();
if ((table_param.is_fts_index() && my_table_param.is_fts_index())
|| (table_param.is_multivalue_index() && my_table_param.is_multivalue_index())) {
is_same_domain_type = true;
}
}
return is_same_domain_type;
}
int ObDomainDMLIterator::get_next_domain_row(ObNewRow *&row) int ObDomainDMLIterator::get_next_domain_row(ObNewRow *&row)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;

1
src/sql/das/ob_das_domain_utils.h
View File

@ -106,6 +106,7 @@ public:
void set_ctdef(const ObDASDMLBaseCtDef *das_ctdef, const IntFixedArray *row_projector); void set_ctdef(const ObDASDMLBaseCtDef *das_ctdef, const IntFixedArray *row_projector);
void set_row_projector(const IntFixedArray *row_projector) { row_projector_ = row_projector; } void set_row_projector(const IntFixedArray *row_projector) { row_projector_ = row_projector; }
int get_next_domain_row(ObNewRow *&row); int get_next_domain_row(ObNewRow *&row);
bool is_same_domain_type(const ObDASDMLBaseCtDef *das_ctdef) const;
TO_STRING_KV(K_(row_idx), K_(rows), KPC_(row_projector), KPC_(das_ctdef), K_(main_ctdef)); TO_STRING_KV(K_(row_idx), K_(rows), KPC_(row_projector), KPC_(das_ctdef), K_(main_ctdef));
protected: protected:

17
src/sql/das/ob_das_update_op.cpp
View File

@ -73,10 +73,19 @@ public:
iter_has_built_ = false; iter_has_built_ = false;
das_ctdef_ = static_cast<const ObDASUpdCtDef*>(das_ctdef); das_ctdef_ = static_cast<const ObDASUpdCtDef*>(das_ctdef);
if (OB_NOT_NULL(domain_iter_)) { if (OB_NOT_NULL(domain_iter_)) {
domain_iter_->set_ctdef(das_ctdef_, &(got_old_row_ ? das_ctdef_->new_row_projector_ if (!das_ctdef->table_param_.get_data_table().is_domain_index()) {
: das_ctdef_->old_row_projector_)); // This table isn't domain index, nothing to do.
if (OB_FAIL(domain_iter_->rewind())) { } else if (domain_iter_->is_same_domain_type(das_ctdef)) {
LOG_WARN("fail to rewind for domain iterator", K(ret)); // The das_ctdef and das_ctdef_ are either full-text search or multi-value index.
domain_iter_->set_ctdef(das_ctdef_, &(got_old_row_ ? das_ctdef_->new_row_projector_
: das_ctdef_->old_row_projector_));
if (OB_FAIL(domain_iter_->rewind())) {
LOG_WARN("fail to rewind for domain iterator", K(ret));
}
} else {
// need to reset domain iter
domain_iter_->~ObDomainDMLIterator();
domain_iter_ = nullptr;
} }
} }
return ret; return ret;