Search worker unification - removing duplicated ones #141
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
pdelewski
force-pushed
the
unify-searchworker-2
branch
9 times, most recently
from
a5992af to
f7ff7ad
Compare
pdelewski
force-pushed
the
unify-searchworker-2
branch
from
006a631 to
1dae47e
Compare
pdelewski
changed the title
pdelewski
commented
May 17, 2024
| @@ -232,28 +232,40 @@ func (q *QueryRunner) handleSearchCommon(ctx context.Context, indexPattern strin | |||
| } | |||
| oldHandlingUsed = true | |||
| fullQuery, columns := q.makeBasicQuery(ctx, queryTranslator, table, simpleQuery, queryInfo, highlighter) | |||
| var columnsSlice [][]string | |||
| if optAsync != nil { | |||
There was a problem hiding this comment.
This branch and the one that starts in line 258 will be combined next time
pdelewski
changed the title
jakozaur
reviewed
May 17, 2024
quesma/quesma/search.go
Outdated
| optAsync.doneCh <- AsyncSearchWithError{translatedQueryBody: translatedQueryBody, err: err} | ||
| return | ||
| } | ||
| optAsync.doneCh <- AsyncSearchWithError{response: searchResponse, translatedQueryBody: translatedQueryBody, err: nil} |
There was a problem hiding this comment.
I would omit empty nil struct fields as we do above.
Suggested change
| optAsync.doneCh <- AsyncSearchWithError{response: searchResponse, translatedQueryBody: translatedQueryBody, err: nil} | |
| optAsync.doneCh <- AsyncSearchWithError{response: searchResponse, translatedQueryBody: translatedQueryBody} |
quesma/quesma/search.go
Outdated
| q.searchAggregationWorker(ctx, aggregations, columns, queryTranslator, table, optAsync) | ||
| translatedQueryBody, aggregationResults = q.searchWorker(ctx, aggregations, columns, table, true, optAsync) | ||
| searchResponse := queryTranslator.MakeResponseAggregation(aggregations, aggregationResults) | ||
| optAsync.doneCh <- AsyncSearchWithError{response: searchResponse, translatedQueryBody: translatedQueryBody, err: nil} |
There was a problem hiding this comment.
As above:
Suggested change
| optAsync.doneCh <- AsyncSearchWithError{response: searchResponse, translatedQueryBody: translatedQueryBody, err: nil} | |
| optAsync.doneCh <- AsyncSearchWithError{response: searchResponse, translatedQueryBody: translatedQueryBody} |
| } | ||
| rows, err := q.logManager.ProcessQuery(dbQueryCtx, table, &agg, nil) | ||
| rows, err := q.logManager.ProcessQuery(dbQueryCtx, table, &query, columns[columnsIndex]) | ||
| if err != nil { | ||
| logger.ErrorWithCtx(ctx).Msg(err.Error()) | ||
| continue |
There was a problem hiding this comment.
I'm not sure why here we are not incrementing columnsIndex. Looks like a bug.
quesma/quesma/search.go
Outdated
| if agg.NoDBQuery { | ||
| logger.InfoWithCtx(ctx).Msgf("pipeline query: %+v", agg) | ||
| columnsIndex := 0 | ||
| for _, query := range queries { |
There was a problem hiding this comment.
I believe this fixes a bug and also you can simplify code:
Suggested change
| for _, query := range queries { | |
| for columnsIndex, query := range queries { |
| hits = append(hits, postprocessedRows) | ||
| } else { | ||
| hits = append(hits, rows) | ||
| } |
There was a problem hiding this comment.
Woulnd't it be simpler if we:
if doPostProcessing {
rows = query.Type.PostprocessResults(rows)
}
hits = append(hits, rows)
jakozaur
approved these changes
May 17, 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.
This PR combines
searchAggregationWorkerwithsearchWorkerandsearchAggregationWorkerCommonwithsearchWorkerCommon