Skip to content

Commit 9630974

Browse files
authored
enhance: move rocksmq from internal to pkg module (milvus-io#33881)
issue: milvus-io#33956 Signed-off-by: jaime <yun.zhang@zilliz.com>
1 parent c65f41d commit 9630974

174 files changed

Lines changed: 848 additions & 1211 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ internal/core/build/*
1818
**/.idea/*
1919
internal/msgstream/pulsarms/client-cpp/build/
2020
internal/msgstream/pulsarms/client-cpp/build/*
21-
internal/kv/rocksdb/cwrapper/output/
2221
tests/python_client/default.etcd/
2322

2423
# vscode generated files
@@ -97,7 +96,6 @@ deployments/docker/gpu/*/volumes
9796

9897
# rocksdb
9998
cwrapper_rocksdb_build/
100-
internal/kv/rocksdb/cwrapper/
10199

102100
# local file data
103101
**/data/*

cmd/milvus/mck.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ import (
1717
"go.uber.org/zap"
1818

1919
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
20-
"github.com/milvus-io/milvus/internal/kv"
2120
etcdkv "github.com/milvus-io/milvus/internal/kv/etcd"
2221
"github.com/milvus-io/milvus/internal/proto/datapb"
2322
pb "github.com/milvus-io/milvus/internal/proto/etcdpb"
2423
"github.com/milvus-io/milvus/internal/proto/querypb"
2524
"github.com/milvus-io/milvus/internal/storage"
25+
"github.com/milvus-io/milvus/pkg/kv"
2626
"github.com/milvus-io/milvus/pkg/log"
2727
"github.com/milvus-io/milvus/pkg/util/etcd"
2828
"github.com/milvus-io/milvus/pkg/util/logutil"

cmd/roles/roles.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ import (
3535
"github.com/milvus-io/milvus/cmd/components"
3636
"github.com/milvus-io/milvus/internal/http"
3737
"github.com/milvus-io/milvus/internal/http/healthz"
38-
rocksmqimpl "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server"
3938
"github.com/milvus-io/milvus/internal/util/dependency"
4039
kvfactory "github.com/milvus-io/milvus/internal/util/dependency/kv"
4140
"github.com/milvus-io/milvus/internal/util/initcore"
4241
internalmetrics "github.com/milvus-io/milvus/internal/util/metrics"
4342
"github.com/milvus-io/milvus/pkg/config"
4443
"github.com/milvus-io/milvus/pkg/log"
4544
"github.com/milvus-io/milvus/pkg/metrics"
45+
rocksmqimpl "github.com/milvus-io/milvus/pkg/mq/mqimpl/rocksmq/server"
4646
"github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/nmq"
4747
"github.com/milvus-io/milvus/pkg/tracer"
4848
"github.com/milvus-io/milvus/pkg/util/etcd"

cmd/tools/migration/backend/etcd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
clientv3 "go.etcd.io/etcd/client/v3"
55

66
"github.com/milvus-io/milvus/cmd/tools/migration/configs"
7-
"github.com/milvus-io/milvus/internal/kv"
87
etcdkv "github.com/milvus-io/milvus/internal/kv/etcd"
8+
"github.com/milvus-io/milvus/pkg/kv"
99
"github.com/milvus-io/milvus/pkg/util/etcd"
1010
)
1111

cmd/tools/migration/mmap/tool/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"time"
99

1010
"github.com/milvus-io/milvus/cmd/tools/migration/mmap"
11-
"github.com/milvus-io/milvus/internal/kv"
1211
etcdkv "github.com/milvus-io/milvus/internal/kv/etcd"
1312
kv_tikv "github.com/milvus-io/milvus/internal/kv/tikv"
1413
"github.com/milvus-io/milvus/internal/metastore"
@@ -17,6 +16,7 @@ import (
1716
"github.com/milvus-io/milvus/internal/rootcoord"
1817
"github.com/milvus-io/milvus/internal/tso"
1918
"github.com/milvus-io/milvus/internal/util/tsoutil"
19+
"github.com/milvus-io/milvus/pkg/kv"
2020
"github.com/milvus-io/milvus/pkg/log"
2121
"github.com/milvus-io/milvus/pkg/util"
2222
"github.com/milvus-io/milvus/pkg/util/etcd"

internal/allocator/global_id_allocator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package allocator
1818

1919
import (
20-
"github.com/milvus-io/milvus/internal/kv"
2120
"github.com/milvus-io/milvus/internal/tso"
21+
"github.com/milvus-io/milvus/pkg/kv"
2222
"github.com/milvus-io/milvus/pkg/util/typeutil"
2323
)
2424

internal/datacoord/channel_checker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"go.uber.org/atomic"
2828
"go.uber.org/zap"
2929

30-
"github.com/milvus-io/milvus/internal/kv"
3130
"github.com/milvus-io/milvus/internal/proto/datapb"
31+
"github.com/milvus-io/milvus/pkg/kv"
3232
"github.com/milvus-io/milvus/pkg/log"
3333
"github.com/milvus-io/milvus/pkg/util/typeutil"
3434
)

internal/datacoord/channel_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
clientv3 "go.etcd.io/etcd/client/v3"
2727
"go.uber.org/zap"
2828

29-
"github.com/milvus-io/milvus/internal/kv"
3029
"github.com/milvus-io/milvus/internal/proto/datapb"
3130
"github.com/milvus-io/milvus/pkg/common"
31+
"github.com/milvus-io/milvus/pkg/kv"
3232
"github.com/milvus-io/milvus/pkg/log"
3333
"github.com/milvus-io/milvus/pkg/mq/msgstream"
3434
"github.com/milvus-io/milvus/pkg/util/funcutil"

internal/datacoord/channel_manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import (
3030
"github.com/stretchr/testify/require"
3131
"go.uber.org/atomic"
3232

33-
"github.com/milvus-io/milvus/internal/kv"
3433
"github.com/milvus-io/milvus/internal/proto/datapb"
3534
"github.com/milvus-io/milvus/internal/util/dependency"
3635
"github.com/milvus-io/milvus/pkg/common"
36+
"github.com/milvus-io/milvus/pkg/kv"
3737
"github.com/milvus-io/milvus/pkg/util/paramtable"
3838
)
3939

internal/datacoord/channel_manager_v2.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"github.com/samber/lo"
2828
"go.uber.org/zap"
2929

30-
"github.com/milvus-io/milvus/internal/kv"
3130
"github.com/milvus-io/milvus/internal/proto/datapb"
31+
"github.com/milvus-io/milvus/pkg/kv"
3232
"github.com/milvus-io/milvus/pkg/log"
3333
"github.com/milvus-io/milvus/pkg/util/conc"
3434
"github.com/milvus-io/milvus/pkg/util/lock"

0 commit comments

Comments
 (0)