From 0109238ffa5a8a8e0fab44a40ccea8e657ed8400 Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Thu, 4 Dec 2025 17:29:46 +0300 Subject: [PATCH 1/2] try copyFromNode in processor.Spawn --- go.mod | 2 ++ go.sum | 4 ++-- pipeline/processor.go | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 01f77cf23..cd95e4909 100644 --- a/go.mod +++ b/go.mod @@ -160,3 +160,5 @@ require ( sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect ) + +replace github.com/ozontech/insane-json => github.com/HeadHunter483/insane-json v0.0.0-20251020115930-22ac733527f5 diff --git a/go.sum b/go.sum index feff277bf..0258d9211 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ClickHouse/ch-go v0.65.1 h1:SLuxmLl5Mjj44/XbINsK2HFvzqup0s6rwKLFH347ZhU= github.com/ClickHouse/ch-go v0.65.1/go.mod h1:bsodgURwmrkvkBe5jw1qnGDgyITsYErfONKAHn05nv4= +github.com/HeadHunter483/insane-json v0.0.0-20251020115930-22ac733527f5 h1:+H5kKZdH98PKdba2EqhS4fi214/s1oGG4kxxwCqb144= +github.com/HeadHunter483/insane-json v0.0.0-20251020115930-22ac733527f5/go.mod h1:xZLf3tVLOqaT13rn1sv4fYaZfupAXNL9naLz4QRoMfY= github.com/KimMachineGun/automemlimit v0.2.6 h1:tQFriVTcIteUkV5EgU9iz03eDY36T8JU5RAjP2r6Kt0= github.com/KimMachineGun/automemlimit v0.2.6/go.mod h1:pJhTW/nWJMj6SnWSU2TEKSlCaM+1N5Mej+IfS/5/Ol0= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= @@ -267,8 +269,6 @@ github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNiaglX6v2DM6FI0= github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/ozontech/insane-json v0.1.9 h1:JG5cEsmuSDwmU7KTJTHfTJ40XMgvtPdsUQbXdbPv+bY= -github.com/ozontech/insane-json v0.1.9/go.mod h1:xZLf3tVLOqaT13rn1sv4fYaZfupAXNL9naLz4QRoMfY= github.com/pascaldekloe/name v1.0.1 h1:9lnXOHeqeHHnWLbKfH6X98+4+ETVqFqxN09UXSjcMb0= github.com/pascaldekloe/name v1.0.1/go.mod h1:Z//MfYJnH4jVpQ9wkclwu2I2MkHmXTlT9wR5UZScttM= github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= diff --git a/pipeline/processor.go b/pipeline/processor.go index f0efbbe33..26102cfec 100644 --- a/pipeline/processor.go +++ b/pipeline/processor.go @@ -440,7 +440,7 @@ func (p *processor) Spawn(parent *Event, nodes []*insaneJSON.Node) { SourceName: parent.SourceName, } parent.children = append(parent.children, child) - child.Root.MutateToNode(node) + child.Root.CopyFromNode(child.Root, node) child.SetChildKind() child.action = nextActionIdx From 5f85ec005c024097bb59b95bf1ada3f1b02ec077 Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Tue, 23 Dec 2025 14:17:26 +0700 Subject: [PATCH 2/2] use ConvertToRoot in processor.Spawn --- go.mod | 2 +- go.sum | 4 ++-- pipeline/pipeline.go | 2 +- pipeline/processor.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index cd95e4909..e3ce1518a 100644 --- a/go.mod +++ b/go.mod @@ -161,4 +161,4 @@ require ( sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect ) -replace github.com/ozontech/insane-json => github.com/HeadHunter483/insane-json v0.0.0-20251020115930-22ac733527f5 +replace github.com/ozontech/insane-json => github.com/HeadHunter483/insane-json v0.0.0-20251226085615-89194e0cbc3a diff --git a/go.sum b/go.sum index 0258d9211..26069670c 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ClickHouse/ch-go v0.65.1 h1:SLuxmLl5Mjj44/XbINsK2HFvzqup0s6rwKLFH347ZhU= github.com/ClickHouse/ch-go v0.65.1/go.mod h1:bsodgURwmrkvkBe5jw1qnGDgyITsYErfONKAHn05nv4= -github.com/HeadHunter483/insane-json v0.0.0-20251020115930-22ac733527f5 h1:+H5kKZdH98PKdba2EqhS4fi214/s1oGG4kxxwCqb144= -github.com/HeadHunter483/insane-json v0.0.0-20251020115930-22ac733527f5/go.mod h1:xZLf3tVLOqaT13rn1sv4fYaZfupAXNL9naLz4QRoMfY= +github.com/HeadHunter483/insane-json v0.0.0-20251226085615-89194e0cbc3a h1:YJCkZEjkHeDg1VoC6MWj+ZlsYXUw8FkHl2FE0DpOVMU= +github.com/HeadHunter483/insane-json v0.0.0-20251226085615-89194e0cbc3a/go.mod h1:xZLf3tVLOqaT13rn1sv4fYaZfupAXNL9naLz4QRoMfY= github.com/KimMachineGun/automemlimit v0.2.6 h1:tQFriVTcIteUkV5EgU9iz03eDY36T8JU5RAjP2r6Kt0= github.com/KimMachineGun/automemlimit v0.2.6/go.mod h1:pJhTW/nWJMj6SnWSU2TEKSlCaM+1N5Mej+IfS/5/Ol0= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index 1bf909f9f..6b9d84d11 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -667,7 +667,7 @@ func (p *Pipeline) finalize(event *Event, notifyInput bool, backEvent bool) { } for i, e := range event.children { - insaneJSON.Release(e.Root) + e.Root = nil event.children[i] = nil } diff --git a/pipeline/processor.go b/pipeline/processor.go index 26102cfec..1bdcc1b19 100644 --- a/pipeline/processor.go +++ b/pipeline/processor.go @@ -436,11 +436,11 @@ func (p *processor) Spawn(parent *Event, nodes []*insaneJSON.Node) { // we can't reuse parent event (using insaneJSON.Root{Node: child} // because of nil decoder child := &Event{ - Root: insaneJSON.Spawn(), + Root: nil, SourceName: parent.SourceName, } parent.children = append(parent.children, child) - child.Root.CopyFromNode(child.Root, node) + child.Root = node.ConvertToRoot(parent.Root) child.SetChildKind() child.action = nextActionIdx