Skip to content
Snippets Groups Projects
Commit b7c26151 authored by Semyon Krestyaninov's avatar Semyon Krestyaninov :dog2:
Browse files

fix linter

parent d04b3223
Branches
No related tags found
No related merge requests found
...@@ -38,11 +38,17 @@ func ExecuteAll(ctx context.Context, exec Executor, inputs []string) ([]string, ...@@ -38,11 +38,17 @@ func ExecuteAll(ctx context.Context, exec Executor, inputs []string) ([]string,
} }
func Execute(ctx context.Context, w field.Walker, exec Executor) error { func Execute(ctx context.Context, w field.Walker, exec Executor) error {
_, _, err := w.Walk(ctx, nil, func(ctx context.Context, fld *field.Field, _ any) (res field.WalkFuncResult, err error) { _, _, err := w.Walk(ctx,
nil,
func(ctx context.Context, fld *field.Field, _ any) (field.WalkFuncResult, error) {
var (
result field.WalkFuncResult
err error
)
enabled, _ := fld.IsEnabled(ctx) enabled, _ := fld.IsEnabled(ctx)
if !enabled { if !enabled {
res.Stop = true result.Stop = true
return return result, err
} }
for _, op := range fld.Options { for _, op := range fld.Options {
...@@ -52,16 +58,19 @@ func Execute(ctx context.Context, w field.Walker, exec Executor) error { ...@@ -52,16 +58,19 @@ func Execute(ctx context.Context, w field.Walker, exec Executor) error {
} }
err = executable.Execute(ctx, exec, fld) err = executable.Execute(ctx, exec, fld)
if err != nil { if err != nil {
return return result, err
} }
} }
return return result, err
}, field.WalkSchema()) },
field.WalkSchema(),
)
return err return err
} }
//nolint:gochecknoinits // init нужен для регистрации опций
func init() { func init() {
field.RegisterOption(CollectionFilter{}) field.RegisterOption(CollectionFilter{})
field.RegisterOption(ItemFilter{}) field.RegisterOption(ItemFilter{})
......
...@@ -65,6 +65,7 @@ func (exec *TemplateExecutor) errorFunc(text string) (string, error) { ...@@ -65,6 +65,7 @@ func (exec *TemplateExecutor) errorFunc(text string) (string, error) {
return "", errors.New(text) return "", errors.New(text)
} }
//nolint:gochecknoglobals // Доступ к пулу необходим на глобальном уровне.
var bufferPool = &sync.Pool{ var bufferPool = &sync.Pool{
New: func() any { New: func() any {
return new(bytes.Buffer) return new(bytes.Buffer)
...@@ -72,11 +73,13 @@ var bufferPool = &sync.Pool{ ...@@ -72,11 +73,13 @@ var bufferPool = &sync.Pool{
} }
func getBuffer() *bytes.Buffer { func getBuffer() *bytes.Buffer {
return bufferPool.Get().(*bytes.Buffer) buf, _ := bufferPool.Get().(*bytes.Buffer)
return buf
} }
func releaseBuffer(buf *bytes.Buffer) { func releaseBuffer(buf *bytes.Buffer) {
if buf.Cap() > 1024 { const maxBufCap = 1024
if buf.Cap() > maxBufCap {
return return
} }
buf.Reset() buf.Reset()
......
...@@ -34,7 +34,6 @@ var ( ...@@ -34,7 +34,6 @@ var (
Modify = modify.Modify Modify = modify.Modify
Validate = validate.Validate Validate = validate.Validate
Evaluate = field.Evaluate Evaluate = field.Evaluate
Execute = executor.Execute
) )
func (s *Schema) Clone(reset bool) *Schema { func (s *Schema) Clone(reset bool) *Schema {
...@@ -274,7 +273,7 @@ func (s *Schema) Execute(ctx context.Context, exec executor.Executor) (*Schema, ...@@ -274,7 +273,7 @@ func (s *Schema) Execute(ctx context.Context, exec executor.Executor) (*Schema,
} }
var clone = s.Clone(false) var clone = s.Clone(false)
err := Execute(ctx, clone, exec) err := executor.Execute(ctx, clone, exec)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment