Skip to content

Validate deleted entities #3085

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

Open
nafraf wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Validate deleted entities #3085

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5ab1506
Validate reuse of deleted entities
nafraf May 17, 2023
86d8476
Validate entities deleted multiple times
nafraf May 18, 2023
a5b7342
Add _DefinedIdentifiers_Free()
nafraf May 18, 2023
4862a56
Validate the use of deleted entities in WITH
nafraf May 19, 2023
4f6b91b
Add _IdentifierDescCloneCallback()
nafraf May 20, 2023
0ca0282
Remove PROJECTED state
nafraf May 21, 2023
9187bbe
Add property contains_deleted to validations_ctx
nafraf May 21, 2023
461d1ad
Add missing raxFree()
nafraf May 21, 2023
9cef2f4
Fix pointer casting
nafraf May 22, 2023
a022cc2
Add _IdentifierDescNew()
nafraf May 22, 2023
7721d0e
Mark identifier states using enumeration
nafraf May 26, 2023
1c4f7b0
Fix validation of returned entities
nafraf May 27, 2023
1ab4845
Update test16_repeated_entity_deletion()
nafraf May 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix pointer casting
  • Loading branch information
@nafraf
nafraf committed May 22, 2023
commit 9cef2f4a13367ca3643fc5ba2a7048b123cc2ef7
18 changes: 9 additions & 9 deletions src/ast/ast_validations.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ static bool _AST_GetWithAliases
cypher_ast_projection_get_alias(proj);
const char *identifier_name;
void *identifier = NULL;
void *projected_identifier = NULL;
identifier_desc *projected_identifier = NULL;

if(ast_alias) {
// Retrieve "a" from "WITH [1, 2, 3] as a"
Expand All @@ -193,7 +193,7 @@ static bool _AST_GetWithAliases
}

// copy original identifier properties to the aliased identifier
projected_identifier = _IdentifierDescClone(identifier);
projected_identifier = _IdentifierDescClone((identifier_desc *)identifier);
}
}
} else {
Expand Down Expand Up @@ -223,13 +223,13 @@ static bool _AST_GetWithAliases
}

// copy original identifier properties to the aliased identifier
projected_identifier = _IdentifierDescClone(identifier);
projected_identifier = _IdentifierDescClone((identifier_desc *)identifier);
}
}
}

raxInsert(aliases, (unsigned char *)identifier_name,
strlen(identifier_name), projected_identifier, NULL);
strlen(identifier_name), (void *)projected_identifier, NULL);


// check for duplicate column names
Expand Down Expand Up @@ -970,7 +970,7 @@ static VISITOR_STRATEGY _Validate_rel_pattern
return VISITOR_RECURSE;
}

if(identifier != raxNotFound && identifier != NULL) {
if(identifier != NULL) {
SIType alias_type = ((identifier_desc *)identifier)->type;
identifier_state state = ((identifier_desc *)identifier)->state;

Expand Down Expand Up @@ -1412,7 +1412,7 @@ static VISITOR_STRATEGY _Validate_WITH_Clause
cypher_ast_projection_get_alias(proj);
const char *identifier_name;
void *identifier = NULL;
void *projected_identifier = NULL;
identifier_desc *projected_identifier = NULL;

if(ast_alias) {
// Retrieve "a" from "WITH x AS a" or "WITH [1, 2, 3] AS a"
Expand All @@ -1426,7 +1426,7 @@ static VISITOR_STRATEGY _Validate_WITH_Clause
identifier = raxFind(vctx->defined_identifiers, (unsigned char *)current_identifier_name, len);
if(identifier != raxNotFound && identifier != NULL) {
// copy original identifier properties to the aliased identifier
projected_identifier = _IdentifierDescClone(identifier);
projected_identifier = _IdentifierDescClone((identifier_desc *)identifier);
}
}
} else {
Expand All @@ -1440,13 +1440,13 @@ static VISITOR_STRATEGY _Validate_WITH_Clause

if(identifier != raxNotFound && identifier != NULL) {
// copy original identifier properties to the aliased identifier
projected_identifier = _IdentifierDescClone(identifier);
projected_identifier = _IdentifierDescClone((identifier_desc *)identifier);
}
}
}

raxInsert(projected_identifiers, (unsigned char *)identifier_name,
strlen(identifier_name), projected_identifier, NULL);
strlen(identifier_name), (void *) projected_identifier, NULL);

}

Expand Down