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.

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

fix: support indexing more types #36401

Merged
merged 6 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 27 additions & 0 deletions .chloggen/index_more_types.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: pkg/ottl

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Allow indexing []int64, []float64, []bool, and []byte slices

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [29441]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: It should now be possible to index all slice types

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
20 changes: 20 additions & 0 deletions pkg/ottl/expression.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,26 @@ func (g exprGetter[K]) Get(ctx context.Context, tCtx K) (any, error) {
if err != nil {
return nil, err
}
case []bool:
result, err = getElementByIndex(r, k.Int)
if err != nil {
return nil, err
}
case []float64:
result, err = getElementByIndex(r, k.Int)
if err != nil {
return nil, err
}
case []int64:
result, err = getElementByIndex(r, k.Int)
if err != nil {
return nil, err
}
case []byte:
result, err = getElementByIndex(r, k.Int)
if err != nil {
return nil, err
}
default:
return nil, fmt.Errorf("type, %T, does not support int indexing", result)
}
Expand Down
120 changes: 120 additions & 0 deletions pkg/ottl/expression_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,46 @@ func basicSliceString() (ExprFunc[any], error) {
}, nil
}

func basicSliceBool() (ExprFunc[any], error) {
return func(_ context.Context, _ any) (any, error) {
return []any{
[]bool{
true,
},
}, nil
}, nil
}

func basicSliceInteger() (ExprFunc[any], error) {
return func(_ context.Context, _ any) (any, error) {
return []any{
[]int64{
1,
},
}, nil
}, nil
}

func basicSliceFloat() (ExprFunc[any], error) {
return func(_ context.Context, _ any) (any, error) {
return []any{
[]float64{
1,
},
}, nil
}, nil
}

func basicSliceByte() (ExprFunc[any], error) {
return func(_ context.Context, _ any) (any, error) {
return []any{
[]byte{
byte('p'),
},
}, nil
}, nil
}

func Test_newGetter(t *testing.T) {
tests := []struct {
name string
Expand Down Expand Up @@ -266,6 +306,82 @@ func Test_newGetter(t *testing.T) {
},
want: "pass",
},
{
name: "function call nested SliceBool",
val: value{
Literal: &mathExprLiteral{
Converter: &converter{
Function: "SliceBool",
Keys: []key{
{
Int: ottltest.Intp(0),
},
{
Int: ottltest.Intp(0),
},
},
},
},
},
want: true,
},
{
name: "function call nested SliceInteger",
val: value{
Literal: &mathExprLiteral{
Converter: &converter{
Function: "SliceInteger",
Keys: []key{
{
Int: ottltest.Intp(0),
},
{
Int: ottltest.Intp(0),
},
},
},
},
},
want: 1,
},
{
name: "function call nested SliceFloat",
val: value{
Literal: &mathExprLiteral{
Converter: &converter{
Function: "SliceFloat",
Keys: []key{
{
Int: ottltest.Intp(0),
},
{
Int: ottltest.Intp(0),
},
},
},
},
},
want: 1.0,
},
{
name: "function call nested SliceByte",
val: value{
Literal: &mathExprLiteral{
Converter: &converter{
Function: "SliceByte",
Keys: []key{
{
Int: ottltest.Intp(0),
},
{
Int: ottltest.Intp(0),
},
},
},
},
},
want: byte('p'),
},
{
name: "enum",
val: value{
Expand Down Expand Up @@ -562,6 +678,10 @@ func Test_newGetter(t *testing.T) {
createFactory("PSlice", &struct{}{}, pslice),
createFactory("Slice", &struct{}{}, basicSlice),
createFactory("SliceString", &struct{}{}, basicSliceString),
createFactory("SliceBool", &struct{}{}, basicSliceBool),
createFactory("SliceInteger", &struct{}{}, basicSliceInteger),
createFactory("SliceFloat", &struct{}{}, basicSliceFloat),
createFactory("SliceByte", &struct{}{}, basicSliceByte),
)

p, _ := NewParser[any](
Expand Down