Skip to content

Commit

Permalink
enhance: Use mockery pkg config for datacoord&datanode (milvus-io#39567)
Browse files Browse the repository at this point in the history
Related to milvus-io#38339

Signed-off-by: Congqi Xia <[email protected]>
  • Loading branch information
congqixia authored Jan 24, 2025
1 parent 16cbdfb commit 6d8441a
Show file tree
Hide file tree
Showing 11 changed files with 92 additions and 22 deletions.
21 changes: 2 additions & 19 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
42 changes: 42 additions & 0 deletions internal/datacoord/.mockery.yaml
Original file line number Diff line number Diff line change
@@ -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:

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 17 additions & 0 deletions internal/datanode/.mockery.yaml
Original file line number Diff line number Diff line change
@@ -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:
22 changes: 21 additions & 1 deletion internal/datanode/allocator/mock_allocator.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/datanode/compaction/mock_compactor.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6d8441a

Please sign in to comment.