Feature/create summaries #2649
Open
Feature/create summaries #2649
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
austin007008
force-pushed
the
feature/create-summaries
branch
2 times, most recently
from
239efc1 to
16bfd93
Compare
apmoriarty
reviewed
Nov 22, 2024
apmoriarty
reviewed
Nov 22, 2024
warehouse/query-core/src/main/java/datawave/query/attributes/SummarySize.java
Outdated
Show resolved
Hide resolved
apmoriarty
reviewed
Nov 22, 2024
warehouse/query-core/src/main/java/datawave/query/planner/DefaultQueryPlanner.java
Show resolved
Hide resolved
apmoriarty
reviewed
Nov 22, 2024
warehouse/query-core/src/main/java/datawave/query/planner/DefaultQueryPlanner.java
Outdated
Show resolved
Hide resolved
austin007008
force-pushed
the
feature/create-summaries
branch
2 times, most recently
from
0315e6e to
de635db
Compare
austin007008
force-pushed
the
feature/create-summaries
branch
3 times, most recently
from
9137fb9 to
6186bcc
Compare
working summaries created fix test reccomendations trailing regex for name matching remove unused import parameters can be entered in any order
Re-generated AccumuloSyntaxParser.java from AccumuloSyntaxParser.jj using a verson of javacc 4.1 build from https://github.com/javacc/javacc/tree/release_41
austin007008
force-pushed
the
feature/create-summaries
branch
from
6186bcc to
2c92f1c
Compare
apmoriarty
reviewed
Dec 6, 2024
warehouse/query-core/src/main/java/datawave/query/attributes/SummarySize.java
Outdated
Show resolved
Hide resolved
warehouse/query-core/src/main/java/datawave/query/attributes/SummarySize.java
Outdated
Show resolved
Hide resolved
warehouse/query-core/src/main/java/datawave/query/language/functions/jexl/SummarySize.java
Outdated
Show resolved
Hide resolved
Comment on lines
1557
to
1567
| public String getSummaryIterator() { | ||
| return getConfig().getSummaryIterator().getName(); | ||
| } | ||
|
|
||
| public void setSummaryIterator(String iteratorClass) { | ||
| try { | ||
| getConfig().setSummaryIterator((Class<? extends SortedKeyValueIterator<Key,Value>>) Class.forName(iteratorClass)); | ||
| } catch (Exception e) { | ||
| throw new DatawaveFatalQueryException("Illegal d column summary iterator class", e); | ||
| } | ||
| } |
There was a problem hiding this comment.
This is actually the iterator class name. Follow the pattern used by the create uids iterator, i.e., use getCreateUidsIteratorClass and setCreateUidsIteratorClass
There was a problem hiding this comment.
I think it is like this so that the specified class can be easily changed (could be wrong about that though). See set/get ExcerptIterator
warehouse/query-core/src/main/java/datawave/query/transformer/SummaryTransform.java
Outdated
Show resolved
Hide resolved
warehouse/query-core/src/main/java/datawave/query/transformer/SummaryTransform.java
Show resolved
Hide resolved
warehouse/query-core/src/main/java/datawave/query/transformer/SummaryTransform.java
Outdated
Show resolved
Hide resolved
|
|
||
| String queryString = "QUOTE:(farther) #SUMMARY(SIZE:-50)"; | ||
|
|
||
| // not sure why the timestamp and delete flag are present |
There was a problem hiding this comment.
did we figure out why the timestamp and delete flag are present?
There was a problem hiding this comment.
The timestamp and delete flag will always be present as components of the key if we're using toString(), won't they?
There was a problem hiding this comment.
idk tbh. the layout of this test was taken from "ExcerptTest" and it had the same thing.
warehouse/query-core/src/main/java/datawave/query/transformer/SummaryTransform.java
Outdated
Show resolved
Hide resolved
austin007008
force-pushed
the
feature/create-summaries
branch
from
2c92f1c to
2eac9ae
Compare
drewfarris
reviewed
Dec 6, 2024
warehouse/query-core/src/main/java/datawave/query/attributes/SummaryOptions.java
Outdated
Show resolved
Hide resolved
warehouse/query-core/src/main/java/datawave/query/iterator/logic/DColumnSummaryIterator.java
Outdated
Show resolved
Hide resolved
warehouse/query-core/src/main/java/datawave/query/iterator/logic/DColumnSummaryIterator.java
Outdated
Show resolved
Hide resolved
...house/query-core/src/test/java/datawave/query/iterator/logic/DColumnSummaryIteratorTest.java
Outdated
Show resolved
Hide resolved
|
|
||
| String queryString = "QUOTE:(farther) #SUMMARY(SIZE:-50)"; | ||
|
|
||
| // not sure why the timestamp and delete flag are present |
There was a problem hiding this comment.
The timestamp and delete flag will always be present as components of the key if we're using toString(), won't they?
|
Looks like the builds might be failing due to a formatting issue - consider double checking this. |
FineAndDandy
requested changes
Dec 11, 2024
| } | ||
| } catch (Exception e) { | ||
| log.warn("Unable to parse summary size string, returning empty SummaryOptions: {}", string, e); | ||
| return new SummaryOptions(); |
There was a problem hiding this comment.
maybe this should be a fatal rather that default situation?
warehouse/query-core/src/main/java/datawave/query/iterator/logic/ContentSummaryIterator.java
Show resolved
Hide resolved
warehouse/query-core/src/main/java/datawave/query/iterator/logic/ContentSummaryIterator.java
Show resolved
Hide resolved
warehouse/query-core/src/main/java/datawave/query/iterator/logic/ContentSummaryIterator.java
Show resolved
Hide resolved
Comment on lines
+249
to
+253
| foundContent.put(currentViewName, source.getTopValue().get()); | ||
| } | ||
| } else { | ||
| if (currentViewName.equalsIgnoreCase(name)) { | ||
| foundContent.put(currentViewName, source.getTopValue().get()); |
There was a problem hiding this comment.
should there be a limit on the amount of content that will be added to prevent potential memory problems? This might also require some more configuration flags
Comment on lines
+996
to
+997
| this.setSummaryOptions(summaryOptions); | ||
| config.setSummaryOptions(summaryOptions); |
There was a problem hiding this comment.
should the config be updated in the call to setSummaryOptions()?
warehouse/query-core/src/main/java/datawave/query/tables/ShardQueryLogic.java
Show resolved
Hide resolved
warehouse/query-core/src/main/java/datawave/query/tables/ShardQueryLogic.java
Show resolved
Hide resolved
warehouse/query-core/src/test/java/datawave/query/config/ShardQueryConfigurationTest.java
Show resolved
Hide resolved
...use/query-core/src/main/java/datawave/query/language/parser/lucene/AccumuloSyntaxParser.java
Outdated
Show resolved
Hide resolved
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.
adds new functionality to create summaries for returned documents