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.

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

[pkg/telemetryquerylanguage] Create reusable StandardGetSetter #12597

Merged
merged 3 commits into from
Jul 26, 2022
Merged

[pkg/telemetryquerylanguage] Create reusable StandardGetSetter #12597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a52d527
Create reusable StandardGetSetter
TylerHelmuth Jul 19, 2022
a8c1b64
Add Code Ownership section.
TylerHelmuth Jul 19, 2022
8f4488a
revert Code Ownership section.
TylerHelmuth Jul 19, 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
35 changes: 24 additions & 11 deletions pkg/telemetryquerylanguage/tql/expression.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,25 @@ type GetSetter interface {
Setter
}

type literal struct {
value interface{}
type StandardGetSetter struct {
Getter func(ctx TransformContext) interface{}
Setter func(ctx TransformContext, val interface{})
}

func (l literal) Get(ctx TransformContext) interface{} {
return l.value
func (path StandardGetSetter) Get(ctx TransformContext) interface{} {
return path.Getter(ctx)
}

func (path StandardGetSetter) Set(ctx TransformContext, val interface{}) {
path.Setter(ctx, val)
}

type Literal struct {
Value interface{}
}

func (l Literal) Get(ctx TransformContext) interface{} {
return l.Value
}

type exprGetter struct {
Expand All @@ -61,31 +74,31 @@ func (g exprGetter) Get(ctx TransformContext) interface{} {

func NewGetter(val Value, functions map[string]interface{}, pathParser PathExpressionParser, enumParser EnumParser) (Getter, error) {
if val.IsNil != nil && *val.IsNil {
return &literal{value: nil}, nil
return &Literal{Value: nil}, nil
}

if s := val.String; s != nil {
return &literal{value: *s}, nil
return &Literal{Value: *s}, nil
}
if f := val.Float; f != nil {
return &literal{value: *f}, nil
return &Literal{Value: *f}, nil
}
if i := val.Int; i != nil {
return &literal{value: *i}, nil
return &Literal{Value: *i}, nil
}
if b := val.Bool; b != nil {
return &literal{value: bool(*b)}, nil
return &Literal{Value: bool(*b)}, nil
}
if b := val.Bytes; b != nil {
return &literal{value: ([]byte)(*b)}, nil
return &Literal{Value: ([]byte)(*b)}, nil
}

if val.Enum != nil {
enum, err := enumParser(val.Enum)
if err != nil {
return nil, err
}
return &literal{value: int64(*enum)}, nil
return &Literal{Value: int64(*enum)}, nil
}

if val.Path != nil {
Expand Down
16 changes: 8 additions & 8 deletions processor/transformprocessor/internal/common/func_delete_key_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ func Test_deleteKey(t *testing.T) {
input.InsertInt("test2", 3)
input.InsertBool("test3", true)

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
}
Expand Down Expand Up @@ -100,11 +100,11 @@ func Test_deleteKey_bad_input(t *testing.T) {
Item: input,
}

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
setter: func(ctx tql.TransformContext, val interface{}) {
Setter: func(ctx tql.TransformContext, val interface{}) {
t.Errorf("nothing should be set in this scenario")
},
}
Expand All @@ -122,11 +122,11 @@ func Test_deleteKey_get_nil(t *testing.T) {
Item: nil,
}

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
setter: func(ctx tql.TransformContext, val interface{}) {
Setter: func(ctx tql.TransformContext, val interface{}) {
t.Errorf("nothing should be set in this scenario")
},
}
Expand Down
16 changes: 8 additions & 8 deletions processor/transformprocessor/internal/common/func_delete_matching_keys_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ func Test_deleteMatchingKeys(t *testing.T) {
input.InsertInt("test2", 3)
input.InsertBool("test3", true)

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
}
Expand Down Expand Up @@ -98,8 +98,8 @@ func Test_deleteMatchingKeys_bad_input(t *testing.T) {
Item: input,
}

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
}
Expand All @@ -116,8 +116,8 @@ func Test_deleteMatchingKeys_get_nil(t *testing.T) {
Item: nil,
}

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
}
Expand All @@ -127,8 +127,8 @@ func Test_deleteMatchingKeys_get_nil(t *testing.T) {
}

func Test_deleteMatchingKeys_invalid_pattern(t *testing.T) {
target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
t.Errorf("nothing should be received in this scenario")
return nil
},
Expand Down
24 changes: 12 additions & 12 deletions processor/transformprocessor/internal/common/func_is_match_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ func Test_isMatch(t *testing.T) {
}{
{
name: "replace match true",
target: &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target: &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return "hello world"
},
},
Expand All @@ -42,8 +42,8 @@ func Test_isMatch(t *testing.T) {
},
{
name: "replace match false",
target: &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target: &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return "goodbye world"
},
},
Expand All @@ -52,8 +52,8 @@ func Test_isMatch(t *testing.T) {
},
{
name: "replace match complex",
target: &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target: &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return "-12.001"
},
},
Expand All @@ -62,8 +62,8 @@ func Test_isMatch(t *testing.T) {
},
{
name: "target not a string",
target: &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target: &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return 1
},
},
Expand All @@ -72,8 +72,8 @@ func Test_isMatch(t *testing.T) {
},
{
name: "target nil",
target: &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target: &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return nil
},
},
Expand All @@ -94,8 +94,8 @@ func Test_isMatch(t *testing.T) {
}

