From f203f750aa5e50ddf1b128ccc33e339c97e9aee6 Mon Sep 17 00:00:00 2001 From: Xiangyu Wang Date: Sat, 18 Sep 2021 19:06:09 +0800 Subject: [PATCH] Improve import statements in msgstream (#8237) Signed-off-by: Xiangyu Wang --- internal/msgstream/mq_factory.go | 3 ++- internal/msgstream/mq_msgstream.go | 5 +++-- internal/msgstream/msg_test.go | 3 ++- internal/msgstream/trace.go | 5 +++-- internal/msgstream/unmarshal_test.go | 3 ++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/internal/msgstream/mq_factory.go b/internal/msgstream/mq_factory.go index 0c33bb0b70..e60bf80ad8 100644 --- a/internal/msgstream/mq_factory.go +++ b/internal/msgstream/mq_factory.go @@ -15,10 +15,11 @@ import ( "context" "github.com/apache/pulsar-client-go/pulsar" + "github.com/mitchellh/mapstructure" + "github.com/milvus-io/milvus/internal/util/mqclient" "github.com/milvus-io/milvus/internal/util/rocksmq/client/rocksmq" rocksmqserver "github.com/milvus-io/milvus/internal/util/rocksmq/server/rocksmq" - "github.com/mitchellh/mapstructure" ) type PmsFactory struct { diff --git a/internal/msgstream/mq_msgstream.go b/internal/msgstream/mq_msgstream.go index 73f946e0e0..09eb89cc9a 100644 --- a/internal/msgstream/mq_msgstream.go +++ b/internal/msgstream/mq_msgstream.go @@ -21,14 +21,15 @@ import ( "time" "github.com/golang/protobuf/proto" + "github.com/opentracing/opentracing-go" + "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/mqclient" "github.com/milvus-io/milvus/internal/util/retry" "github.com/milvus-io/milvus/internal/util/trace" - "github.com/opentracing/opentracing-go" - "go.uber.org/zap" ) type mqMsgStream struct { diff --git a/internal/msgstream/msg_test.go b/internal/msgstream/msg_test.go index 9c8092406f..b19f220afe 100644 --- a/internal/msgstream/msg_test.go +++ b/internal/msgstream/msg_test.go @@ -15,11 +15,12 @@ import ( "context" "testing" + "github.com/stretchr/testify/assert" + "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/schemapb" - "github.com/stretchr/testify/assert" ) func TestBaseMsg(t *testing.T) { diff --git a/internal/msgstream/trace.go b/internal/msgstream/trace.go index 48dbac24d0..e9d915ed8e 100644 --- a/internal/msgstream/trace.go +++ b/internal/msgstream/trace.go @@ -16,11 +16,12 @@ import ( "errors" "runtime" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/util/trace" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" "github.com/opentracing/opentracing-go/log" + + "github.com/milvus-io/milvus/internal/proto/commonpb" + "github.com/milvus-io/milvus/internal/util/trace" ) func ExtractFromPulsarMsgProperties(msg TsMsg, properties map[string]string) (opentracing.Span, bool) { diff --git a/internal/msgstream/unmarshal_test.go b/internal/msgstream/unmarshal_test.go index 2783378fb1..ae9c079b51 100644 --- a/internal/msgstream/unmarshal_test.go +++ b/internal/msgstream/unmarshal_test.go @@ -16,9 +16,10 @@ import ( "testing" "github.com/golang/protobuf/proto" + "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/internal/proto/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/stretchr/testify/assert" ) func newInsertMsgUnmarshal(input []byte) (TsMsg, error) {