From 662e2b4c02ccccdf74f72d1e765b4d5901f77115 Mon Sep 17 00:00:00 2001 From: Sydonian <794346190@qq.com> Date: Tue, 29 Jul 2025 15:37:45 +0800 Subject: [PATCH] =?UTF-8?q?publock=E7=A7=BB=E5=8A=A8=E5=88=B0client?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/internal/cmdline/serve.go | 2 +- client/internal/cmdline/test.go | 2 +- client/internal/cmdline/vfstest.go | 2 +- client/internal/downloader/iterator.go | 2 +- client/internal/http/v1/package.go | 2 +- client/internal/http/v1/pub_shards.go | 2 +- .../internal}/publock/lockprovider/empty_target.go | 2 +- .../publock/lockprovider/lock_compatibility_table.go | 2 +- .../publock/lockprovider/lock_compatibility_table_test.go | 2 +- .../pkgs => client/internal}/publock/lockprovider/package.go | 2 +- .../internal}/publock/lockprovider/string_lock_target.go | 2 +- .../internal}/publock/lockprovider/string_lock_target_test.go | 0 .../internal}/publock/lockprovider/user_space.go | 2 +- .../internal}/publock/lockprovider/user_space_test.go | 2 +- {common/pkgs => client/internal}/publock/mutex.go | 2 +- {common/pkgs => client/internal}/publock/reentrant.go | 2 +- .../internal}/publock/reqbuilder/lock_request_builder.go | 4 ++-- .../pkgs => client/internal}/publock/reqbuilder/package.go | 4 ++-- .../pkgs => client/internal}/publock/reqbuilder/user_space.go | 4 ++-- {common/pkgs => client/internal}/publock/service.go | 4 ++-- {common/pkgs => client/internal}/publock/types/models.go | 0 client/internal/services/object.go | 2 +- client/internal/services/service.go | 2 +- client/internal/services/user_space.go | 2 +- client/internal/ticktock/change_redundancy.go | 4 ++-- client/internal/ticktock/redundancy_shrink.go | 4 ++-- client/internal/ticktock/ticktock.go | 2 +- client/internal/ticktock/user_space_gc.go | 2 +- client/internal/uploader/create_load.go | 2 +- client/internal/uploader/update.go | 2 +- client/internal/uploader/uploader.go | 4 ++-- client/internal/uploader/user_space_upload.go | 2 +- 32 files changed, 37 insertions(+), 37 deletions(-) rename {common/pkgs => client/internal}/publock/lockprovider/empty_target.go (75%) rename {common/pkgs => client/internal}/publock/lockprovider/lock_compatibility_table.go (97%) rename {common/pkgs => client/internal}/publock/lockprovider/lock_compatibility_table_test.go (92%) rename {common/pkgs => client/internal}/publock/lockprovider/package.go (97%) rename {common/pkgs => client/internal}/publock/lockprovider/string_lock_target.go (96%) rename {common/pkgs => client/internal}/publock/lockprovider/string_lock_target_test.go (100%) rename {common/pkgs => client/internal}/publock/lockprovider/user_space.go (97%) rename {common/pkgs => client/internal}/publock/lockprovider/user_space_test.go (96%) rename {common/pkgs => client/internal}/publock/mutex.go (74%) rename {common/pkgs => client/internal}/publock/reentrant.go (92%) rename {common/pkgs => client/internal}/publock/reqbuilder/lock_request_builder.go (81%) rename {common/pkgs => client/internal}/publock/reqbuilder/package.go (87%) rename {common/pkgs => client/internal}/publock/reqbuilder/user_space.go (87%) rename {common/pkgs => client/internal}/publock/service.go (96%) rename {common/pkgs => client/internal}/publock/types/models.go (100%) diff --git a/client/internal/cmdline/serve.go b/client/internal/cmdline/serve.go index f35ebe0..d29de48 100644 --- a/client/internal/cmdline/serve.go +++ b/client/internal/cmdline/serve.go @@ -16,6 +16,7 @@ import ( "gitlink.org.cn/cloudream/jcs-pub/client/internal/http" "gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache" "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock" "gitlink.org.cn/cloudream/jcs-pub/client/internal/services" "gitlink.org.cn/cloudream/jcs-pub/client/internal/spacesyncer" "gitlink.org.cn/cloudream/jcs-pub/client/internal/speedstats" @@ -23,7 +24,6 @@ import ( "gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader" stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" diff --git a/client/internal/cmdline/test.go b/client/internal/cmdline/test.go index ca6724c..21bed2b 100644 --- a/client/internal/cmdline/test.go +++ b/client/internal/cmdline/test.go @@ -15,6 +15,7 @@ import ( "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy" "gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock" "gitlink.org.cn/cloudream/jcs-pub/client/internal/services" "gitlink.org.cn/cloudream/jcs-pub/client/internal/spacesyncer" "gitlink.org.cn/cloudream/jcs-pub/client/internal/speedstats" @@ -24,7 +25,6 @@ import ( "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" diff --git a/client/internal/cmdline/vfstest.go b/client/internal/cmdline/vfstest.go index 90a5386..c7229af 100644 --- a/client/internal/cmdline/vfstest.go +++ b/client/internal/cmdline/vfstest.go @@ -18,13 +18,13 @@ import ( "gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache" "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount" "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfstest" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock" "gitlink.org.cn/cloudream/jcs-pub/client/internal/services" "gitlink.org.cn/cloudream/jcs-pub/client/internal/spacesyncer" "gitlink.org.cn/cloudream/jcs-pub/client/internal/speedstats" "gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader" stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" diff --git a/client/internal/downloader/iterator.go b/client/internal/downloader/iterator.go index fa0e5f6..009a202 100644 --- a/client/internal/downloader/iterator.go +++ b/client/internal/downloader/iterator.go @@ -12,12 +12,12 @@ import ( "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock" stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/iterator" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" ) diff --git a/client/internal/http/v1/package.go b/client/internal/http/v1/package.go index a05537d..cb7a9d7 100644 --- a/client/internal/http/v1/package.go +++ b/client/internal/http/v1/package.go @@ -19,10 +19,10 @@ import ( "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" "gitlink.org.cn/cloudream/jcs-pub/client/internal/http/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/reqbuilder" cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api/v1" "gitlink.org.cn/cloudream/jcs-pub/common/ecode" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/iterator" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/reqbuilder" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" "gorm.io/gorm" ) diff --git a/client/internal/http/v1/pub_shards.go b/client/internal/http/v1/pub_shards.go index 638c899..bc5e7f2 100644 --- a/client/internal/http/v1/pub_shards.go +++ b/client/internal/http/v1/pub_shards.go @@ -16,10 +16,10 @@ import ( "gitlink.org.cn/cloudream/common/utils/serder" "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" "gitlink.org.cn/cloudream/jcs-pub/client/internal/http/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/reqbuilder" cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api/v1" "gitlink.org.cn/cloudream/jcs-pub/common/ecode" stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/reqbuilder" corrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/rpc/coordinator" hubrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/rpc/hub" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" diff --git a/common/pkgs/publock/lockprovider/empty_target.go b/client/internal/publock/lockprovider/empty_target.go similarity index 75% rename from common/pkgs/publock/lockprovider/empty_target.go rename to client/internal/publock/lockprovider/empty_target.go index 5797f71..4d4b7f8 100644 --- a/common/pkgs/publock/lockprovider/empty_target.go +++ b/client/internal/publock/lockprovider/empty_target.go @@ -1,6 +1,6 @@ package lockprovider -import "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" +import "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" type EmptyTarget struct{} diff --git a/common/pkgs/publock/lockprovider/lock_compatibility_table.go b/client/internal/publock/lockprovider/lock_compatibility_table.go similarity index 97% rename from common/pkgs/publock/lockprovider/lock_compatibility_table.go rename to client/internal/publock/lockprovider/lock_compatibility_table.go index b817b61..7fa5ff5 100644 --- a/common/pkgs/publock/lockprovider/lock_compatibility_table.go +++ b/client/internal/publock/lockprovider/lock_compatibility_table.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/samber/lo" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" ) const ( diff --git a/common/pkgs/publock/lockprovider/lock_compatibility_table_test.go b/client/internal/publock/lockprovider/lock_compatibility_table_test.go similarity index 92% rename from common/pkgs/publock/lockprovider/lock_compatibility_table_test.go rename to client/internal/publock/lockprovider/lock_compatibility_table_test.go index 161ba44..ff39039 100644 --- a/common/pkgs/publock/lockprovider/lock_compatibility_table_test.go +++ b/client/internal/publock/lockprovider/lock_compatibility_table_test.go @@ -4,7 +4,7 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" ) func Test_LockCompatibilityTable(t *testing.T) { diff --git a/common/pkgs/publock/lockprovider/package.go b/client/internal/publock/lockprovider/package.go similarity index 97% rename from common/pkgs/publock/lockprovider/package.go rename to client/internal/publock/lockprovider/package.go index 6428501..0fc0316 100644 --- a/common/pkgs/publock/lockprovider/package.go +++ b/client/internal/publock/lockprovider/package.go @@ -4,7 +4,7 @@ import ( "fmt" "gitlink.org.cn/cloudream/common/utils/lo2" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" ) const ( diff --git a/common/pkgs/publock/lockprovider/string_lock_target.go b/client/internal/publock/lockprovider/string_lock_target.go similarity index 96% rename from common/pkgs/publock/lockprovider/string_lock_target.go rename to client/internal/publock/lockprovider/string_lock_target.go index 680d240..18fa5cf 100644 --- a/common/pkgs/publock/lockprovider/string_lock_target.go +++ b/client/internal/publock/lockprovider/string_lock_target.go @@ -5,7 +5,7 @@ import ( "github.com/samber/lo" "gitlink.org.cn/cloudream/common/utils/serder" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" ) type StringLockTarget struct { diff --git a/common/pkgs/publock/lockprovider/string_lock_target_test.go b/client/internal/publock/lockprovider/string_lock_target_test.go similarity index 100% rename from common/pkgs/publock/lockprovider/string_lock_target_test.go rename to client/internal/publock/lockprovider/string_lock_target_test.go diff --git a/common/pkgs/publock/lockprovider/user_space.go b/client/internal/publock/lockprovider/user_space.go similarity index 97% rename from common/pkgs/publock/lockprovider/user_space.go rename to client/internal/publock/lockprovider/user_space.go index 99189ed..7360865 100644 --- a/common/pkgs/publock/lockprovider/user_space.go +++ b/client/internal/publock/lockprovider/user_space.go @@ -4,7 +4,7 @@ import ( "fmt" "gitlink.org.cn/cloudream/common/utils/lo2" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" ) const ( diff --git a/common/pkgs/publock/lockprovider/user_space_test.go b/client/internal/publock/lockprovider/user_space_test.go similarity index 96% rename from common/pkgs/publock/lockprovider/user_space_test.go rename to client/internal/publock/lockprovider/user_space_test.go index a1823ed..7fb2808 100644 --- a/common/pkgs/publock/lockprovider/user_space_test.go +++ b/client/internal/publock/lockprovider/user_space_test.go @@ -4,7 +4,7 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" ) func Test_ShardStoreLock(t *testing.T) { diff --git a/common/pkgs/publock/mutex.go b/client/internal/publock/mutex.go similarity index 74% rename from common/pkgs/publock/mutex.go rename to client/internal/publock/mutex.go index 1987c4f..85abc97 100644 --- a/common/pkgs/publock/mutex.go +++ b/client/internal/publock/mutex.go @@ -1,7 +1,7 @@ package publock import ( - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" ) type Mutex struct { diff --git a/common/pkgs/publock/reentrant.go b/client/internal/publock/reentrant.go similarity index 92% rename from common/pkgs/publock/reentrant.go rename to client/internal/publock/reentrant.go index c94a797..dda4bbf 100644 --- a/common/pkgs/publock/reentrant.go +++ b/client/internal/publock/reentrant.go @@ -1,6 +1,6 @@ package publock -import "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" +import "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" type Reentrant struct { svc *Service diff --git a/common/pkgs/publock/reqbuilder/lock_request_builder.go b/client/internal/publock/reqbuilder/lock_request_builder.go similarity index 81% rename from common/pkgs/publock/reqbuilder/lock_request_builder.go rename to client/internal/publock/reqbuilder/lock_request_builder.go index 0ab7efd..327b311 100644 --- a/common/pkgs/publock/reqbuilder/lock_request_builder.go +++ b/client/internal/publock/reqbuilder/lock_request_builder.go @@ -2,8 +2,8 @@ package reqbuilder import ( "gitlink.org.cn/cloudream/common/utils/lo2" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" ) type LockRequestBuilder struct { diff --git a/common/pkgs/publock/reqbuilder/package.go b/client/internal/publock/reqbuilder/package.go similarity index 87% rename from common/pkgs/publock/reqbuilder/package.go rename to client/internal/publock/reqbuilder/package.go index 9ee4681..8a17e18 100644 --- a/common/pkgs/publock/reqbuilder/package.go +++ b/client/internal/publock/reqbuilder/package.go @@ -3,8 +3,8 @@ package reqbuilder import ( "strconv" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/lockprovider" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/lockprovider" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" ) diff --git a/common/pkgs/publock/reqbuilder/user_space.go b/client/internal/publock/reqbuilder/user_space.go similarity index 87% rename from common/pkgs/publock/reqbuilder/user_space.go rename to client/internal/publock/reqbuilder/user_space.go index b008d83..5ddf550 100644 --- a/common/pkgs/publock/reqbuilder/user_space.go +++ b/client/internal/publock/reqbuilder/user_space.go @@ -3,8 +3,8 @@ package reqbuilder import ( "strconv" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/lockprovider" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/lockprovider" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" ) diff --git a/common/pkgs/publock/service.go b/client/internal/publock/service.go similarity index 96% rename from common/pkgs/publock/service.go rename to client/internal/publock/service.go index df2fc39..76ee8dc 100644 --- a/common/pkgs/publock/service.go +++ b/client/internal/publock/service.go @@ -9,8 +9,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/future" "gitlink.org.cn/cloudream/common/pkgs/trie" "gitlink.org.cn/cloudream/common/utils/lo2" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/lockprovider" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/lockprovider" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/types" ) type AcquireOption struct { diff --git a/common/pkgs/publock/types/models.go b/client/internal/publock/types/models.go similarity index 100% rename from common/pkgs/publock/types/models.go rename to client/internal/publock/types/models.go diff --git a/client/internal/services/object.go b/client/internal/services/object.go index 9de519d..6917451 100644 --- a/client/internal/services/object.go +++ b/client/internal/services/object.go @@ -11,11 +11,11 @@ import ( "gitlink.org.cn/cloudream/common/utils/sort2" "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/reqbuilder" "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api/v1" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/plans" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/reqbuilder" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" "gitlink.org.cn/cloudream/jcs-pub/common/types/datamap" "gorm.io/gorm" diff --git a/client/internal/services/service.go b/client/internal/services/service.go index 6568ea6..d0707c6 100644 --- a/client/internal/services/service.go +++ b/client/internal/services/service.go @@ -8,11 +8,11 @@ import ( "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy" "gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache" "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock" "gitlink.org.cn/cloudream/jcs-pub/client/internal/spacesyncer" "gitlink.org.cn/cloudream/jcs-pub/client/internal/speedstats" "gitlink.org.cn/cloudream/jcs-pub/client/internal/ticktock" "gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" ) diff --git a/client/internal/services/user_space.go b/client/internal/services/user_space.go index cd2b7d4..06338af 100644 --- a/client/internal/services/user_space.go +++ b/client/internal/services/user_space.go @@ -13,13 +13,13 @@ import ( "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/reqbuilder" cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api/v1" "gitlink.org.cn/cloudream/jcs-pub/common/ecode" stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/reqbuilder" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory" ) diff --git a/client/internal/ticktock/change_redundancy.go b/client/internal/ticktock/change_redundancy.go index 4600514..1193b3c 100644 --- a/client/internal/ticktock/change_redundancy.go +++ b/client/internal/ticktock/change_redundancy.go @@ -7,8 +7,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/reflect2" "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/reqbuilder" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/reqbuilder" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" "gitlink.org.cn/cloudream/jcs-pub/common/types/datamap" ) diff --git a/client/internal/ticktock/redundancy_shrink.go b/client/internal/ticktock/redundancy_shrink.go index c5c1c2f..9299c04 100644 --- a/client/internal/ticktock/redundancy_shrink.go +++ b/client/internal/ticktock/redundancy_shrink.go @@ -14,13 +14,13 @@ import ( "gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/sort2" "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/reqbuilder" "gitlink.org.cn/cloudream/jcs-pub/common/consts" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/reqbuilder" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" "gitlink.org.cn/cloudream/jcs-pub/common/types/datamap" ) diff --git a/client/internal/ticktock/ticktock.go b/client/internal/ticktock/ticktock.go index 3146832..c15f52e 100644 --- a/client/internal/ticktock/ticktock.go +++ b/client/internal/ticktock/ticktock.go @@ -8,8 +8,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" "gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock" "gitlink.org.cn/cloudream/jcs-pub/client/internal/speedstats" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" ) diff --git a/client/internal/ticktock/user_space_gc.go b/client/internal/ticktock/user_space_gc.go index 295c841..1c879fb 100644 --- a/client/internal/ticktock/user_space_gc.go +++ b/client/internal/ticktock/user_space_gc.go @@ -9,7 +9,7 @@ import ( "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/reqbuilder" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/reqbuilder" ) type UserSpaceGC struct { diff --git a/client/internal/uploader/create_load.go b/client/internal/uploader/create_load.go index 805f632..2538152 100644 --- a/client/internal/uploader/create_load.go +++ b/client/internal/uploader/create_load.go @@ -8,11 +8,11 @@ import ( "time" "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" ) diff --git a/client/internal/uploader/update.go b/client/internal/uploader/update.go index d8b9193..1c43f73 100644 --- a/client/internal/uploader/update.go +++ b/client/internal/uploader/update.go @@ -9,11 +9,11 @@ import ( "github.com/samber/lo" "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" ) diff --git a/client/internal/uploader/uploader.go b/client/internal/uploader/uploader.go index 7a325b5..2577e77 100644 --- a/client/internal/uploader/uploader.go +++ b/client/internal/uploader/uploader.go @@ -13,14 +13,14 @@ import ( "gitlink.org.cn/cloudream/common/utils/sort2" "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" "gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/reqbuilder" stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/reqbuilder" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types" ) diff --git a/client/internal/uploader/user_space_upload.go b/client/internal/uploader/user_space_upload.go index af94558..bb6bae8 100644 --- a/client/internal/uploader/user_space_upload.go +++ b/client/internal/uploader/user_space_upload.go @@ -9,12 +9,12 @@ import ( "github.com/samber/lo" "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/publock/reqbuilder" stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/publock/reqbuilder" corrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/rpc/coordinator" stgtypes "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" jcstypes "gitlink.org.cn/cloudream/jcs-pub/common/types"