move transform/copy-bucket from 'mirror' package to 'xs'

* colocate with multi-obj copy/transform Signed-off-by: Alex Aizman <[email protected]>
NVIDIA · Dec 19, 2023 · d8c2155 · d8c2155
1 parent 824f63e
commit d8c2155
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/ais/tgttxn.go b/ais/tgttxn.go
@@ -26,7 +26,6 @@ import (
 	"github.com/NVIDIA/aistore/cmn/nlog"
 	"github.com/NVIDIA/aistore/ext/etl"
 	"github.com/NVIDIA/aistore/fs"
-	"github.com/NVIDIA/aistore/mirror"
 	"github.com/NVIDIA/aistore/nl"
 	"github.com/NVIDIA/aistore/reb"
 	"github.com/NVIDIA/aistore/xact"
@@ -607,7 +606,7 @@ func (t *target) _tcbBegin(c *txnServerCtx, msg *apc.TCBMsg, dp cluster.DP) (err
 
 	var (
 		xctn = rns.Entry.Get()
-		xtcb = xctn.(*mirror.XactTCB)
+		xtcb = xctn.(*xs.XactTCB)
 		txn  = newTxnTCB(c, xtcb)
 		nlps = []cluster.NLP{nlpFrom}
 	)

diff --git a/ais/txn.go b/ais/txn.go
@@ -20,7 +20,6 @@ import (
 	"github.com/NVIDIA/aistore/cmn/mono"
 	"github.com/NVIDIA/aistore/cmn/nlog"
 	"github.com/NVIDIA/aistore/hk"
-	"github.com/NVIDIA/aistore/mirror"
 	"github.com/NVIDIA/aistore/xact/xs"
 )
 
@@ -110,7 +109,7 @@ type (
 		txnBckBase
 	}
 	txnTCB struct {
-		xtcb *mirror.XactTCB
+		xtcb *xs.XactTCB
 		txnBckBase
 	}
 	txnTCObjs struct {
@@ -562,7 +561,7 @@ func newTxnRenameBucket(c *txnServerCtx, bckFrom, bckTo *meta.Bck) (txn *txnRena
 // txnTCB //
 ////////////
 
-func newTxnTCB(c *txnServerCtx, xtcb *mirror.XactTCB) (txn *txnTCB) {
+func newTxnTCB(c *txnServerCtx, xtcb *xs.XactTCB) (txn *txnTCB) {
 	txn = &txnTCB{xtcb: xtcb}
 	txn.init(xtcb.Args().BckFrom)
 	txn.fillFromCtx(c)

diff --git a/mirror/init.go b/mirror/init.go
@@ -5,13 +5,10 @@
 package mirror
 
 import (
-	"github.com/NVIDIA/aistore/api/apc"
 	"github.com/NVIDIA/aistore/xact/xreg"
 )
 
 func Init() {
-	xreg.RegBckXact(&tcbFactory{kind: apc.ActCopyBck})
-	xreg.RegBckXact(&tcbFactory{kind: apc.ActETLBck})
 	xreg.RegBckXact(&mncFactory{})
 	xreg.RegBckXact(&putFactory{})
 }
diff --git a/xact/xs/init.go b/xact/xs/init.go
@@ -27,6 +27,9 @@ func Xreg() {
 	xreg.RegBckXact(&proFactory{})
 	xreg.RegBckXact(&llcFactory{})
 
+	xreg.RegBckXact(&tcbFactory{kind: apc.ActCopyBck})
+	xreg.RegBckXact(&tcbFactory{kind: apc.ActETLBck})
+
 	xreg.RegBckXact(&tcoFactory{streamingF: streamingF{kind: apc.ActETLObjects}})
 	xreg.RegBckXact(&tcoFactory{streamingF: streamingF{kind: apc.ActCopyObjects}})
 	xreg.RegBckXact(&archFactory{streamingF: streamingF{kind: apc.ActArchive}})

diff --git a/mirror/tcb.go → xact/xs/tcb.go b/mirror/tcb.go → xact/xs/tcb.go
@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2018-2023, NVIDIA CORPORATION. All rights reserved.
  */
-package mirror
+package xs
 
 import (
 	"fmt"