Skip to content

Commit

Permalink
Minor logic changes
Browse files Browse the repository at this point in the history 
Signed-off-by: sahil buddharaju <[email protected]>
  • Loading branch information
sahil buddharaju committed Aug 4, 2023
1 parent c78f9e4 commit 3361892
Showing 1 changed file with 31 additions and 24 deletions.
55 changes: 31 additions & 24 deletions server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ abstract class AbstractSearchAsyncAction<Result extends SearchPhaseResult> exten

private SearchRequestOperationsListener searchRequestOperationsListener;
private List<SearchRequestOperationsListener> searchListenersList;
Map<String, Runnable> searchPhaseStartTrackingMap = new HashMap<String, Runnable>();
Map<String, Runnable> searchPhaseEndTrackingMap = new HashMap<String, Runnable>();
Map<String, Runnable> searchPhaseFailureTrackingMap = new HashMap<String, Runnable>();
Map<String, Runnable> searchPhaseStartTrackingMap;
Map<String, Runnable> searchPhaseEndTrackingMap;
Map<String, Runnable> searchPhaseFailureTrackingMap;

AbstractSearchAsyncAction(
String name,
Expand Down Expand Up @@ -191,87 +191,94 @@ abstract class AbstractSearchAsyncAction<Result extends SearchPhaseResult> exten
}

