Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CBRD-24867] regression bug-fix related to DBLINK (DML and extended table specification) #4450

Merged
merged 7 commits into from
Jul 7, 2023
Merged

[CBRD-24867] regression bug-fix related to DBLINK (DML and extended table specification) #4450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
adf21bc
[CBRD-24867] regression bug-fix related to DBLINK (DML and extended t…
beyondykk9 Jun 27, 2023
090688c
check tbl_name
beyondykk9 Jun 27, 2023
88367e9
revert: rewrite dblink query
beyondykk9 Jun 28, 2023
c12d2c0
fix: rewritten query quoted
beyondykk9 Jun 28, 2023
52cb11b
cublink without colums def
beyondykk9 Jun 29, 2023
db4daff
revert to rewrite dblink query
beyondykk9 Jul 3, 2023
395ad20
Merge remote-tracking branch 'upstream/develop' into CBRD-24867
beyondykk9 Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/parser/parse_tree_cl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18724,7 +18724,9 @@ pt_print_dblink_table (PARSER_CONTEXT * parser, PT_NODE * p)
q = pt_append_bytes (parser, q, ", ", 2);
if (p->info.dblink_table.rewritten)
{
q = pt_append_varchar (parser, q, p->info.dblink_table.rewritten);
q =
pt_append_quoted_string (parser, q, (char *) p->info.dblink_table.rewritten->bytes,
p->info.dblink_table.rewritten->length);
}
else if (p->info.dblink_table.qstr)
{
Expand Down
234 changes: 40 additions & 194 deletions src/parser/parser_support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11212,184 +11212,75 @@ pt_make_remote_query (PARSER_CONTEXT * parser, char *sql_user_text, SERVER_NAME_
#endif

static int
pt_init_update_data (PARSER_CONTEXT * parser, PT_NODE * statement, CLIENT_UPDATE_INFO ** assigns_data,
int *assigns_count, CLIENT_UPDATE_CLASS_INFO ** cls_data)
pt_check_update_set (PARSER_CONTEXT * parser, PT_NODE * statement, int *local_upd, int *remote_upd)
{
int error = NO_ERROR;
int assign_cnt = 0, upd_cls_cnt = 0;
int idx, idx2;
int upd_cls_cnt = 0;
int remote = 0, local = 0;

PT_ASSIGNMENTS_HELPER ea;
PT_NODE *node = NULL, *assignments, *spec, *class_spec;
CLIENT_UPDATE_CLASS_INFO *cls_info = NULL, *cls_info_tmp = NULL;
CLIENT_UPDATE_INFO *assigns = NULL, *assign = NULL, *assign2 = NULL;
PT_NODE *node = NULL, *assignments, *spec;

assign_cnt = 0;
assignments =
statement->node_type == PT_MERGE ? statement->info.merge.update.assignment : statement->info.update.assignment;
spec = statement->node_type == PT_MERGE ? statement->info.merge.into : statement->info.update.spec;
class_spec = statement->node_type == PT_MERGE ? NULL : statement->info.update.class_specs;
assignments = statement->info.update.assignment;
spec = statement->info.update.spec;

pt_init_assignments_helper (parser, &ea, assignments);
while (pt_get_next_assignment (&ea))
{
/* count number of assignments */
assign_cnt++;
}

/* allocate memory for assignment structures */
assigns = (CLIENT_UPDATE_INFO *) malloc (assign_cnt * sizeof (CLIENT_UPDATE_INFO));
if (assigns == NULL)
{
error = ER_REGU_NO_SPACE;
goto error_return;
}
memset (assigns, 0, assign_cnt * sizeof (CLIENT_UPDATE_INFO));

node = spec;
while (node)
{
/* count classes that will be updated */
upd_cls_cnt++;
node = node->next;
}

node = class_spec;
while (node)
while (spec)
{
/* count classes that will be updated */
upd_cls_cnt++;
node = node->next;
}

/* allocate array of classes information structures */
cls_info = (CLIENT_UPDATE_CLASS_INFO *) malloc (upd_cls_cnt * sizeof (CLIENT_UPDATE_CLASS_INFO));
if (cls_info == NULL)
{
error = ER_REGU_NO_SPACE;
goto error_return;
spec = spec->next;
}

memset (cls_info, 0, upd_cls_cnt * sizeof (CLIENT_UPDATE_CLASS_INFO));

/* initialize classes info array */
idx = 0;
node = spec;
while (node)
{
cls_info_tmp = &cls_info[idx++];
cls_info_tmp->spec = node;
cls_info_tmp->first_assign = NULL;

node = node->next;
}
spec = statement->info.update.spec;

/* initialize classes info array */
idx = 0;
node = class_spec;
while (node)
{
cls_info_tmp = &cls_info[idx++];
cls_info_tmp->spec = node;
cls_info_tmp->first_assign = NULL;

node = node->next;
}

/* Fill assignment structures */
pt_init_assignments_helper (parser, &ea, assignments);
for (assign = assigns; pt_get_next_assignment (&ea); assign++)

while (pt_get_next_assignment (&ea))
{
PT_NODE *tbl_spec = NULL;
PT_NODE *entity_spec;
char *tbl_name;
char *tbl_alias = NULL;
char *lhs_name;
bool found = false;

for (idx = 0; idx < upd_cls_cnt; idx++)
lhs_name = (char *) ea.lhs->info.name.original;
while (spec && !found)
{
if (cls_info[idx].spec->info.spec.entity_name)
if (spec->info.spec.entity_name)
{
if (cls_info[idx].spec->info.spec.entity_name->node_type == PT_NAME)
{
tbl_spec = cls_info[idx].spec;
}
else if (cls_info[idx].spec->info.spec.entity_name->node_type == PT_SPEC)
tbl_name = (char *) spec->info.spec.entity_name->info.name.original;
if (spec->info.spec.range_var)
{
tbl_spec = cls_info[idx].spec->info.spec.entity_name;
tbl_alias = (char *) spec->info.spec.range_var->info.name.original;
}
}

lhs_name = (char *) ea.lhs->info.name.original;
while (tbl_spec && !found)
{
if (tbl_spec->info.spec.range_var)
if ((tbl_name && strcmp (tbl_name, lhs_name) == 0) || (tbl_alias && strcmp (tbl_alias, lhs_name) == 0)
|| upd_cls_cnt == 1)
{
tbl_name = (char *) tbl_spec->info.spec.range_var->info.name.original;
tbl_alias = (char *) tbl_spec->info.spec.range_var->info.name.original;
entity_spec = NULL;
}
else
{
entity_spec = tbl_spec->info.spec.entity_name;
}

while (entity_spec)
{
if (entity_spec->node_type == PT_NAME)
{
tbl_name = (char *) entity_spec->info.name.original;
break;
}
entity_spec = entity_spec->info.spec.entity_name;
}

assign->cls_info = NULL;
if (strcmp (tbl_name, lhs_name) == 0 || (tbl_alias && strcmp (tbl_alias, lhs_name) == 0))
{
assign->cls_info = &cls_info[idx];
/* link assignment to its class info */
if (cls_info[idx].first_assign)
found = true;
if (spec->info.spec.remote_server_name)
{
assign2 = cls_info[idx].first_assign;
while (assign2->next)
{
assign2 = assign2->next;
}
assign2->next = assign;
remote++;
}
else
{
cls_info[idx].first_assign = assign;
local++;
}
assign->next = NULL;
found = true;
break;
}
tbl_spec = tbl_spec->next;
}
spec = spec->next;
}
}

*assigns_data = assigns;
*assigns_count = assign_cnt;
*cls_data = cls_info;

return error;

error_return:
/* free class information array */
if (cls_info)
{
free (cls_info);
if (!found && remote > 0 && local > 0)
{
/* remote & local updates are mixed */
/* the update would be ambiguous */
PT_ERRORmf (parser, assignments, MSGCAT_SET_PARSER_SEMANTIC, MSGCAT_SEMANTIC_AMBIGUOUS_REF_TO, lhs_name);
error = ER_FAILED;
break;
}
}

/* free assignments information */
if (assigns != NULL)
{
free (assigns);
}
*remote_upd = remote;
*local_upd = local;

return error;
}
Expand Down Expand Up @@ -11588,65 +11479,20 @@ pt_convert_dblink_delete_query (PARSER_CONTEXT * parser, PT_NODE * node, SERVER_
static void
pt_convert_dblink_update_query (PARSER_CONTEXT * parser, PT_NODE * node, SERVER_NAME_LIST * snl)
{
int idx, local_upd = 0, assigns_count = 0;
int error, remote_upd = 0, upd_cls_cnt, vals_cnt, multi_assign_cnt;
PT_NODE *assignments = NULL, *rhs, *tbl_spec;
PT_ASSIGNMENTS_HELPER ea;
CLIENT_UPDATE_INFO *assigns = NULL, *assign = NULL;
CLIENT_UPDATE_CLASS_INFO *cls_info = NULL, *cls = NULL;
DB_VALUE *dbvals = NULL;
int local_upd = 0, remote_upd = 0;
int error;

parser_walk_tree (parser, node, pt_convert_dblink_synonym, NULL, NULL, NULL);
if (pt_has_error (parser))
{
return;
}

assignments = node->info.update.assignment;
tbl_spec = node->info.update.spec;

error = pt_init_update_data (parser, node, &assigns, &assigns_count, &cls_info);

pt_init_assignments_helper (parser, &ea, assignments);
for (idx = 0; idx < assigns_count && error == NO_ERROR; idx += multi_assign_cnt)
{
multi_assign_cnt = 1;
assign = &assigns[idx];
cls = assign->cls_info;
if (cls == NULL)
{
continue;
}
if (cls->spec->info.spec.remote_server_name == NULL)
{
local_upd++;
}
else
{
remote_upd++;
}

pt_get_next_assignment (&ea);
rhs = ea.rhs;
if (ea.is_n_column)
{
while (pt_get_next_assignment (&ea) && rhs == ea.rhs)
{
multi_assign_cnt++;
}
}
}

/* free assignments array */
if (assigns != NULL)
{
free (assigns);
}
error = pt_check_update_set (parser, node, &local_upd, &remote_upd);

/* free classes info array */
if (cls_info != NULL)
if (error != NO_ERROR)
{
free (cls_info);
return;
}

pt_convert_dblink_dml_query (parser, node, local_upd, remote_upd, snl);
Expand Down Expand Up @@ -11754,7 +11600,7 @@ pt_convert_dblink_dml_query (PARSER_CONTEXT * parser, PT_NODE * node,

if (local_upd > 0 && upd_spec)
{
pt_check_sub_query_spec (parser, upd_spec, snl, NULL);
parser_walk_tree (parser, node, pt_check_sub_query_spec, snl, NULL, NULL);
}

if (into_spec)
Expand Down