reformat the order of import code statements

Signed-off-by: SimFG <bang.fu@zilliz.com>

.golangci.yml

@@ -26,10 +26,11 @@ linters-settings:
     sections:
       - standard
       - default
+      - prefix(github.com/milvus-io)
       - prefix(github.com/zilliztech)
     custom-order: true
   gofumpt:
-    lang-version: "1.18"
+    lang-version: "1.21"
     module-path: github.com/zilliztech
   goimports:
     local-prefixes: github.com/zilliztech

Makefile

@@ -11,7 +11,7 @@ lint-fix:
 	@echo "Running gofumpt fix"
 	@gofumpt -l -w ./
 	@echo "Running gci fix"
-	@gci write ./ -s standard -s default -s "prefix(github.com/zilliztech)" --custom-order --skip-generated
+	@gci write ./ -s standard -s default -s "prefix(github.com/milvus-io)" -s "prefix(github.com/zilliztech)" --custom-order --skip-generated
 
 static-check:
 	@echo "Running go-lint check:"

core/log/log.go

@@ -22,8 +22,9 @@ import (
 	"context"
 	"sync/atomic"
 
-	"github.com/milvus-io/milvus/pkg/log"
 	"go.uber.org/zap"
+
+	"github.com/milvus-io/milvus/pkg/log"
 )
 
 var (

core/pb/data_coord.go

@@ -20,6 +20,7 @@ package pb
 
 import (
 	"github.com/golang/protobuf/proto"
+
 	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
 )
 

core/pb/etcd_meta.go

@@ -20,6 +20,7 @@ package pb
 
 import (
 	"github.com/golang/protobuf/proto"
+
 	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
 	"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
 )

core/pb/internal.go

@@ -20,6 +20,7 @@ package pb
 
 import (
 	"github.com/golang/protobuf/proto"
+
 	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
 	"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
 )

core/reader/channel_reader.go

@@ -27,10 +27,11 @@ import (
 	"sync"
 	"time"
 
+	"go.uber.org/zap"
+
 	"github.com/milvus-io/milvus-proto/go-api/v2/msgpb"
 	"github.com/milvus-io/milvus/pkg/mq/msgstream"
 	"github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper"
-	"go.uber.org/zap"
 
 	"github.com/zilliztech/milvus-cdc/core/api"
 	"github.com/zilliztech/milvus-cdc/core/config"

core/reader/channel_reader_test.go

@@ -25,10 +25,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/milvus-io/milvus/pkg/mq/msgstream"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
+	"github.com/milvus-io/milvus/pkg/mq/msgstream"
+
 	"github.com/zilliztech/milvus-cdc/core/config"
 	"github.com/zilliztech/milvus-cdc/core/mocks"
 )

core/reader/collection_reader.go

@@ -23,13 +23,14 @@ import (
 	"sync"
 
 	"github.com/cockroachdb/errors"
+	"github.com/samber/lo"
+	"go.uber.org/zap"
+
 	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
 	"github.com/milvus-io/milvus-proto/go-api/v2/msgpb"
 	"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
 	"github.com/milvus-io/milvus/pkg/mq/msgstream"
 	"github.com/milvus-io/milvus/pkg/util/retry"
-	"github.com/samber/lo"
-	"go.uber.org/zap"
 
 	"github.com/zilliztech/milvus-cdc/core/api"
 	"github.com/zilliztech/milvus-cdc/core/config"

core/reader/collection_reader_test.go

@@ -26,13 +26,14 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
-	"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
-	"github.com/milvus-io/milvus/pkg/common"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	clientv3 "go.etcd.io/etcd/client/v3"
 
+	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
+	"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
+	"github.com/milvus-io/milvus/pkg/common"
+
 	api2 "github.com/zilliztech/milvus-cdc/core/api"
 	"github.com/zilliztech/milvus-cdc/core/config"
 	"github.com/zilliztech/milvus-cdc/core/mocks"

core/reader/etcd_op.go

@@ -29,14 +29,15 @@ import (
 
 	"github.com/cockroachdb/errors"
 	"github.com/golang/protobuf/proto"
+	clientv3 "go.etcd.io/etcd/client/v3"
+	"go.uber.org/zap"
+
 	"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
 	"github.com/milvus-io/milvus/pkg/common"
 	"github.com/milvus-io/milvus/pkg/util/conc"
 	"github.com/milvus-io/milvus/pkg/util/retry"
 	"github.com/milvus-io/milvus/pkg/util/tsoutil"
 	"github.com/milvus-io/milvus/pkg/util/typeutil"
-	clientv3 "go.etcd.io/etcd/client/v3"
-	"go.uber.org/zap"
 
 	"github.com/zilliztech/milvus-cdc/core/api"
 	"github.com/zilliztech/milvus-cdc/core/config"

core/reader/etcd_op_test.go

@@ -26,11 +26,12 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/proto"
+	"github.com/stretchr/testify/assert"
+	clientv3 "go.etcd.io/etcd/client/v3"
+
 	"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
 	"github.com/milvus-io/milvus/pkg/common"
 	"github.com/milvus-io/milvus/pkg/util/retry"
-	"github.com/stretchr/testify/assert"
-	clientv3 "go.etcd.io/etcd/client/v3"
 
 	"github.com/zilliztech/milvus-cdc/core/api"
 	"github.com/zilliztech/milvus-cdc/core/config"

core/reader/factory_api_test.go

@@ -22,9 +22,10 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/milvus-io/milvus/pkg/mq/msgstream"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/milvus-io/milvus/pkg/mq/msgstream"
+
 	"github.com/zilliztech/milvus-cdc/core/config"
 	"github.com/zilliztech/milvus-cdc/core/util"
 )

core/reader/replicate_channel_manager.go

@@ -28,16 +28,17 @@ import (
 	"time"
 
 	"github.com/cockroachdb/errors"
+	"github.com/samber/lo"
+	"github.com/sasha-s/go-deadlock"
+	"go.uber.org/zap"
+
 	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
 	"github.com/milvus-io/milvus-proto/go-api/v2/msgpb"
 	"github.com/milvus-io/milvus/pkg/mq/msgstream"
 	"github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper"
 	"github.com/milvus-io/milvus/pkg/util/commonpbutil"
 	"github.com/milvus-io/milvus/pkg/util/conc"
 	"github.com/milvus-io/milvus/pkg/util/retry"
-	"github.com/samber/lo"
-	"github.com/sasha-s/go-deadlock"
-	"go.uber.org/zap"
 
 	"github.com/zilliztech/milvus-cdc/core/api"
 	"github.com/zilliztech/milvus-cdc/core/config"

core/reader/replicate_channel_manager_test.go

@@ -24,13 +24,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+
 	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
 	"github.com/milvus-io/milvus-proto/go-api/v2/msgpb"
 	"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
 	"github.com/milvus-io/milvus/pkg/mq/msgstream"
 	"github.com/milvus-io/milvus/pkg/util/retry"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
 
 	"github.com/zilliztech/milvus-cdc/core/api"
 	"github.com/zilliztech/milvus-cdc/core/config"

core/reader/target_client.go

@@ -22,9 +22,10 @@ import (
 	"context"
 
 	"github.com/cockroachdb/errors"
-	"github.com/milvus-io/milvus-sdk-go/v2/client"
 	"go.uber.org/zap"
 
+	"github.com/milvus-io/milvus-sdk-go/v2/client"
+
 	"github.com/zilliztech/milvus-cdc/core/api"
 	"github.com/zilliztech/milvus-cdc/core/log"
 	"github.com/zilliztech/milvus-cdc/core/model"

core/reader/target_client_test.go

@@ -25,12 +25,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
-	"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
-	"github.com/milvus-io/milvus-sdk-go/v2/mocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"google.golang.org/grpc"
+
+	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
+	"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
+	"github.com/milvus-io/milvus-sdk-go/v2/mocks"
 )
 
 func TestTargetClient(t *testing.T) {

core/reader/ts_manager.go

@@ -24,11 +24,12 @@ import (
 	"sync"
 
 	"github.com/cockroachdb/errors"
-	"github.com/milvus-io/milvus/pkg/util/retry"
-	"github.com/milvus-io/milvus/pkg/util/tsoutil"
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/zap"
 
+	"github.com/milvus-io/milvus/pkg/util/retry"
+	"github.com/milvus-io/milvus/pkg/util/tsoutil"
+
 	"github.com/zilliztech/milvus-cdc/core/config"
 	"github.com/zilliztech/milvus-cdc/core/log"
 	"github.com/zilliztech/milvus-cdc/core/util"

core/util/etcd.go

@@ -27,11 +27,12 @@ import (
 	"time"
 
 	"github.com/cockroachdb/errors"
-	"github.com/milvus-io/milvus/pkg/util/retry"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 
+	"github.com/milvus-io/milvus/pkg/util/retry"
+
 	"github.com/zilliztech/milvus-cdc/core/config"
 	"github.com/zilliztech/milvus-cdc/core/log"
 )

core/util/milvus_client_resource.go

@@ -26,9 +26,10 @@ import (
 	"time"
 
 	"github.com/cockroachdb/errors"
+	"go.uber.org/zap"
+
 	"github.com/milvus-io/milvus-sdk-go/v2/client"
 	"github.com/milvus-io/milvus/pkg/util/resource"
-	"go.uber.org/zap"
 
 	"github.com/zilliztech/milvus-cdc/core/log"
 )

core/util/milvus_client_resource_test.go

@@ -26,13 +26,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"google.golang.org/grpc"
+
 	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
 	"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
 	"github.com/milvus-io/milvus-sdk-go/v2/mocks"
 	"github.com/milvus-io/milvus/pkg/util/resource"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"google.golang.org/grpc"
 )
 
 func TestNewMilvusClient(t *testing.T) {

core/util/milvus_getter_test.go

@@ -21,8 +21,9 @@ package util
 import (
 	"testing"
 
-	"github.com/milvus-io/milvus-proto/go-api/v2/msgpb"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/milvus-io/milvus-proto/go-api/v2/msgpb"
 )
 
 func TestGetCollectionNameFromRequest(t *testing.T) {

core/util/mq_wrap.go

@@ -0,0 +1,52 @@
+/*
+ * Licensed to the LF AI & Data foundation under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * //
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * //
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package util
+
+import (
+	"context"
+
+	"github.com/milvus-io/milvus/pkg/mq/msgstream"
+
+	"github.com/zilliztech/milvus-cdc/core/log"
+)
+
+type MsgStreamFactory struct {
+	innerFactory msgstream.Factory
+}
+
+func NewMsgStreamFactory(factory msgstream.Factory) msgstream.Factory {
+	if factory == nil {
+		log.Panic("the factory can't be nil")
+	}
+	return &MsgStreamFactory{
+		innerFactory: factory,
+	}
+}
+
+func (m *MsgStreamFactory) NewMsgStream(ctx context.Context) (msgstream.MsgStream, error) {
+	return m.innerFactory.NewMsgStream(ctx)
+}
+
+func (m *MsgStreamFactory) NewTtMsgStream(ctx context.Context) (msgstream.MsgStream, error) {
+	return m.innerFactory.NewMsgStream(ctx)
+}
+
+func (m *MsgStreamFactory) NewMsgStreamDisposer(ctx context.Context) func([]string, string) error {
+	return m.innerFactory.NewMsgStreamDisposer(ctx)
+}

core/util/msgpack_test.go

@@ -21,9 +21,10 @@ package util
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/milvus-io/milvus-proto/go-api/v2/msgpb"
 	"github.com/milvus-io/milvus/pkg/mq/msgstream"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestOnceChan(t *testing.T) {

core/util/pb_test.go

@@ -21,8 +21,9 @@ package util
 import (
 	"testing"
 
-	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
 )
 
 func TestConvertKVPairToMap(t *testing.T) {

core/util/retry_option_test.go

@@ -24,9 +24,10 @@ import (
 	"time"
 
 	"github.com/cockroachdb/errors"
-	"github.com/milvus-io/milvus/pkg/util/retry"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/milvus-io/milvus/pkg/util/retry"
+
 	"github.com/zilliztech/milvus-cdc/core/config"
 )
 

core/util/string.go

@@ -26,9 +26,10 @@ import (
 	"unsafe"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/milvus-io/milvus/pkg/mq/msgstream"
 	"go.uber.org/zap"
 
+	"github.com/milvus-io/milvus/pkg/mq/msgstream"
+
 	"github.com/zilliztech/milvus-cdc/core/log"
 )