Skip to content

Commit

Permalink
sql: remove redundant pointer in TriggerStep
Browse files Browse the repository at this point in the history
The trigger pointer in the sql_trigger structure is a dead code
now, so it could be deleted.

Needed for #4343
  • Loading branch information
kshcherbatov committed Oct 14, 2019
1 parent 08c7d7c commit 1a3490a
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 4 deletions.
1 change: 0 additions & 1 deletion src/box/sql/fk_constraint.c
Expand Up @@ -895,7 +895,6 @@ fk_constraint_action_trigger(struct Parse *pParse, struct space_def *def,
step->op = TK_UPDATE;
}

step->trigger = trigger;
if (is_update) {
fk->on_update_trigger = trigger;
trigger->op = TK_UPDATE;
Expand Down
2 changes: 0 additions & 2 deletions src/box/sql/sqlInt.h
Expand Up @@ -2366,8 +2366,6 @@ struct sql_trigger {
struct TriggerStep {
u8 op; /* One of TK_DELETE, TK_UPDATE, TK_INSERT, TK_SELECT */
u8 orconf; /* ON_CONFLICT_ACTION_ROLLBACK etc. */
/** The trigger that this step is a part of */
struct sql_trigger *trigger;
Select *pSelect; /* SELECT statement or RHS of INSERT INTO SELECT ... */
char *zTarget; /* Target table for DELETE, UPDATE, INSERT */
Expr *pWhere; /* The WHERE clause for DELETE or UPDATE steps */
Expand Down
1 change: 0 additions & 1 deletion src/box/sql/trigger.c
Expand Up @@ -170,7 +170,6 @@ sql_trigger_finish(struct Parse *parse, struct TriggerStep *step_list,
char *trigger_name = trigger->zName;
trigger->step_list = step_list;
while (step_list != NULL) {
step_list->trigger = trigger;
step_list = step_list->pNext;
}

Expand Down

0 comments on commit 1a3490a

Please sign in to comment.