Simplify grounding by removing joins with var ID tables #110
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
netj
approved these changes
Dec 29, 2016
| val fakeCQ = stmt.q.copy(bodies = List(fakeBody)) | ||
|
|
||
| // TODO XXX: Fix the `internal` hack below | ||
| val qc = new QueryCompiler(fakeCQ, internalVarTables, internalVarJoinConds) | ||
| val qc = new QueryCompiler(fakeCQ) |
There was a problem hiding this comment.
can you remove the TODO XXX comment since they're gone now?
| @@ -116,8 +116,9 @@ class DeepDiveLogCompiler( program : DeepDiveLog.Program, config : DeepDiveLog.C | |||
| // odd has happened. | |||
| def resolveName( v : Variable ) : String = { | |||
| v match { case Variable(v,relName,i) => | |||
| if(attrNameForRelationAndPosition contains (relName,i)) { | |||
| attrNameForRelationAndPosition(relName,i) | |||
| val realRel = relName.replaceAll("^" + deepdivePrefixForVariablesWithIdsTable, "") | |||
There was a problem hiding this comment.
I'm not comfortable with stitching regex like this.. Looks like stripPrefix will do a cleaner job?
netj
reviewed
Dec 29, 2016
| @@ -685,7 +673,7 @@ object DeepDiveLogCompiler extends DeepDiveLogHandler { | |||
| val deepdiveVariableIdColumn = "dd_id" | |||
| val deepdiveVariableLabelColumn = "dd_label" | |||
| val deepdiveVariableLabelTruthinessColumn = "dd_truthiness" | |||
| val deepdivePrefixForVariablesIdsTable = "dd_variables_" | |||
| val deepdivePrefixForVariablesWithIdsTable = "dd_predicate_" | |||
There was a problem hiding this comment.
Actually, could you elaborate a bit on the naming of this table? "predicate" isn't very intuitive IMO. I think it's still a materialized variable, so maybe something straightforward as dd_variable_copy_ or dd_variable_with_id_?
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.
dd_predicate_Vextends variable tableVwith two additional columns (copied from the var ID table):dd_id(var ID) anddd_part(partition ID).