Refactoring the ParsedQuery class
#323
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…childGraphPattern types - Todo : remove outcommented code - Todo: reinstate the "toString" class.
Start simplifying the parsedQuery by removing the unnecessary shared_ptr and manual constructor shenanigans.
joka921
force-pushed
the
f.parsedQueryRefactor
branch
from
68b5b84
to
552eb6d
Compare
This was referenced Apr 17, 2020
niklas88
approved these changes
Apr 19, 2020
floriankramer
approved these changes
Apr 20, 2020
| } else if constexpr (std::is_same_v<T, | ||
| GraphPatternOperation::TransPath>) { | ||
| AD_CHECK(false); | ||
| // we may never be in an transitive path here or a |
There was a problem hiding this comment.
The property paths are not yet expanded into trees of operations, thats done in the QueryPlanner. Due to that they are currently all contained in a triple, and the TransPath GraphPatternOperation cannot appear here. Instead, the prefix expansion is done as part of the prefix expansion of triples, a few lines below this one.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The suboperations previously contained a union for the different types (Subquery, Optional, Union + some we have yet to implement) plus a separate tag, which type was in use. This is now refactored as a
std::variantwhich is more modern and more explicit, since the "data storage" and the name of the Suboperation type are much closer connected.The
ParsedQueryclass previously usedstd::shared_ptrall over the place when there was neitherParsedQueryis built exactly once during the Parsingand is typically never copied and relatively cheap to copy and basically free to move.
Even worse, typically the copy constructors of types were manually specified to ignore the shared_ownership and copy the held data which really defeats the purpose and signals, that is was the wrong tool here.
These places are now all refactored to hold the data directly + The use of typically mechanisms to pass them to functions (
const T&for const access, T* for readWrite access).since many calls to
shared_ptr<T>.get()and tomake_sharedcan be removed.