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

Jump to bottom

re #2118: composite sequential execution mode #2120

Merged
merged 5 commits into from
Oct 12, 2023
Merged

re #2118: composite sequential execution mode #2120

merged 5 commits into from
Oct 12, 2023

Conversation

ivakegg
Copy link
Collaborator

@ivakegg ivakegg commented Oct 7, 2023

  • Added a sequential execution mode
  • Executes the logics in sequential order (logicName order)
  • The first logic that returns results will disable the following logics
  • Added some debugging in the RemoteHttpService to verify we are closing

ivakegg added 3 commits October 7, 2023 14:38
@ivakegg
re #2118: composite sequential execution mode
48f52c1 
* Added a sequential execution mode
* Executes the logics in sequential order (logicName order)
* The first logic that returns results will disable the following logics
* Added some debugging in the RemoteHttpService to verify we are closing
@ivakegg
re #2118: Work better with spring by not forcing the Map implementation
14e4010
@ivakegg
Spring friendly ?
3159ecc
@ivakegg ivakegg added Integration Tested accepted accepted for merging into a specific branch labels Oct 11, 2023
@jwomeara
Copy link
Collaborator

So when you say "sequential", what you really mean is "sequential AND short circuiting". If it were just the sequential version of what we already have, then it would run each of the logic to completion, but sequentially as opposed to in parallel as it exists today. Might be worth making that a bit clearer with the naming/terminology. I will try to spend more time giving this a proper review, but that's an initial thought.

@ivakegg
Copy link
Collaborator Author

ivakegg commented Oct 12, 2023

changed sequentialExecution to shortCircuitExecution

@ivakegg ivakegg merged commit fd6aa20 into release/version3.41 Oct 12, 2023
ivakegg added a commit that referenced this pull request Oct 13, 2023
@ivakegg
re #2118: composite sequential execution mode (#2120)
5f36d45 
* re #2118: composite sequential / short circuit execution mode
* Added a short circuit execution mode
* Executes the logics in sequential order (logicName order)
* The first logic that returns results will disable the following logics
* Added some debugging in the RemoteHttpService to verify we are closing
hgklohr pushed a commit that referenced this pull request Oct 13, 2023
@ivakegg @hgklohr
re #2118: composite sequential execution mode (#2120)
d3b8187 
* re #2118: composite sequential / short circuit execution mode
* Added a short circuit execution mode
* Executes the logics in sequential order (logicName order)
* The first logic that returns results will disable the following logics
* Added some debugging in the RemoteHttpService to verify we are closing

Conflicts:
	web-services/common/src/main/java/datawave/webservice/common/remote/RemoteHttpService.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResults.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResultsIterator.java
	web-services/query/src/test/java/datawave/webservice/query/logic/composite/CompositeQueryLogicTest.java
hgklohr pushed a commit that referenced this pull request Oct 13, 2023
@ivakegg @hgklohr
re #2118: composite sequential execution mode (#2120)
2d36e19 
* re #2118: composite sequential / short circuit execution mode
* Added a short circuit execution mode
* Executes the logics in sequential order (logicName order)
* The first logic that returns results will disable the following logics
* Added some debugging in the RemoteHttpService to verify we are closing

Conflicts:
	web-services/common/src/main/java/datawave/webservice/common/remote/RemoteHttpService.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResults.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResultsIterator.java
	web-services/query/src/test/java/datawave/webservice/query/logic/composite/CompositeQueryLogicTest.java

Conflicts:
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResultsIterator.java
hgklohr pushed a commit that referenced this pull request Oct 13, 2023
@ivakegg @hgklohr
re #2118: composite sequential execution mode (#2120)
f0d0b5d 
* re #2118: composite sequential / short circuit execution mode
* Added a short circuit execution mode
* Executes the logics in sequential order (logicName order)
* The first logic that returns results will disable the following logics
* Added some debugging in the RemoteHttpService to verify we are closing

Conflicts:
	web-services/common/src/main/java/datawave/webservice/common/remote/RemoteHttpService.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResults.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResultsIterator.java
	web-services/query/src/test/java/datawave/webservice/query/logic/composite/CompositeQueryLogicTest.java

Conflicts:
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResultsIterator.java
hgklohr pushed a commit that referenced this pull request Oct 13, 2023
@ivakegg @hgklohr
re #2118: composite sequential execution mode (#2120)
c47320e 
* re #2118: composite sequential / short circuit execution mode
* Added a short circuit execution mode
* Executes the logics in sequential order (logicName order)
* The first logic that returns results will disable the following logics
* Added some debugging in the RemoteHttpService to verify we are closing

Conflicts:
	web-services/common/src/main/java/datawave/webservice/common/remote/RemoteHttpService.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResults.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResultsIterator.java
	web-services/query/src/test/java/datawave/webservice/query/logic/composite/CompositeQueryLogicTest.java

Conflicts:
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResultsIterator.java
hgklohr pushed a commit that referenced this pull request Oct 13, 2023
@ivakegg @hgklohr
re #2118: composite sequential execution mode (#2120)
0bc515b 
* re #2118: composite sequential / short circuit execution mode
* Added a short circuit execution mode
* Executes the logics in sequential order (logicName order)
* The first logic that returns results will disable the following logics
* Added some debugging in the RemoteHttpService to verify we are closing

Conflicts:
	web-services/common/src/main/java/datawave/webservice/common/remote/RemoteHttpService.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResults.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResultsIterator.java
	web-services/query/src/test/java/datawave/webservice/query/logic/composite/CompositeQueryLogicTest.java

Conflicts:
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResultsIterator.java
ivakegg added a commit that referenced this pull request Oct 20, 2023
@ivakegg
re #2118: composite sequential execution mode (#2120)
624c40c 
* re #2118: composite sequential / short circuit execution mode
* Added a short circuit execution mode
* Executes the logics in sequential order (logicName order)
* The first logic that returns results will disable the following logics
* Added some debugging in the RemoteHttpService to verify we are closing

Conflicts:
	web-services/common/src/main/java/datawave/webservice/common/remote/RemoteHttpService.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResults.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResultsIterator.java
	web-services/query/src/test/java/datawave/webservice/query/logic/composite/CompositeQueryLogicTest.java

Conflicts:
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogicResultsIterator.java
@ivakegg ivakegg deleted the compositeChain branch February 12, 2024 21:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@keith-ratcliffe keith-ratcliffe keith-ratcliffe approved these changes

@hgklohr hgklohr hgklohr approved these changes

Assignees
No one assigned
Labels
accepted accepted for merging into a specific branch Integration Tested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ivakegg @jwomeara @keith-ratcliffe @hgklohr