From 9315d5a93bd1d8f60dced60a030e7fdf3416d3ac Mon Sep 17 00:00:00 2001
From: Sydonian <794346190@qq.com>
Date: Thu, 19 Sep 2024 14:56:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agent/internal/task/storage_load_package.go        | 3 ++-
 common/pkgs/downloader/iterator.go                 | 3 ++-
 common/pkgs/downloader/lrc_strip_iterator.go       | 3 ++-
 common/pkgs/downloader/strip_iterator.go           | 3 ++-
 common/pkgs/ioswitch2/parser/parser.go             | 8 ++++----
 scanner/internal/event/check_package_redundancy.go | 6 ++++--
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/agent/internal/task/storage_load_package.go b/agent/internal/task/storage_load_package.go
index be68aa6..0aff1fa 100644
--- a/agent/internal/task/storage_load_package.go
+++ b/agent/internal/task/storage_load_package.go
@@ -334,7 +334,8 @@ func (t *StorageLoadPackage) getMinReadingObjectSolution(sortedNodes []*download
 	for _, n := range sortedNodes {
 		if n.ObjectPinned && float64(k)*n.Distance < dist {
 			dist = float64(k) * n.Distance
-			downloadNode = &n.Node
+			node := n.Node
+			downloadNode = &node
 		}
 	}
 
diff --git a/common/pkgs/downloader/iterator.go b/common/pkgs/downloader/iterator.go
index b6bc1f5..454be3e 100644
--- a/common/pkgs/downloader/iterator.go
+++ b/common/pkgs/downloader/iterator.go
@@ -349,7 +349,8 @@ func (iter *DownloadObjectIterator) getMinReadingObjectSolution(sortedNodes []*D
 	for _, n := range sortedNodes {
 		if n.ObjectPinned && float64(k)*n.Distance < dist {
 			dist = float64(k) * n.Distance
-			downloadNode = &n.Node
+			node := n.Node
+			downloadNode = &node
 		}
 	}
 
diff --git a/common/pkgs/downloader/lrc_strip_iterator.go b/common/pkgs/downloader/lrc_strip_iterator.go
index 1309014..94a00ac 100644
--- a/common/pkgs/downloader/lrc_strip_iterator.go
+++ b/common/pkgs/downloader/lrc_strip_iterator.go
@@ -95,7 +95,8 @@ func (s *LRCStripIterator) Close() {
 func (s *LRCStripIterator) downloading() {
 	var froms []ioswitchlrc.From
 	for _, b := range s.blocks {
-		froms = append(froms, ioswitchlrc.NewFromNode(b.Block.FileHash, &b.Node, b.Block.Index))
+		node := b.Node
+		froms = append(froms, ioswitchlrc.NewFromNode(b.Block.FileHash, &node, b.Block.Index))
 	}
 
 	toExec, hd := ioswitchlrc.NewToDriverWithRange(-1, exec.Range{
diff --git a/common/pkgs/downloader/strip_iterator.go b/common/pkgs/downloader/strip_iterator.go
index 358449a..82a2771 100644
--- a/common/pkgs/downloader/strip_iterator.go
+++ b/common/pkgs/downloader/strip_iterator.go
@@ -112,7 +112,8 @@ func (s *StripIterator) Close() {
 func (s *StripIterator) downloading() {
 	ft := ioswitch2.NewFromTo()
 	for _, b := range s.blocks {
-		ft.AddFrom(ioswitch2.NewFromNode(b.Block.FileHash, &b.Node, b.Block.Index))
+		node := b.Node
+		ft.AddFrom(ioswitch2.NewFromNode(b.Block.FileHash, &node, b.Block.Index))
 	}
 
 	toExec, hd := ioswitch2.NewToDriverWithRange(-1, exec.Range{
diff --git a/common/pkgs/ioswitch2/parser/parser.go b/common/pkgs/ioswitch2/parser/parser.go
index 21870c2..ab5af49 100644
--- a/common/pkgs/ioswitch2/parser/parser.go
+++ b/common/pkgs/ioswitch2/parser/parser.go
@@ -559,13 +559,13 @@ func (p *DefaultParser) generateClone(ctx *ParseContext) {
 				continue
 			}
 
-			t := ctx.DAG.NewCloneStream()
-			*t.Env() = *node.Env()
+			c := ctx.DAG.NewCloneStream()
+			*c.Env() = *node.Env()
 			for _, to := range out.To().RawArray() {
-				t.NewOutput().Connect(to.Node, to.SlotIndex)
+				c.NewOutput().Connect(to.Node, to.SlotIndex)
 			}
 			out.To().Resize(0)
-			t.SetInput(out)
+			c.SetInput(out)
 		}
 
 		for _, out := range node.OutputValues().RawArray() {
diff --git a/scanner/internal/event/check_package_redundancy.go b/scanner/internal/event/check_package_redundancy.go
index 84cf5c7..7b2333f 100644
--- a/scanner/internal/event/check_package_redundancy.go
+++ b/scanner/internal/event/check_package_redundancy.go
@@ -717,7 +717,8 @@ func (t *CheckPackageRedundancy) ecToEC(obj stgmod.ObjectDetail, srcRed *cdssdk.
 
 		ft := ioswitch2.NewFromTo()
 		for _, block := range chosenBlocks {
-			ft.AddFrom(ioswitch2.NewFromNode(block.FileHash, &node.Node, block.Index))
+			node := node.Node
+			ft.AddFrom(ioswitch2.NewFromNode(block.FileHash, &node, block.Index))
 		}
 
 		// 输出只需要自己要保存的那一块
@@ -907,7 +908,8 @@ func (t *CheckPackageRedundancy) reconstructLRC(obj stgmod.ObjectDetail, grpBloc
 
 		for _, block := range chosenBlocks {
 			fmt.Printf("b: %v\n", block.Index)
-			froms = append(froms, ioswitchlrc.NewFromNode(block.FileHash, &node.Node, block.Index))
+			node := node.Node
+			froms = append(froms, ioswitchlrc.NewFromNode(block.FileHash, &node, block.Index))
 		}
 
 		// 输出只需要自己要保存的那一块