Skip to content

fix range query use old dsl isses #1627

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

Open
wants to merge 2 commits into
base: release-branch.v7
Choose a base branch
from
Open

fix range query use old dsl isses #1627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aabf258
use range query new dsl
ryou-z-20230331 Jun 27, 2022
f33f725
fix bug
ryou-z-20230331 Jun 27, 2022
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
15 changes: 11 additions & 4 deletions search_queries_range.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,17 @@ func (q *RangeQuery) Source() (interface{}, error) {
params := make(map[string]interface{})
rangeQ[q.name] = params

params["from"] = q.from
params["to"] = q.to
if q.includeLower {
params["gte"] = q.from
} else {
params["gt"] = q.from
}

if q.includeUpper {
params["lte"] = q.to
} else {
params["lt"] = q.to
}
if q.timeZone != "" {
params["time_zone"] = q.timeZone
}
Expand All @@ -144,8 +153,6 @@ func (q *RangeQuery) Source() (interface{}, error) {
if q.boost != nil {
params["boost"] = *q.boost
}
params["include_lower"] = q.includeLower
params["include_upper"] = q.includeUpper

if q.queryName != "" {
rangeQ["_name"] = q.queryName
Expand Down
2 changes: 1 addition & 1 deletion search_queries_script_score.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type ScriptScoreQuery struct {
// NewScriptScoreQuery creates and initializes a new script_score query.
func NewScriptScoreQuery(query Query, script *Script) *ScriptScoreQuery {
return &ScriptScoreQuery{
query: query,
query: query,
script: script,
}
}
Expand Down
2 changes: 1 addition & 1 deletion xpack_security_get_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ type XPackSecurityRole struct {
type XPackSecurityApplicationPrivileges struct {
Application string `json:"application"`
Privileges []string `json:"privileges"`
Resources []string `json:"resources"`
Resources []string `json:"resources"`
}

// XPackSecurityIndicesPermissions is the indices permission object
Expand Down