mirror of
https://github.com/hanzoai/tasks.git
synced 2026-11-03 03:56:04 +00:00
Hazel KimandGitHub
cc6b91fe98
## What changed? <!-- Describe what has changed in this PR --> - ElasticSearch query converter now uses term query if the search attribute is of type KEYWORD or KEYWORD_LIST - otherwise, it uses match query to support type TEXT matching in custom search attribute - added `searchattribute.NameTypeMap` in `comparisonExprConverter` to support this ## Why? <!-- Tell your future self why have you made these changes --> - Improvement in performance: term query is generally faster than match query ## How did you test it? <!-- How have you verified this change? Tested locally? Added a unit test? Checked in staging env? --> - modified converter and elasticsearch unit tests accordingly to use term query ## Potential risks <!-- Assuming the worst case, what can be broken when deploying this change to production? --> ## Documentation <!-- Have you made sure this change doesn't falsify anything currently stated in `docs/`? If significant new behavior is added, have you described that in `docs/`? --> ## Is hotfix candidate? <!-- Is this PR a hotfix candidate or does it require a notification to be sent to the broader community? (Yes/No) -->
76 lines
2.7 KiB
Go
76 lines
2.7 KiB
Go
// The MIT License
|
|
//
|
|
// Copyright (c) 2020 Temporal Technologies Inc. All rights reserved.
|
|
//
|
|
// Copyright (c) 2020 Uber Technologies, Inc.
|
|
//
|
|
// Copyright (c) 2017 Xargin
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
// of this software and associated documentation files (the "Software"), to deal
|
|
// in the Software without restriction, including without limitation the rights
|
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
// copies of the Software, and to permit persons to whom the Software is
|
|
// furnished to do so, subject to the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included in
|
|
// all copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
// THE SOFTWARE.
|
|
|
|
package elasticsearch
|
|
|
|
import (
|
|
"github.com/temporalio/sqlparser"
|
|
|
|
"go.temporal.io/server/common/persistence/visibility/store/query"
|
|
"go.temporal.io/server/common/searchattribute"
|
|
)
|
|
|
|
var allowedComparisonOperators = map[string]struct{}{
|
|
sqlparser.EqualStr: {},
|
|
sqlparser.NotEqualStr: {},
|
|
sqlparser.GreaterThanStr: {},
|
|
sqlparser.GreaterEqualStr: {},
|
|
sqlparser.LessThanStr: {},
|
|
sqlparser.LessEqualStr: {},
|
|
sqlparser.InStr: {},
|
|
sqlparser.NotInStr: {},
|
|
sqlparser.StartsWithStr: {},
|
|
sqlparser.NotStartsWithStr: {},
|
|
}
|
|
|
|
func NewQueryConverter(
|
|
fnInterceptor query.FieldNameInterceptor,
|
|
fvInterceptor query.FieldValuesInterceptor,
|
|
saNameType searchattribute.NameTypeMap,
|
|
) *query.Converter {
|
|
if fnInterceptor == nil {
|
|
fnInterceptor = &query.NopFieldNameInterceptor{}
|
|
}
|
|
|
|
if fvInterceptor == nil {
|
|
fvInterceptor = &query.NopFieldValuesInterceptor{}
|
|
}
|
|
|
|
rangeCond := query.NewRangeCondConverter(fnInterceptor, fvInterceptor, true)
|
|
comparisonExpr := query.NewComparisonExprConverter(fnInterceptor, fvInterceptor, allowedComparisonOperators, saNameType)
|
|
is := query.NewIsConverter(fnInterceptor)
|
|
|
|
whereConverter := &query.WhereConverter{
|
|
RangeCond: rangeCond,
|
|
ComparisonExpr: comparisonExpr,
|
|
Is: is,
|
|
}
|
|
whereConverter.And = query.NewAndConverter(whereConverter)
|
|
whereConverter.Or = query.NewOrConverter(whereConverter)
|
|
|
|
return query.NewConverter(fnInterceptor, whereConverter)
|
|
}
|