From be42627ab24afbd13a8ddbfe32b6272d41076da9 Mon Sep 17 00:00:00 2001 From: Xiaofan <83447078+xiaofan-luan@users.noreply.github.com> Date: Wed, 9 Feb 2022 18:55:46 +0800 Subject: [PATCH] Move Logutil to Util dir (#15447) Signed-off-by: xiaofan-luan --- cmd/roles/roles.go | 2 +- internal/datacoord/compaction_trigger.go | 2 +- internal/datacoord/server.go | 2 +- internal/datacoord/services.go | 2 +- internal/datanode/data_node.go | 2 +- internal/distributed/datacoord/service.go | 2 +- internal/proxy/impl.go | 3 +-- internal/proxy/proxy.go | 2 +- internal/proxy/proxy_test.go | 2 +- internal/{ => util}/logutil/logutil.go | 0 internal/util/paramtable/base_table.go | 2 +- 11 files changed, 10 insertions(+), 11 deletions(-) rename internal/{ => util}/logutil/logutil.go (100%) diff --git a/cmd/roles/roles.go b/cmd/roles/roles.go index 61b1dcb883..b8601589fb 100644 --- a/cmd/roles/roles.go +++ b/cmd/roles/roles.go @@ -35,7 +35,6 @@ import ( "github.com/milvus-io/milvus/internal/indexcoord" "github.com/milvus-io/milvus/internal/indexnode" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/logutil" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/msgstream" "github.com/milvus-io/milvus/internal/proto/internalpb" @@ -45,6 +44,7 @@ import ( "github.com/milvus-io/milvus/internal/rootcoord" "github.com/milvus-io/milvus/internal/util/etcd" "github.com/milvus-io/milvus/internal/util/healthz" + logutil "github.com/milvus-io/milvus/internal/util/logutil" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/rocksmq/server/rocksmq" diff --git a/internal/datacoord/compaction_trigger.go b/internal/datacoord/compaction_trigger.go index 2b313a481d..7c2c6faddf 100644 --- a/internal/datacoord/compaction_trigger.go +++ b/internal/datacoord/compaction_trigger.go @@ -22,9 +22,9 @@ import ( "time" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/logutil" "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/internal/util/logutil" "go.uber.org/zap" ) diff --git a/internal/datacoord/server.go b/internal/datacoord/server.go index c9f96d8c18..d8d1730b5d 100644 --- a/internal/datacoord/server.go +++ b/internal/datacoord/server.go @@ -30,12 +30,12 @@ import ( rootcoordclient "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/logutil" "github.com/milvus-io/milvus/internal/msgstream" "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/internal/util/logutil" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/mqclient" "github.com/milvus-io/milvus/internal/util/paramtable" diff --git a/internal/datacoord/services.go b/internal/datacoord/services.go index f4190cedff..5ccd439667 100644 --- a/internal/datacoord/services.go +++ b/internal/datacoord/services.go @@ -25,11 +25,11 @@ import ( "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/logutil" "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/milvuspb" + "github.com/milvus-io/milvus/internal/util/logutil" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/trace" "go.uber.org/zap" diff --git a/internal/datanode/data_node.go b/internal/datanode/data_node.go index bad5d94aa5..3adf8abc09 100644 --- a/internal/datanode/data_node.go +++ b/internal/datanode/data_node.go @@ -39,7 +39,6 @@ import ( etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" miniokv "github.com/milvus-io/milvus/internal/kv/minio" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/logutil" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/msgstream" "github.com/milvus-io/milvus/internal/proto/commonpb" @@ -48,6 +47,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/milvuspb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/internal/util/logutil" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/retry" diff --git a/internal/distributed/datacoord/service.go b/internal/distributed/datacoord/service.go index 16641db867..567ee63894 100644 --- a/internal/distributed/datacoord/service.go +++ b/internal/distributed/datacoord/service.go @@ -29,7 +29,6 @@ import ( grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/milvus-io/milvus/internal/datacoord" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/logutil" "github.com/milvus-io/milvus/internal/msgstream" "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" @@ -38,6 +37,7 @@ import ( "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/etcd" "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/internal/util/logutil" "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/trace" "github.com/milvus-io/milvus/internal/util/typeutil" diff --git a/internal/proxy/impl.go b/internal/proxy/impl.go index 279028fe69..66ca598b89 100644 --- a/internal/proxy/impl.go +++ b/internal/proxy/impl.go @@ -24,9 +24,8 @@ import ( "strconv" "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/logutil" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/internal/util/logutil" "github.com/milvus-io/milvus/internal/util/trace" diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go index 40a4154d84..7ffc45d1a0 100644 --- a/internal/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -27,13 +27,13 @@ import ( "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/logutil" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/msgstream" "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/internal/util/logutil" "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/sessionutil" diff --git a/internal/proxy/proxy_test.go b/internal/proxy/proxy_test.go index 9cf0db7d1b..c56e5ed7fc 100644 --- a/internal/proxy/proxy_test.go +++ b/internal/proxy/proxy_test.go @@ -98,9 +98,9 @@ import ( "github.com/milvus-io/milvus/internal/msgstream" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/logutil" "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/rootcoord" + "github.com/milvus-io/milvus/internal/util/logutil" ) const ( diff --git a/internal/logutil/logutil.go b/internal/util/logutil/logutil.go similarity index 100% rename from internal/logutil/logutil.go rename to internal/util/logutil/logutil.go diff --git a/internal/util/paramtable/base_table.go b/internal/util/paramtable/base_table.go index 5fb6adb4da..a4273a8284 100644 --- a/internal/util/paramtable/base_table.go +++ b/internal/util/paramtable/base_table.go @@ -24,8 +24,8 @@ import ( memkv "github.com/milvus-io/milvus/internal/kv/mem" "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/logutil" "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/internal/util/logutil" "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/spf13/cast" "github.com/spf13/viper"