Skip to content

Commit

Permalink
Fix after merge build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
vadimalekseev committed Aug 28, 2023
1 parent 15178c0 commit 18432e0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
8 changes: 4 additions & 4 deletions pipeline/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -352,16 +352,16 @@ func (p *processor) Propagate(event *Event) {
// Any attempts to ActionHold or ActionCollapse the event will be suppressed by timeout events.
func (p *processor) Spawn(parent *Event, nodes []*insaneJSON.Node) {
parent.SetChildParentKind()
nextActionIdx := parent.action.Load() + 1
nextActionIdx := parent.action + 1

for _, node := range nodes {
child := newEvent()
parent.children = append(parent.children, child)
child.Root.MutateToNode(node)
child.SetChildKind()
child.action.Store(nextActionIdx)
child.action = nextActionIdx

ok := p.doActions(child)
ok, _ := p.doActions(child)
if ok {
child.stage = eventStageOutput
p.output.Out(child)
Expand All @@ -378,7 +378,7 @@ func (p *processor) Spawn(parent *Event, nodes []*insaneJSON.Node) {
}

timeout := newTimeoutEvent(parent.stream)
timeout.action.Store(int64(i))
timeout.action = i
p.doActions(timeout)
}
}
Expand Down
2 changes: 0 additions & 2 deletions plugin/action/split/split.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"github.com/ozontech/file.d/cfg"
"github.com/ozontech/file.d/fd"
"github.com/ozontech/file.d/pipeline"
"github.com/ozontech/file.d/plugin"
insaneJSON "github.com/vitkovskii/insane-json"
"go.uber.org/zap"
)
Expand Down Expand Up @@ -38,7 +37,6 @@ type Plugin struct {
config *Config
logger *zap.Logger
pluginController pipeline.ActionPluginController
plugin.NoMetricsPlugin
}

// ! config-params
Expand Down
3 changes: 2 additions & 1 deletion plugin/output/clickhouse/clickhouse.go
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,8 @@ func (p *Plugin) out(workerData *pipeline.WorkerData, batch *pipeline.Batch) {
data := (*workerData).(data)
data.reset()

for _, event := range batch.Events {
for batch.Next() {
event := batch.Value()
for _, col := range data.cols {
node := event.Root.Dig(col.Name)

Expand Down

0 comments on commit 18432e0

Please sign in to comment.