func Test_isMatch_validation(t *testing.T) {
target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return "anything"
},
}
Expand Down
18 changes: 9 additions & 9 deletions processor/transformprocessor/internal/common/func_keep_keys_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ func Test_keepKeys(t *testing.T) {
input.InsertInt("test2", 3)
input.InsertBool("test3", true)

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
setter: func(ctx tql.TransformContext, val interface{}) {
Setter: func(ctx tql.TransformContext, val interface{}) {
ctx.GetItem().(pcommon.Map).Clear()
val.(pcommon.Map).CopyTo(ctx.GetItem().(pcommon.Map))
},
Expand Down Expand Up @@ -116,11 +116,11 @@ func Test_keepKeys_bad_input(t *testing.T) {
Item: input,
}

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
setter: func(ctx tql.TransformContext, val interface{}) {
Setter: func(ctx tql.TransformContext, val interface{}) {
t.Errorf("nothing should be set in this scenario")
},
}
Expand All @@ -138,11 +138,11 @@ func Test_keepKeys_get_nil(t *testing.T) {
Item: nil,
}

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
setter: func(ctx tql.TransformContext, val interface{}) {
Setter: func(ctx tql.TransformContext, val interface{}) {
t.Errorf("nothing should be set in this scenario")
},
}
Expand Down
20 changes: 10 additions & 10 deletions processor/transformprocessor/internal/common/func_limit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ func Test_limit(t *testing.T) {
input.InsertInt("test2", 3)
input.InsertBool("test3", true)

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
setter: func(ctx tql.TransformContext, val interface{}) {
Setter: func(ctx tql.TransformContext, val interface{}) {
ctx.GetItem().(pcommon.Map).Clear()
val.(pcommon.Map).CopyTo(ctx.GetItem().(pcommon.Map))
},
Expand Down Expand Up @@ -114,7 +114,7 @@ func Test_limit_validation(t *testing.T) {
}{
{
name: "limit less than zero",
target: &testGetSetter{},
target: &tql.StandardGetSetter{},
limit: int64(-1),
},
}
Expand All @@ -132,11 +132,11 @@ func Test_limit_bad_input(t *testing.T) {
Item: input,
}

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
setter: func(ctx tql.TransformContext, val interface{}) {
Setter: func(ctx tql.TransformContext, val interface{}) {
t.Errorf("nothing should be set in this scenario")
},
}
Expand All @@ -152,11 +152,11 @@ func Test_limit_get_nil(t *testing.T) {
Item: nil,
}

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
setter: func(ctx tql.TransformContext, val interface{}) {
Setter: func(ctx tql.TransformContext, val interface{}) {
t.Errorf("nothing should be set in this scenario")
},
}
Expand Down
18 changes: 9 additions & 9 deletions processor/transformprocessor/internal/common/func_replace_all_matches_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ func Test_replaceAllMatches(t *testing.T) {
input.InsertString("test2", "hello")
input.InsertString("test3", "goodbye")

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
setter: func(ctx tql.TransformContext, val interface{}) {
Setter: func(ctx tql.TransformContext, val interface{}) {
ctx.GetItem().(pcommon.Map).Clear()
val.(pcommon.Map).CopyTo(ctx.GetItem().(pcommon.Map))
},
Expand Down Expand Up @@ -98,11 +98,11 @@ func Test_replaceAllMatches_bad_input(t *testing.T) {
Item: input,
}

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
setter: func(ctx tql.TransformContext, val interface{}) {
Setter: func(ctx tql.TransformContext, val interface{}) {
t.Errorf("nothing should be set in this scenario")
},
}
Expand All @@ -118,11 +118,11 @@ func Test_replaceAllMatches_get_nil(t *testing.T) {
Item: nil,
}

target := &testGetSetter{
getter: func(ctx tql.TransformContext) interface{} {
target := &tql.StandardGetSetter{
Getter: func(ctx tql.TransformContext) interface{} {
return ctx.GetItem()
},
setter: func(ctx tql.TransformContext, val interface{}) {
Setter: func(ctx tql.TransformContext, val interface{}) {
t.Errorf("nothing should be set in this scenario")
},
}
Expand Down
Loading