[WIP] Mongoconverter #1
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
…or Lark input. output parsing is now working for simple queries. Still need to figure out how to do layered query TODO: 1. How to parse nested query such as a > 1 AND b < 1 AND (c < 1 or d < 2), current method will seperate each query into sub queries, while the desired output is having a general and statement outside while a or statement inside. 2. need to investigate whether seperating it will actually affect output. If no, then no need to change 3. input such as nelements="Si,O" does not work. Figure out why
…d to do is to parse the string before hand so that the string is correctly passed into pql
does not interpret "or"
TODO: fix pql problem with input with symbols such as a < -1
1. created a new version of grammar --> v0.9.6.g
2. v0.9.6.g(NEW) and v0.9.5.g(OLD) mainly differ in the following:
- NEW removed the mandatory parenthesis checking in OLD in the atom level, note that OLD scheme will fail with this input: filter=(a<0 or b>1)
- NEW replaced OR and AND to keyword CONJUNCTION in both expression and term level, CONJUNCTIOn is OR | AND, since we can have both possibilities
- NEW removed andcomparison, since it is obsolete now
- NEW incorporated parenthesis **Preservence** by adding "(" checking in the term level, and ")" checking in the comparison level, since only a term needs to know where does a parenthesis start and end
Made sure that transformer can parse the new tree
the schematic of the tree and cleanPQL is as follow:
for every term will be surrounded by parenthesis, regardless of whether the original input has parenthesis or not.
ex: filter = (a=0 and b=1) or c=2
tree generated will be:
expression
term
term
term
atom -> a=0
and
term
atom -> b=0
or
term
atom -> c=2
and the cleanPQL generated after parsing through the tree will be:
(((a==0) and (b==1)) or (c == 2))
** Preservence here means that I do not check for whether the user entered the right amount of parenthesis, just record if it is there. Ex of valid input into Lark: (a < 0
…i,O,X' todo: write more test and documentation
passed: test_one_input passed passed: test_two_inputs_with_and passed: test_two_inputs_with_or passed: test_valid_numbers_positive passed: test_multiple_entries passed: test_mixing_upper_case_and_lower_case passed: test_float passed: test_scientific_number passed: test_negative_number
testing function restructured
python main.py "filter=a<1" -v "(1,2,3)" -a "{'a':'b'}"
Date: Fri Nov 2 16:13:41 2018 -0700
|
This is a work in progress (WIP) to add a @wuxiaohua1011 is a Berkeley undergrad interning with the Materials Project. |
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.
mongoDB Converter made