Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/post processor #6

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Feature/post processor #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f47bc29
Moved long running query into configuration
ivakegg May 16, 2024
8168e40
Added flush stage (flushing results from post processors)
ivakegg May 29, 2024
59f06be
Added missing functions
ivakegg May 31, 2024
c8c1e45
Updated datawave version
ivakegg Jun 14, 2024
3de5579
Updated per the removed QueryData constructors
ivakegg Jul 10, 2024
62db34f
Merge branch 'main' into feature/postProcessor
ivakegg Sep 18, 2024
ec39a5f
working against snapshot version
ivakegg Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</scm>
<properties>
<datawave.webservice.namespace>http://webservice.datawave/v1</datawave.webservice.namespace>
<version.datawave>7.3.0</version.datawave>
<version.datawave>7.7.0-SNAPSHOT</version.datawave>
<version.guava>31.0.1-jre</version.guava>
<version.microservice.hazelcast-client>4.0.2</version.microservice.hazelcast-client>
<version.microservice.starter>4.0.2</version.microservice.starter>
Expand Down
12 changes: 1 addition & 11 deletions src/main/java/datawave/microservice/query/storage/QueryStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public enum QUERY_STATE {
* RESULTS: All next tasks have been generated and we are only generating results<br>
*/
public enum CREATE_STAGE {
CREATE, PLAN, TASK, RESULTS
CREATE, PLAN, TASK, RESULTS, FLUSH
}

private QueryKey queryKey;
Expand All @@ -72,8 +72,6 @@ public enum CREATE_STAGE {
private int activeNextCalls = 0;
private int maxConcurrentNextCalls = 1;
private long lastPageNumber = 0L;
private boolean allowLongRunningQueryEmptyPages = false;

private long nextCount;
private long seekCount;

Expand Down Expand Up @@ -304,14 +302,6 @@ public void setLastPageNumber(long lastPageNumber) {
this.lastPageNumber = lastPageNumber;
}

public boolean isAllowLongRunningQueryEmptyPages() {
return allowLongRunningQueryEmptyPages;
}

public void setAllowLongRunningQueryEmptyPages(boolean allowLongRunningQueryEmptyPages) {
this.allowLongRunningQueryEmptyPages = allowLongRunningQueryEmptyPages;
}

public long getNextCount() {
return nextCount;
}
Expand Down
31 changes: 29 additions & 2 deletions src/main/resources/QueryLogicFactory.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,29 @@
<bean class="datawave.query.language.functions.jexl.GetAllMatches"/>
<bean class="datawave.query.language.functions.jexl.MatchesAtLeastCountOf"/>
<bean class="datawave.query.language.functions.jexl.TimeFunction"/>
<bean class="datawave.query.language.functions.jexl.Jexl"/>
<bean class="datawave.query.language.functions.jexl.Options"/>
<bean class="datawave.query.language.functions.jexl.Jexl"/>
<bean class="datawave.query.language.functions.jexl.AtomValuesMatchFunction"/>
<bean class="datawave.query.language.functions.jexl.Options"/>
<bean class="datawave.query.language.functions.jexl.Rename"/>
<bean class="datawave.query.language.functions.jexl.GroupBy"/>
<bean class="datawave.query.language.functions.jexl.Unique"/>
<bean class="datawave.query.language.functions.jexl.UniqueByDay"/>
<bean class="datawave.query.language.functions.jexl.UniqueByHour"/>
<bean class="datawave.query.language.functions.jexl.UniqueByMinute"/>
<bean class="datawave.query.language.functions.jexl.UniqueByMonth"/>
<bean class="datawave.query.language.functions.jexl.UniqueBySecond"/>
<bean class="datawave.query.language.functions.jexl.UniqueByTenthOfHour"/>
<bean class="datawave.query.language.functions.jexl.UniqueByYear"/>
<bean class="datawave.query.language.functions.jexl.MostRecentUnique"/>
<bean class="datawave.query.language.functions.jexl.MostRecentUniqueByDay"/>
<bean class="datawave.query.language.functions.jexl.MostRecentUniqueByHour"/>
<bean class="datawave.query.language.functions.jexl.MostRecentUniqueByMinute"/>
<bean class="datawave.query.language.functions.jexl.MostRecentUniqueByMonth"/>
<bean class="datawave.query.language.functions.jexl.MostRecentUniqueBySecond"/>
<bean class="datawave.query.language.functions.jexl.MostRecentUniqueByTenthOfHour"/>
<bean class="datawave.query.language.functions.jexl.MostRecentUniqueByYear"/>
<bean class="datawave.query.language.functions.jexl.NoExpansion"/>
<bean class="datawave.query.language.functions.jexl.Compare"/>
<bean class="datawave.query.language.functions.jexl.Geowave.Contains"/>
<bean class="datawave.query.language.functions.jexl.Geowave.CoveredBy"/>
<bean class="datawave.query.language.functions.jexl.Geowave.Covers"/>
Expand All @@ -257,6 +277,13 @@
<bean class="datawave.query.language.functions.jexl.EvaluationOnly">
<property name="parser" ref="LuceneToJexlQueryParser"/>
</bean>
<bean class="datawave.query.language.functions.jexl.ExcerptFields"/>
<bean class="datawave.query.language.functions.jexl.Matches"/>
<bean class="datawave.query.language.functions.jexl.Sum"/>
<bean class="datawave.query.language.functions.jexl.Min"/>
<bean class="datawave.query.language.functions.jexl.Max"/>
<bean class="datawave.query.language.functions.jexl.Average"/>
<bean class="datawave.query.language.functions.jexl.Count"/>
</util:list>

<bean id="LuceneToJexlQueryParser" scope="prototype" class="datawave.query.language.parser.jexl.LuceneToJexlQueryParser">
Expand Down
Loading