private void instantiateStartMap() {
searchPhaseStartTrackingMap.put(
Map<String, Runnable> searchPhaseStartTrackingMapModifiable = new HashMap<String, Runnable>();
searchPhaseStartTrackingMapModifiable.put(
SearchPhaseName.DFS_PRE_QUERY.getName(),
() -> searchRequestOperationsListener.onDFSPreQueryPhaseStart(this)
);
searchPhaseStartTrackingMap.put(
searchPhaseStartTrackingMapModifiable.put(
SearchPhaseName.CAN_MATCH.getName(),
() -> searchRequestOperationsListener.onCanMatchPhaseStart(this)
);
searchPhaseStartTrackingMap.put(SearchPhaseName.DFS_QUERY.getName(), () -> searchRequestOperationsListener.onQueryPhaseStart(this));
searchPhaseStartTrackingMap.put(SearchPhaseName.QUERY.getName(), () -> searchRequestOperationsListener.onQueryPhaseStart(this));
searchPhaseStartTrackingMap.put(SearchPhaseName.FETCH.getName(), () -> searchRequestOperationsListener.onFetchPhaseStart(this));
searchPhaseStartTrackingMap.put(
searchPhaseStartTrackingMapModifiable.put(SearchPhaseName.DFS_QUERY.getName(), () -> searchRequestOperationsListener.onQueryPhaseStart(this));
searchPhaseStartTrackingMapModifiable.put(SearchPhaseName.QUERY.getName(), () -> searchRequestOperationsListener.onQueryPhaseStart(this));
searchPhaseStartTrackingMapModifiable.put(SearchPhaseName.FETCH.getName(), () -> searchRequestOperationsListener.onFetchPhaseStart(this));
searchPhaseStartTrackingMapModifiable.put(
SearchPhaseName.EXPAND.getName(),
() -> searchRequestOperationsListener.onExpandSearchPhaseStart(this)
);
searchPhaseStartTrackingMap = Collections.unmodifiableMap(searchPhaseStartTrackingMapModifiable);
}

private void instantiateEndMap() {
searchPhaseEndTrackingMap.put(
Map<String, Runnable> searchPhaseEndTrackingMapModifiable = new HashMap<String, Runnable>();
searchPhaseEndTrackingMapModifiable.put(
SearchPhaseName.DFS_PRE_QUERY.getName(),
() -> searchRequestOperationsListener.onDFSPreQueryPhaseEnd(
this,
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - this.getCurrentPhase().getStartTime())
)
);
searchPhaseEndTrackingMap.put(
searchPhaseEndTrackingMapModifiable.put(
SearchPhaseName.CAN_MATCH.getName(),
() -> searchRequestOperationsListener.onCanMatchPhaseEnd(
this,
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - this.getCurrentPhase().getStartTime())
)
);
searchPhaseEndTrackingMap.put(
searchPhaseEndTrackingMapModifiable.put(
SearchPhaseName.DFS_QUERY.getName(),
() -> searchRequestOperationsListener.onQueryPhaseEnd(
this,
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - this.getCurrentPhase().getStartTime())
)
);
searchPhaseEndTrackingMap.put(
searchPhaseEndTrackingMapModifiable.put(
SearchPhaseName.QUERY.getName(),
() -> searchRequestOperationsListener.onQueryPhaseEnd(
this,
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - this.getCurrentPhase().getStartTime())
)
);
searchPhaseEndTrackingMap.put(
searchPhaseEndTrackingMapModifiable.put(
SearchPhaseName.FETCH.getName(),
() -> searchRequestOperationsListener.onFetchPhaseEnd(
this,
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - this.getCurrentPhase().getStartTime())
)
);
searchPhaseEndTrackingMap.put(
searchPhaseEndTrackingMapModifiable.put(
SearchPhaseName.EXPAND.getName(),
() -> searchRequestOperationsListener.onExpandSearchPhaseEnd(
this,
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - this.getCurrentPhase().getStartTime())
)
);
searchPhaseEndTrackingMap = Collections.unmodifiableMap(searchPhaseEndTrackingMapModifiable);
}

private void instantiateFailMap() {
searchPhaseFailureTrackingMap.put(
Map<String, Runnable> searchPhaseFailureTrackingMapModifiable = new HashMap<String, Runnable>();
searchPhaseFailureTrackingMapModifiable.put(
SearchPhaseName.DFS_PRE_QUERY.getName(),
() -> searchRequestOperationsListener.onDFSPreQueryPhaseFailure(this)
);
searchPhaseFailureTrackingMap.put(
searchPhaseFailureTrackingMapModifiable.put(
SearchPhaseName.CAN_MATCH.getName(),
() -> searchRequestOperationsListener.onCanMatchPhaseFailure(this)
);
searchPhaseFailureTrackingMap.put(
searchPhaseFailureTrackingMapModifiable.put(
SearchPhaseName.DFS_QUERY.getName(),
() -> searchRequestOperationsListener.onQueryPhaseFailure(this)
);
searchPhaseFailureTrackingMap.put(SearchPhaseName.QUERY.getName(), () -> searchRequestOperationsListener.onQueryPhaseFailure(this));
searchPhaseFailureTrackingMap.put(SearchPhaseName.FETCH.getName(), () -> searchRequestOperationsListener.onFetchPhaseFailure(this));
searchPhaseFailureTrackingMap.put(
searchPhaseFailureTrackingMapModifiable.put(SearchPhaseName.QUERY.getName(), () -> searchRequestOperationsListener.onQueryPhaseFailure(this));
searchPhaseFailureTrackingMapModifiable.put(SearchPhaseName.FETCH.getName(), () -> searchRequestOperationsListener.onFetchPhaseFailure(this));
searchPhaseFailureTrackingMapModifiable.put(
SearchPhaseName.EXPAND.getName(),
() -> searchRequestOperationsListener.onExpandSearchPhaseFailure(this)
);
searchPhaseFailureTrackingMap = Collections.unmodifiableMap(searchPhaseFailureTrackingMapModifiable);

}

@Override
Expand Down Expand Up @@ -527,7 +534,7 @@ public final void executeNextPhase(SearchPhase currentPhase, SearchPhase nextPha
}

private void onPhaseEnd(SearchPhaseContext searchPhaseContext) {
if (searchRequestOperationsListener == null) {
if (searchRequestOperationsListener == null || searchListenersList.isEmpty()) {
return;
}
if (searchPhaseEndTrackingMap.containsKey(searchPhaseContext.getCurrentPhase().getName())) {
Expand All @@ -538,7 +545,7 @@ private void onPhaseEnd(SearchPhaseContext searchPhaseContext) {
private void onPhaseStart(SearchPhase phase, SearchPhaseContext searchPhaseContext) {
setCurrentPhase(phase);
phase.setStartTimeInNanos(System.nanoTime());
if (searchRequestOperationsListener == null) {
if (searchRequestOperationsListener == null || searchListenersList.isEmpty()) {
return;
}
if (searchPhaseStartTrackingMap.containsKey(searchPhaseContext.getCurrentPhase().getName())) {
Expand Down Expand Up @@ -796,7 +803,7 @@ public void sendSearchResponse(InternalSearchResponse internalSearchResponse, At

@Override
public final void onPhaseFailure(SearchPhase phase, String msg, Throwable cause) {
if (searchRequestOperationsListener != null) {
if (searchRequestOperationsListener != null || searchListenersList.isEmpty()) {
if (searchPhaseFailureTrackingMap.containsKey(this.getCurrentPhase().getName())) {
searchPhaseFailureTrackingMap.get(this.getCurrentPhase().getName()).run();
}
Expand Down

0 comments on commit 3361892

Please sign in to comment.