diff --git a/Makefile b/Makefile index 89a2d8e13df7a..5e44a7d959499 100644 --- a/Makefile +++ b/Makefile @@ -472,27 +472,10 @@ generate-mockery-querynode-without-cpp: generate-mockery-querynode: build-cpp generate-mockery-querynode-without-cpp generate-mockery-datacoord: getdeps - $(INSTALL_PATH)/mockery --name=compactionPlanContext --dir=internal/datacoord --filename=mock_compaction_plan_context.go --output=internal/datacoord --structname=MockCompactionPlanContext --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=Handler --dir=internal/datacoord --filename=mock_handler.go --output=internal/datacoord --structname=NMockHandler --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=Allocator --dir=internal/datacoord/allocator --filename=mock_allocator.go --output=internal/datacoord/allocator --structname=MockAllocator --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=DataNodeManager --dir=internal/datacoord/session --filename=mock_datanode_manager.go --output=internal/datacoord/session --structname=MockDataNodeManager --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=RWChannelStore --dir=internal/datacoord --filename=mock_channel_store.go --output=internal/datacoord --structname=MockRWChannelStore --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=IndexEngineVersionManager --dir=internal/datacoord --filename=mock_index_engine_version_manager.go --output=internal/datacoord --structname=MockVersionManager --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=TriggerManager --dir=internal/datacoord --filename=mock_trigger_manager.go --output=internal/datacoord --structname=MockTriggerManager --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=Cluster --dir=internal/datacoord --filename=mock_cluster.go --output=internal/datacoord --structname=MockCluster --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=compactionPlanContext --dir=internal/datacoord --filename=mock_compaction_plan_context.go --output=internal/datacoord --structname=MockCompactionPlanContext --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=CompactionMeta --dir=internal/datacoord --filename=mock_compaction_meta.go --output=internal/datacoord --structname=MockCompactionMeta --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=ChannelManager --dir=internal/datacoord --filename=mock_channelmanager.go --output=internal/datacoord --structname=MockChannelManager --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=SubCluster --dir=internal/datacoord --filename=mock_subcluster.go --output=internal/datacoord --structname=MockSubCluster --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=Broker --dir=internal/datacoord/broker --filename=mock_coordinator_broker.go --output=internal/datacoord/broker --structname=MockBroker --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=WorkerManager --dir=internal/datacoord/session --filename=mock_worker_manager.go --output=internal/datacoord/session --structname=MockWorkerManager --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=Manager --dir=internal/datacoord --filename=mock_segment_manager.go --output=internal/datacoord --structname=MockManager --with-expecter --inpackage - $(INSTALL_PATH)/mockery --name=StatsJobManager --dir=internal/datacoord --filename=mock_job_manager.go --output=internal/datacoord --structname=MockStatsJobManager --with-expecter --inpackage + $(INSTALL_PATH)/mockery --config $(PWD)/internal/datacoord/.mockery.yaml generate-mockery-datanode: getdeps - $(INSTALL_PATH)/mockery --name=Allocator --dir=$(PWD)/internal/datanode/allocator --output=$(PWD)/internal/datanode/allocator --filename=mock_allocator.go --with-expecter --structname=MockAllocator --outpkg=allocator --inpackage - $(INSTALL_PATH)/mockery --name=ChannelManager --dir=$(PWD)/internal/datanode/channel --output=$(PWD)/internal/datanode/channel --filename=mock_channelmanager.go --with-expecter --structname=MockChannelManager --outpkg=channel --inpackage - $(INSTALL_PATH)/mockery --name=Compactor --dir=$(PWD)/internal/datanode/compaction --output=$(PWD)/internal/datanode/compaction --filename=mock_compactor.go --with-expecter --structname=MockCompactor --outpkg=compaction --inpackage + $(INSTALL_PATH)/mockery --config $(PWD)/internal/datanode/.mockery.yaml generate-mockery-flushcommon: getdeps $(INSTALL_PATH)/mockery --name=Broker --dir=$(PWD)/internal/flushcommon/broker --output=$(PWD)/internal/flushcommon/broker/ --filename=mock_broker.go --with-expecter --structname=MockBroker --outpkg=broker --inpackage diff --git a/internal/datacoord/.mockery.yaml b/internal/datacoord/.mockery.yaml new file mode 100644 index 0000000000000..e051a42835fa9 --- /dev/null +++ b/internal/datacoord/.mockery.yaml @@ -0,0 +1,42 @@ +quiet: False +with-expecter: True +inpackage: True +filename: "mock_{{.InterfaceNameSnake}}.go" +mockname: "Mock{{.InterfaceName}}" +outpkg: "{{.PackageName}}" +dir: "{{.InterfaceDir}}" +packages: + github.com/milvus-io/milvus/internal/datacoord: + interfaces: + compactionPlanContext: + config: + mockname: MockCompactionPlanContext + Handler: + config: + mockname: NMockHandler + RWChannelStore: + config: + filename: mock_channel_store.go + IndexEngineVersionManager: + config: + mockname: MockVersionManager + Manager: + config: + filename: mock_segment_manager.go + TriggerManager: + Cluster: + CompactionMeta: + ChannelManager: + SubCluster: + StatsJobManager: + github.com/milvus-io/milvus/internal/datacoord/allocator: + interfaces: + Allocator: + github.com/milvus-io/milvus/internal/datacoord/broker: + interfaces: + Broker: + github.com/milvus-io/milvus/internal/datacoord/session: + interfaces: + DataNodeManager: + WorkerManager: + \ No newline at end of file diff --git a/internal/datacoord/broker/mock_coordinator_broker.go b/internal/datacoord/broker/mock_broker.go similarity index 100% rename from internal/datacoord/broker/mock_coordinator_broker.go rename to internal/datacoord/broker/mock_broker.go diff --git a/internal/datacoord/mock_channelmanager.go b/internal/datacoord/mock_channel_manager.go similarity index 100% rename from internal/datacoord/mock_channelmanager.go rename to internal/datacoord/mock_channel_manager.go diff --git a/internal/datacoord/mock_job_manager.go b/internal/datacoord/mock_stats_job_manager.go similarity index 100% rename from internal/datacoord/mock_job_manager.go rename to internal/datacoord/mock_stats_job_manager.go diff --git a/internal/datacoord/mock_subcluster.go b/internal/datacoord/mock_sub_cluster.go similarity index 100% rename from internal/datacoord/mock_subcluster.go rename to internal/datacoord/mock_sub_cluster.go diff --git a/internal/datacoord/session/mock_datanode_manager.go b/internal/datacoord/session/mock_data_node_manager.go similarity index 100% rename from internal/datacoord/session/mock_datanode_manager.go rename to internal/datacoord/session/mock_data_node_manager.go diff --git a/internal/datanode/.mockery.yaml b/internal/datanode/.mockery.yaml new file mode 100644 index 0000000000000..f4beebe8d4fc2 --- /dev/null +++ b/internal/datanode/.mockery.yaml @@ -0,0 +1,17 @@ +quiet: False +with-expecter: True +inpackage: True +filename: "mock_{{.InterfaceNameSnake}}.go" +mockname: "Mock{{.InterfaceName}}" +outpkg: "{{.PackageName}}" +dir: "{{.InterfaceDir}}" +packages: + github.com/milvus-io/milvus/internal/datanode/allocator: + interfaces: + Allocator: + github.com/milvus-io/milvus/internal/datanode/channel: + interfaces: + ChannelManager: + github.com/milvus-io/milvus/internal/datanode/compaction: + interfaces: + Compactor: diff --git a/internal/datanode/allocator/mock_allocator.go b/internal/datanode/allocator/mock_allocator.go index 65b7834592067..bc266733aeca1 100644 --- a/internal/datanode/allocator/mock_allocator.go +++ b/internal/datanode/allocator/mock_allocator.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.32.4. DO NOT EDIT. +// Code generated by mockery v2.46.0. DO NOT EDIT. package allocator @@ -24,6 +24,10 @@ func (_m *MockAllocator) EXPECT() *MockAllocator_Expecter { func (_m *MockAllocator) Alloc(count uint32) (int64, int64, error) { ret := _m.Called(count) + if len(ret) == 0 { + panic("no return value specified for Alloc") + } + var r0 int64 var r1 int64 var r2 error @@ -83,6 +87,10 @@ func (_c *MockAllocator_Alloc_Call) RunAndReturn(run func(uint32) (int64, int64, func (_m *MockAllocator) AllocOne() (int64, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for AllocOne") + } + var r0 int64 var r1 error if rf, ok := ret.Get(0).(func() (int64, error)); ok { @@ -166,6 +174,10 @@ func (_c *MockAllocator_Close_Call) RunAndReturn(run func()) *MockAllocator_Clos func (_m *MockAllocator) GetGenerator(count int, done <-chan struct{}) (<-chan int64, error) { ret := _m.Called(count, done) + if len(ret) == 0 { + panic("no return value specified for GetGenerator") + } + var r0 <-chan int64 var r1 error if rf, ok := ret.Get(0).(func(int, <-chan struct{}) (<-chan int64, error)); ok { @@ -221,6 +233,10 @@ func (_c *MockAllocator_GetGenerator_Call) RunAndReturn(run func(int, <-chan str func (_m *MockAllocator) GetIDAlloactor() *internalallocator.IDAllocator { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetIDAlloactor") + } + var r0 *internalallocator.IDAllocator if rf, ok := ret.Get(0).(func() *internalallocator.IDAllocator); ok { r0 = rf() @@ -264,6 +280,10 @@ func (_c *MockAllocator_GetIDAlloactor_Call) RunAndReturn(run func() *internalal func (_m *MockAllocator) Start() error { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Start") + } + var r0 error if rf, ok := ret.Get(0).(func() error); ok { r0 = rf() diff --git a/internal/datanode/channel/mock_channelmanager.go b/internal/datanode/channel/mock_channel_manager.go similarity index 96% rename from internal/datanode/channel/mock_channelmanager.go rename to internal/datanode/channel/mock_channel_manager.go index 307934a0fc0ac..efc39da872207 100644 --- a/internal/datanode/channel/mock_channelmanager.go +++ b/internal/datanode/channel/mock_channel_manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.32.4. DO NOT EDIT. +// Code generated by mockery v2.46.0. DO NOT EDIT. package channel @@ -56,6 +56,10 @@ func (_c *MockChannelManager_Close_Call) RunAndReturn(run func()) *MockChannelMa func (_m *MockChannelManager) GetProgress(info *datapb.ChannelWatchInfo) *datapb.ChannelOperationProgressResponse { ret := _m.Called(info) + if len(ret) == 0 { + panic("no return value specified for GetProgress") + } + var r0 *datapb.ChannelOperationProgressResponse if rf, ok := ret.Get(0).(func(*datapb.ChannelWatchInfo) *datapb.ChannelOperationProgressResponse); ok { r0 = rf(info) @@ -132,6 +136,10 @@ func (_c *MockChannelManager_Start_Call) RunAndReturn(run func()) *MockChannelMa func (_m *MockChannelManager) Submit(info *datapb.ChannelWatchInfo) error { ret := _m.Called(info) + if len(ret) == 0 { + panic("no return value specified for Submit") + } + var r0 error if rf, ok := ret.Get(0).(func(*datapb.ChannelWatchInfo) error); ok { r0 = rf(info) diff --git a/internal/datanode/compaction/mock_compactor.go b/internal/datanode/compaction/mock_compactor.go index 2ebb0e8e8798b..394fceb43fe59 100644 --- a/internal/datanode/compaction/mock_compactor.go +++ b/internal/datanode/compaction/mock_compactor.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.46.0. DO NOT EDIT. package compaction