Finish refactoring IngestTypeVisitor, add datatype focused test #2347
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
Collaborator
apmoriarty
commented
Apr 17, 2024
•
apmoriarty
commented
- completed refactoring datatype-gathering logic from the IngestTypePruningVisitor to the IngestTypeVisitor.
- add ShapesTest, a WiseGuys-style test with a focus on querying across datatypes
- updated IngestTypePruningVisitor and IngestTypeVisitor tests based on integration testing
apmoriarty
force-pushed
the
task/colors-and-ingest-type-visitor-refactor
branch
from
05f8b42
to
820a244
Compare
foster33
reviewed
Apr 17, 2024
warehouse/query-core/src/test/java/datawave/query/ShapesTest.java
Outdated
Show resolved
Hide resolved
apmoriarty
force-pushed
the
task/colors-and-ingest-type-visitor-refactor
branch
from
320ca82
to
fdcca13
Compare
apmoriarty
force-pushed
the
task/colors-and-ingest-type-visitor-refactor
branch
3 times, most recently
from
a94b830
to
0bc9071
Compare
alerman
reviewed
May 2, 2024
| @@ -82,11 +83,13 @@ public static Set<String> getIngestTypes(JexlNode node, TypeMetadata typeMetadat | |||
| Object o = node.jjtAccept(visitor, null); | |||
| if (o instanceof Set) { | |||
| Set<String> ingestTypes = (Set<String>) o; | |||
| if (!ingestTypes.contains(UNKNOWN_TYPE)) { | |||
| if (ingestTypes.contains(UNKNOWN_TYPE)) { | |||
| ingestTypes.retainAll(Collections.singleton(UNKNOWN_TYPE)); | |||
| return ingestTypes; | |||
There was a problem hiding this comment.
Duplicated return. Remove this one and the flow doesnt change.
There was a problem hiding this comment.
Not quite, in this case I only want to return a collection that contains the UNKNOWN_TYPE. I'll add a comment to that effect.
warehouse/query-core/src/main/java/datawave/query/jexl/visitors/IngestTypePruningVisitor.java
Show resolved
Hide resolved
alerman
reviewed
May 2, 2024
| @@ -438,7 +441,7 @@ public void testEvaluationOnlyField() { | |||
| @Test | |||
| public void testPruneNegation() { | |||
| String query = "A == '1' || !((_Delayed_ = true) && (A == '1' && C == '2'))"; | |||
| test(query, "A == '1'"); | |||
| test(query, query); | |||
There was a problem hiding this comment.
Does this indicate we are not pruning the negation, if the expected now has the negation included?
There was a problem hiding this comment.
Previously the negation would self-prune, let me take a closer look at why this stopped visiting the negated branch..
alerman
reviewed
May 2, 2024
warehouse/query-core/src/main/java/datawave/query/jexl/visitors/IngestTypePruningVisitor.java
Show resolved
Hide resolved
MiguelRicardos
requested changes
May 2, 2024
warehouse/query-core/src/main/java/datawave/query/jexl/visitors/IngestTypeVisitor.java
Show resolved
Hide resolved
warehouse/query-core/src/main/java/datawave/query/jexl/visitors/IngestTypeVisitor.java
Show resolved
Hide resolved
warehouse/query-core/src/test/java/datawave/query/CompositeFunctionsTest.java
Outdated
Show resolved
Hide resolved
apmoriarty
force-pushed
the
task/colors-and-ingest-type-visitor-refactor
branch
from
64e2bfa
to
815e48c
Compare
…ion interaction Completed refactor of IngestTypeVisitor and IngestTypePruningVisitor Changed how visitor handles negations and null terms
apmoriarty
force-pushed
the
task/colors-and-ingest-type-visitor-refactor
branch
from
815e48c
to
3fe6790
Compare
avgAGB
approved these changes
May 10, 2024
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.