diff --git a/cdn/supervisor/task/manager_util.go b/cdn/supervisor/task/manager_util.go index f8bdf86e9bc..02494eb0e80 100644 --- a/cdn/supervisor/task/manager_util.go +++ b/cdn/supervisor/task/manager_util.go @@ -29,7 +29,7 @@ import ( cdnerrors "d7y.io/dragonfly/v2/cdn/errors" "d7y.io/dragonfly/v2/cdn/types" logger "d7y.io/dragonfly/v2/internal/dflog" - "d7y.io/dragonfly/v2/internal/dfutils" + "d7y.io/dragonfly/v2/internal/util" "d7y.io/dragonfly/v2/pkg/source" "d7y.io/dragonfly/v2/pkg/synclock" "d7y.io/dragonfly/v2/pkg/util/net/urlutils" @@ -118,7 +118,7 @@ func (tm *Manager) addOrUpdateTask(ctx context.Context, request *types.TaskRegis // calculate piece size and update the PieceSize and PieceTotal if task.PieceSize <= 0 { - pieceSize := dfutils.ComputePieceSize(task.SourceFileLength) + pieceSize := util.ComputePieceSize(task.SourceFileLength) task.PieceSize = int32(pieceSize) } if err := tm.taskStore.Add(task.TaskID, task); err != nil { diff --git a/client/config/flags.go b/client/config/flags.go index f0978394652..d8718fc9426 100644 --- a/client/config/flags.go +++ b/client/config/flags.go @@ -27,7 +27,7 @@ import ( "golang.org/x/time/rate" "d7y.io/dragonfly/v2/client/clientutil" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" + "d7y.io/dragonfly/v2/internal/dfnet" ) // SchedulersValue implements the pflag.Value interface. diff --git a/client/config/peerhost.go b/client/config/peerhost.go index 13143a5ba2c..28d82a94fd0 100644 --- a/client/config/peerhost.go +++ b/client/config/peerhost.go @@ -35,7 +35,7 @@ import ( "d7y.io/dragonfly/v2/client/clientutil" "d7y.io/dragonfly/v2/cmd/dependency/base" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/pkg/unit" "d7y.io/dragonfly/v2/pkg/util/net/iputils" "d7y.io/dragonfly/v2/pkg/util/stringutils" diff --git a/client/config/peerhost_darwin.go b/client/config/peerhost_darwin.go index f6f357b5ce3..ef305f78a70 100644 --- a/client/config/peerhost_darwin.go +++ b/client/config/peerhost_darwin.go @@ -25,8 +25,8 @@ import ( "golang.org/x/time/rate" "d7y.io/dragonfly/v2/client/clientutil" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/pkg/basic" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" "d7y.io/dragonfly/v2/pkg/util/hostutils" "d7y.io/dragonfly/v2/pkg/util/net/iputils" ) diff --git a/client/config/peerhost_linux.go b/client/config/peerhost_linux.go index d735dc7b745..ff80a5994e9 100644 --- a/client/config/peerhost_linux.go +++ b/client/config/peerhost_linux.go @@ -25,8 +25,8 @@ import ( "golang.org/x/time/rate" "d7y.io/dragonfly/v2/client/clientutil" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/pkg/basic" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" "d7y.io/dragonfly/v2/pkg/util/hostutils" "d7y.io/dragonfly/v2/pkg/util/net/iputils" ) diff --git a/client/config/peerhost_test.go b/client/config/peerhost_test.go index a372a718e21..67e1931f81e 100644 --- a/client/config/peerhost_test.go +++ b/client/config/peerhost_test.go @@ -26,7 +26,7 @@ import ( "gopkg.in/yaml.v3" "d7y.io/dragonfly/v2/client/clientutil" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/pkg/unit" ) diff --git a/client/daemon/daemon.go b/client/daemon/daemon.go index d3d7f50e1ae..4cede778386 100644 --- a/client/daemon/daemon.go +++ b/client/daemon/daemon.go @@ -46,9 +46,9 @@ import ( "d7y.io/dragonfly/v2/client/daemon/storage" "d7y.io/dragonfly/v2/client/daemon/upload" logger "d7y.io/dragonfly/v2/internal/dflog" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/internal/dfpath" "d7y.io/dragonfly/v2/internal/idgen" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" "d7y.io/dragonfly/v2/pkg/reachable" "d7y.io/dragonfly/v2/pkg/rpc" "d7y.io/dragonfly/v2/pkg/rpc/manager" diff --git a/client/daemon/daemon_test.go b/client/daemon/daemon_test.go index 10fa279fc25..5961ce377bd 100644 --- a/client/daemon/daemon_test.go +++ b/client/daemon/daemon_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/pkg/rpc/manager" ) diff --git a/client/daemon/peer/peertask_dummy.go b/client/daemon/peer/peertask_dummy.go index 619d32a89f5..56e26bbbb34 100644 --- a/client/daemon/peer/peertask_dummy.go +++ b/client/daemon/peer/peertask_dummy.go @@ -22,7 +22,7 @@ import ( "google.golang.org/grpc" "d7y.io/dragonfly/v2/internal/dferrors" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/pkg/rpc/base" "d7y.io/dragonfly/v2/pkg/rpc/scheduler" schedulerclient "d7y.io/dragonfly/v2/pkg/rpc/scheduler/client" diff --git a/client/daemon/peer/peertask_file_test.go b/client/daemon/peer/peertask_file_test.go index 893a6e0739b..1794b31b15e 100644 --- a/client/daemon/peer/peertask_file_test.go +++ b/client/daemon/peer/peertask_file_test.go @@ -32,7 +32,7 @@ import ( "d7y.io/dragonfly/v2/client/clientutil" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/test" - "d7y.io/dragonfly/v2/internal/dfutils" + "d7y.io/dragonfly/v2/internal/util" "d7y.io/dragonfly/v2/pkg/rpc/base" "d7y.io/dragonfly/v2/pkg/rpc/scheduler" "d7y.io/dragonfly/v2/pkg/source" @@ -101,7 +101,7 @@ func TestFilePeerTask_BackSource_WithContentLength(t *testing.T) { pieceManager: &pieceManager{ storageManager: storageManager, pieceDownloader: downloader, - computePieceSize: dfutils.ComputePieceSize, + computePieceSize: util.ComputePieceSize, }, storageManager: storageManager, schedulerClient: schedulerClient, @@ -219,7 +219,7 @@ func TestFilePeerTask_BackSource_WithoutContentLength(t *testing.T) { pieceManager: &pieceManager{ storageManager: storageManager, pieceDownloader: downloader, - computePieceSize: dfutils.ComputePieceSize, + computePieceSize: util.ComputePieceSize, }, storageManager: storageManager, schedulerClient: schedulerClient, diff --git a/client/daemon/peer/peertask_manager_test.go b/client/daemon/peer/peertask_manager_test.go index 1593a64eee3..736f69e872a 100644 --- a/client/daemon/peer/peertask_manager_test.go +++ b/client/daemon/peer/peertask_manager_test.go @@ -41,8 +41,8 @@ import ( "d7y.io/dragonfly/v2/client/daemon/test" mock_daemon "d7y.io/dragonfly/v2/client/daemon/test/mock/daemon" mock_scheduler "d7y.io/dragonfly/v2/client/daemon/test/mock/scheduler" - "d7y.io/dragonfly/v2/internal/dfutils" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" + "d7y.io/dragonfly/v2/internal/dfnet" + "d7y.io/dragonfly/v2/internal/util" "d7y.io/dragonfly/v2/pkg/rpc" "d7y.io/dragonfly/v2/pkg/rpc/base" daemonserver "d7y.io/dragonfly/v2/pkg/rpc/dfdaemon/server" @@ -367,7 +367,7 @@ func TestPeerTaskManager_StartStreamPeerTask_BackSource(t *testing.T) { pieceManager: &pieceManager{ storageManager: storageManager, pieceDownloader: NewMockPieceDownloader(ctrl), - computePieceSize: dfutils.ComputePieceSize, + computePieceSize: util.ComputePieceSize, }, storageManager: storageManager, schedulerClient: sched, diff --git a/client/daemon/peer/peertask_stream_backsource_partial_test.go b/client/daemon/peer/peertask_stream_backsource_partial_test.go index 9eb49827545..3ec1aeea49a 100644 --- a/client/daemon/peer/peertask_stream_backsource_partial_test.go +++ b/client/daemon/peer/peertask_stream_backsource_partial_test.go @@ -41,7 +41,7 @@ import ( mock_daemon "d7y.io/dragonfly/v2/client/daemon/test/mock/daemon" mock_scheduler "d7y.io/dragonfly/v2/client/daemon/test/mock/scheduler" "d7y.io/dragonfly/v2/internal/dferrors" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/pkg/rpc" "d7y.io/dragonfly/v2/pkg/rpc/base" daemonserver "d7y.io/dragonfly/v2/pkg/rpc/dfdaemon/server" diff --git a/client/daemon/peer/peertask_stream_test.go b/client/daemon/peer/peertask_stream_test.go index 6b50c84feca..43c4813a212 100644 --- a/client/daemon/peer/peertask_stream_test.go +++ b/client/daemon/peer/peertask_stream_test.go @@ -31,7 +31,7 @@ import ( "d7y.io/dragonfly/v2/client/clientutil" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/test" - "d7y.io/dragonfly/v2/internal/dfutils" + "d7y.io/dragonfly/v2/internal/util" "d7y.io/dragonfly/v2/pkg/rpc/base" "d7y.io/dragonfly/v2/pkg/rpc/scheduler" "d7y.io/dragonfly/v2/pkg/source" @@ -98,7 +98,7 @@ func TestStreamPeerTask_BackSource_WithContentLength(t *testing.T) { pieceManager: &pieceManager{ storageManager: storageManager, pieceDownloader: downloader, - computePieceSize: dfutils.ComputePieceSize, + computePieceSize: util.ComputePieceSize, }, storageManager: storageManager, schedulerClient: schedulerClient, @@ -204,7 +204,7 @@ func TestStreamPeerTask_BackSource_WithoutContentLength(t *testing.T) { pieceManager: &pieceManager{ storageManager: storageManager, pieceDownloader: downloader, - computePieceSize: dfutils.ComputePieceSize, + computePieceSize: util.ComputePieceSize, }, storageManager: storageManager, schedulerClient: schedulerClient, diff --git a/client/daemon/peer/piece_manager.go b/client/daemon/peer/piece_manager.go index 7ccfd1e90e5..5912f156fdc 100644 --- a/client/daemon/peer/piece_manager.go +++ b/client/daemon/peer/piece_manager.go @@ -28,7 +28,7 @@ import ( "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/storage" logger "d7y.io/dragonfly/v2/internal/dflog" - "d7y.io/dragonfly/v2/internal/dfutils" + "d7y.io/dragonfly/v2/internal/util" "d7y.io/dragonfly/v2/pkg/rpc/base" "d7y.io/dragonfly/v2/pkg/rpc/scheduler" "d7y.io/dragonfly/v2/pkg/source" @@ -55,7 +55,7 @@ var _ PieceManager = (*pieceManager)(nil) func NewPieceManager(s storage.TaskStorageDriver, pieceDownloadTimeout time.Duration, opts ...func(*pieceManager)) (PieceManager, error) { pm := &pieceManager{ storageManager: s, - computePieceSize: dfutils.ComputePieceSize, + computePieceSize: util.ComputePieceSize, calculateDigest: true, } for _, opt := range opts { diff --git a/client/daemon/rpcserver/rpcserver_test.go b/client/daemon/rpcserver/rpcserver_test.go index 7a465fe4015..75ed9a51862 100644 --- a/client/daemon/rpcserver/rpcserver_test.go +++ b/client/daemon/rpcserver/rpcserver_test.go @@ -34,8 +34,8 @@ import ( "d7y.io/dragonfly/v2/client/daemon/peer" mock_peer "d7y.io/dragonfly/v2/client/daemon/test/mock/peer" mock_storage "d7y.io/dragonfly/v2/client/daemon/test/mock/storage" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/internal/idgen" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" "d7y.io/dragonfly/v2/pkg/rpc/base" dfdaemongrpc "d7y.io/dragonfly/v2/pkg/rpc/dfdaemon" dfclient "d7y.io/dragonfly/v2/pkg/rpc/dfdaemon/client" diff --git a/client/daemon/test/mock/scheduler/scheduler_client.go b/client/daemon/test/mock/scheduler/scheduler_client.go index 87fb5403482..1587ebd0b41 100644 --- a/client/daemon/test/mock/scheduler/scheduler_client.go +++ b/client/daemon/test/mock/scheduler/scheduler_client.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - dfnet "d7y.io/dragonfly/v2/pkg/basic/dfnet" + dfnet "d7y.io/dragonfly/v2/internal/dfnet" scheduler "d7y.io/dragonfly/v2/pkg/rpc/scheduler" client "d7y.io/dragonfly/v2/pkg/rpc/scheduler/client" gomock "github.com/golang/mock/gomock" diff --git a/cmd/dependency/dependency.go b/cmd/dependency/dependency.go index abeea2c25d0..af6f3b95c1b 100644 --- a/cmd/dependency/dependency.go +++ b/cmd/dependency/dependency.go @@ -48,8 +48,8 @@ import ( "d7y.io/dragonfly/v2/cmd/dependency/base" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/internal/dflog/logcore" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/internal/dfpath" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" "d7y.io/dragonfly/v2/pkg/unit" "d7y.io/dragonfly/v2/pkg/util/hostutils" "d7y.io/dragonfly/v2/pkg/util/net/iputils" diff --git a/cmd/dfget/cmd/daemon.go b/cmd/dfget/cmd/daemon.go index 4d6347efcd9..df86129bc4b 100644 --- a/cmd/dfget/cmd/daemon.go +++ b/cmd/dfget/cmd/daemon.go @@ -32,8 +32,8 @@ import ( "d7y.io/dragonfly/v2/cmd/dependency" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/internal/dflog/logcore" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/internal/dfpath" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" "d7y.io/dragonfly/v2/pkg/rpc/dfdaemon/client" "d7y.io/dragonfly/v2/version" ) diff --git a/cmd/dfget/cmd/root.go b/cmd/dfget/cmd/root.go index 2976aa9d3da..9ff8ac0e9da 100644 --- a/cmd/dfget/cmd/root.go +++ b/cmd/dfget/cmd/root.go @@ -37,9 +37,9 @@ import ( "d7y.io/dragonfly/v2/internal/constants" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/internal/dflog/logcore" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/internal/dfpath" "d7y.io/dragonfly/v2/pkg/basic" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" "d7y.io/dragonfly/v2/pkg/rpc/dfdaemon/client" "d7y.io/dragonfly/v2/pkg/unit" "d7y.io/dragonfly/v2/pkg/util/net/iputils" diff --git a/pkg/basic/dfnet/type.go b/internal/dfnet/dfnet.go similarity index 100% rename from pkg/basic/dfnet/type.go rename to internal/dfnet/dfnet.go diff --git a/internal/dfutils/dfutils.go b/internal/util/util.go similarity index 98% rename from internal/dfutils/dfutils.go rename to internal/util/util.go index 236c773edac..9a558c9d0ca 100644 --- a/internal/dfutils/dfutils.go +++ b/internal/util/util.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package dfutils +package util const ( // DefaultPieceSize 4M diff --git a/internal/dfutils/dfutils_test.go b/internal/util/util_test.go similarity index 99% rename from internal/dfutils/dfutils_test.go rename to internal/util/util_test.go index ca2401b8ee5..071bb1357b1 100644 --- a/internal/dfutils/dfutils_test.go +++ b/internal/util/util_test.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package dfutils +package util import ( "testing" diff --git a/pkg/rpc/cdnsystem/client/client.go b/pkg/rpc/cdnsystem/client/client.go index 62cc41201cb..8e688d400f8 100644 --- a/pkg/rpc/cdnsystem/client/client.go +++ b/pkg/rpc/cdnsystem/client/client.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc" logger "d7y.io/dragonfly/v2/internal/dflog" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/pkg/rpc" "d7y.io/dragonfly/v2/pkg/rpc/base" "d7y.io/dragonfly/v2/pkg/rpc/cdnsystem" diff --git a/pkg/rpc/client.go b/pkg/rpc/client.go index cef82be6d10..a3a8ae67416 100644 --- a/pkg/rpc/client.go +++ b/pkg/rpc/client.go @@ -32,7 +32,7 @@ import ( "d7y.io/dragonfly/v2/internal/dferrors" logger "d7y.io/dragonfly/v2/internal/dflog" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/pkg/rpc/base" ) diff --git a/pkg/rpc/dfdaemon/client/client.go b/pkg/rpc/dfdaemon/client/client.go index 6bae314077c..c20074a399d 100644 --- a/pkg/rpc/dfdaemon/client/client.go +++ b/pkg/rpc/dfdaemon/client/client.go @@ -28,8 +28,8 @@ import ( "google.golang.org/grpc" logger "d7y.io/dragonfly/v2/internal/dflog" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/internal/idgen" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" "d7y.io/dragonfly/v2/pkg/rpc" "d7y.io/dragonfly/v2/pkg/rpc/base" "d7y.io/dragonfly/v2/pkg/rpc/dfdaemon" diff --git a/pkg/rpc/dfdaemon/client/peer.go b/pkg/rpc/dfdaemon/client/peer.go index 2938096c4a1..cf69dcfa296 100644 --- a/pkg/rpc/dfdaemon/client/peer.go +++ b/pkg/rpc/dfdaemon/client/peer.go @@ -23,7 +23,7 @@ import ( "google.golang.org/grpc" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/pkg/rpc" "d7y.io/dragonfly/v2/pkg/rpc/base" "d7y.io/dragonfly/v2/pkg/rpc/base/common" diff --git a/pkg/rpc/manager/client/client.go b/pkg/rpc/manager/client/client.go index ee0ef4015de..947a79b628c 100644 --- a/pkg/rpc/manager/client/client.go +++ b/pkg/rpc/manager/client/client.go @@ -28,7 +28,7 @@ import ( "google.golang.org/grpc/backoff" logger "d7y.io/dragonfly/v2/internal/dflog" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/pkg/reachable" "d7y.io/dragonfly/v2/pkg/rpc/manager" ) diff --git a/pkg/rpc/scheduler/client/client.go b/pkg/rpc/scheduler/client/client.go index d6bf28b8450..5cab4d9577e 100644 --- a/pkg/rpc/scheduler/client/client.go +++ b/pkg/rpc/scheduler/client/client.go @@ -26,8 +26,8 @@ import ( "google.golang.org/grpc/status" logger "d7y.io/dragonfly/v2/internal/dflog" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/internal/idgen" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" "d7y.io/dragonfly/v2/pkg/rpc" "d7y.io/dragonfly/v2/pkg/rpc/base" "d7y.io/dragonfly/v2/pkg/rpc/scheduler" diff --git a/pkg/rpc/server_listen.go b/pkg/rpc/server_listen.go index e2040e44b42..98d4152b805 100644 --- a/pkg/rpc/server_listen.go +++ b/pkg/rpc/server_listen.go @@ -23,7 +23,7 @@ import ( "syscall" logger "d7y.io/dragonfly/v2/internal/dflog" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" + "d7y.io/dragonfly/v2/internal/dfnet" ) // Listen wraps net.Listen with dfnet.NetAddr diff --git a/scheduler/supervisor/cdn.go b/scheduler/supervisor/cdn.go index 40303d46f91..d767e06733a 100644 --- a/scheduler/supervisor/cdn.go +++ b/scheduler/supervisor/cdn.go @@ -33,8 +33,8 @@ import ( "d7y.io/dragonfly/v2/internal/dferrors" logger "d7y.io/dragonfly/v2/internal/dflog" + "d7y.io/dragonfly/v2/internal/dfnet" "d7y.io/dragonfly/v2/internal/idgen" - "d7y.io/dragonfly/v2/pkg/basic/dfnet" "d7y.io/dragonfly/v2/pkg/rpc/base" "d7y.io/dragonfly/v2/pkg/rpc/cdnsystem" cdnclient "d7y.io/dragonfly/v2/pkg/rpc/cdnsystem/client" diff --git a/scheduler/supervisor/mocks/cdn_mock.go b/scheduler/supervisor/mocks/cdn_mock.go index ed179ae9e68..510447605e9 100644 --- a/scheduler/supervisor/mocks/cdn_mock.go +++ b/scheduler/supervisor/mocks/cdn_mock.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - dfnet "d7y.io/dragonfly/v2/pkg/basic/dfnet" + dfnet "d7y.io/dragonfly/v2/internal/dfnet" base "d7y.io/dragonfly/v2/pkg/rpc/base" cdnsystem "d7y.io/dragonfly/v2/pkg/rpc/cdnsystem" client "d7y.io/dragonfly/v2/pkg/rpc/cdnsystem/client"