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

change the default mode of index to local

Browse Source
This commit is contained in:
hnwyllmm 2022-03-09 20:34:40 +08:00 committed by LINxiansheng
parent 2e21515a30
commit 7fddf2bde5
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/resolver/ddl/ob_alter_table_resolver.cpp
View File

@ -1408,7 +1408,7 @@ int ObAlterTableResolver::generate_index_arg(obrpc::ObCreateIndexArg& index_arg,
index_arg.index_option_.parser_name_ = common::ObString::make_string(common::OB_DEFAULT_FULLTEXT_PARSER_NAME);
}
} else {
global_ = (index_scope_ != LOCAL_INDEX);
global_ = (GLOBAL_INDEX == index_scope_);
if (is_unique_key) {
if (global_) {
type = INDEX_TYPE_UNIQUE_GLOBAL;

21
src/sql/resolver/ddl/ob_create_index_resolver.cpp
View File

@ -255,8 +255,8 @@ int ObCreateIndexResolver::resolve_index_column_node(ParseNode* index_column_nod
}
// child 3 of root node, resolve index option node
int ObCreateIndexResolver::resolve_index_option_node(
ParseNode* index_option_node, ObCreateIndexStmt* crt_idx_stmt, const ObTableSchema* tbl_schema)
int ObCreateIndexResolver::resolve_index_option_node(ParseNode* index_option_node, ObCreateIndexStmt* crt_idx_stmt,
const ObTableSchema* tbl_schema, bool is_partitioned)
{
int ret = OB_SUCCESS;
const bool is_index = true;
@ -320,7 +320,7 @@ int ObCreateIndexResolver::resolve_index_option_node(
if (has_index_using_type_) {
crt_idx_stmt->set_index_using_type(index_using_type_);
}
if (OB_FAIL(set_table_option_to_stmt())) {
if (OB_FAIL(set_table_option_to_stmt(is_partitioned))) {
LOG_WARN("fail to set table option to stmt", K(ret));
}
}
@ -429,7 +429,10 @@ int ObCreateIndexResolver::resolve(const ParseNode& parse_tree)
} else if (NULL != parse_node.children_[4] &&
OB_FAIL(resolve_index_method_node(parse_node.children_[4], crt_idx_stmt))) {
LOG_WARN("fail to resolve index method node", K(ret));
} else if (OB_FAIL(resolve_index_option_node(parse_node.children_[3], crt_idx_stmt, tbl_schema))) {
} else if (OB_FAIL(resolve_index_option_node(parse_node.children_[3],
crt_idx_stmt,
tbl_schema,
NULL != parse_node.children_[5]))) {
LOG_WARN("fail to resolve index option node", K(ret));
} else if (global_ && OB_FAIL(generate_global_index_schema(crt_idx_stmt))) {
LOG_WARN("fail to generate index schema", K(ret));
@ -518,7 +521,7 @@ int ObCreateIndexResolver::add_sort_column(const ObColumnSortItem& sort_column)
return ret;
}
int ObCreateIndexResolver::set_table_option_to_stmt()
int ObCreateIndexResolver::set_table_option_to_stmt(bool is_partitioned)
{
int ret = OB_SUCCESS;
ObCreateIndexStmt* create_index_stmt = static_cast<ObCreateIndexStmt*>(stmt_);
@ -535,7 +538,13 @@ int ObCreateIndexResolver::set_table_option_to_stmt()
}
index_arg.tenant_id_ = session_info_->get_effective_tenant_id();
index_arg.index_option_.index_status_ = INDEX_STATUS_UNAVAILABLE;
global_ = (index_scope_ != LOCAL_INDEX);
if (NOT_SPECIFIED == index_scope_) {
// partitioned index must be global,
// MySQL default index mode is local
global_ = is_partitioned;
} else {
global_ = (GLOBAL_INDEX == index_scope_);
}
if (!fulltext_column_names_.empty()) {
if (index_keyname_ != DOMAIN_KEY) {
ret = OB_NOT_SUPPORTED;

6
src/sql/resolver/ddl/ob_create_index_resolver.h
View File

@ -33,12 +33,12 @@ protected:
int resolve_index_table_name_node(ParseNode* index_table_name_node, ObCreateIndexStmt* crt_idx_stmt);
int resolve_index_column_node(ParseNode* index_column_node, const bool is_fulltext_index,
ParseNode* table_option_node, ObCreateIndexStmt* crt_idx_stmt, const share::schema::ObTableSchema* tbl_schema);
int resolve_index_option_node(
ParseNode* index_option_node, ObCreateIndexStmt* crt_idx_stmt, const share::schema::ObTableSchema* tbl_schema);
int resolve_index_option_node(ParseNode* index_option_node, ObCreateIndexStmt* crt_idx_stmt,
const share::schema::ObTableSchema* tbl_schema, bool is_partitioned);
int resolve_index_method_node(ParseNode* index_method_node, ObCreateIndexStmt* crt_idx_stmt);
int check_generated_partition_column(share::schema::ObTableSchema& index_schema);
int add_sort_column(const obrpc::ObColumnSortItem& sort_column);
int set_table_option_to_stmt();
int set_table_option_to_stmt(bool is_partitioned);
int add_new_indexkey_for_oracle_temp_table();
private:

2
src/sql/resolver/ddl/ob_create_table_resolver.cpp
View File

@ -1727,7 +1727,7 @@ int ObCreateTableResolver::generate_index_arg()
if (is_oracle_temp_table_) {
index_scope_ = LOCAL_INDEX;
}
global_ = (index_scope_ != LOCAL_INDEX);
global_ = (GLOBAL_INDEX == index_scope_);
ObCreateTableStmt* create_table_stmt = static_cast<ObCreateTableStmt*>(stmt_);
ObTableSchema& table_schema = create_table_stmt->get_create_table_arg().schema_;
if (OB_SUCC(ret)) {