milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enhance: use the insert rate limit for the upsert request (#34615) 

- issue: #34614

Signed-off-by: SimFG <bang.fu@zilliz.com>
pull/34661/head
SimFG 2024-07-12 16:17:35 +08:00 committed by GitHub
parent 531092c031
commit d8e68cbb97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/proxy/rate_limit_interceptor.go
View File

@ -134,7 +134,7 @@ func getRequestInfo(ctx context.Context, req interface{}) (int64, map[int64][]in
return dbID, collToPartIDs, internalpb.RateType_DMLInsert, proto.Size(r), err return dbID, collToPartIDs, internalpb.RateType_DMLInsert, proto.Size(r), err
case *milvuspb.UpsertRequest: case *milvuspb.UpsertRequest:
dbID, collToPartIDs, err := getCollectionAndPartitionID(ctx, req.(reqPartName)) dbID, collToPartIDs, err := getCollectionAndPartitionID(ctx, req.(reqPartName))
return dbID, collToPartIDs, internalpb.RateType_DMLUpsert, proto.Size(r), err return dbID, collToPartIDs, internalpb.RateType_DMLInsert, proto.Size(r), err
case *milvuspb.DeleteRequest: case *milvuspb.DeleteRequest:
dbID, collToPartIDs, err := getCollectionAndPartitionID(ctx, req.(reqPartName)) dbID, collToPartIDs, err := getCollectionAndPartitionID(ctx, req.(reqPartName))
return dbID, collToPartIDs, internalpb.RateType_DMLDelete, proto.Size(r), err return dbID, collToPartIDs, internalpb.RateType_DMLDelete, proto.Size(r), err

2
internal/proxy/rate_limit_interceptor_test.go
View File

@ -96,7 +96,7 @@ func TestRateLimitInterceptor(t *testing.T) {
PartitionName: "p1", PartitionName: "p1",
DbName: "db1", DbName: "db1",
}), size) }), size)
assert.Equal(t, internalpb.RateType_DMLUpsert, rt) assert.Equal(t, internalpb.RateType_DMLInsert, rt)
assert.Equal(t, database, int64(100)) assert.Equal(t, database, int64(100))
assert.True(t, len(col2part) == 1) assert.True(t, len(col2part) == 1)
assert.Equal(t, int64(10), col2part[1][0]) assert.Equal(t, int64(10), col2part[1][0])

1
pkg/common/common.go
View File

@ -23,6 +23,7 @@ import (
"strings" "strings"
"github.com/cockroachdb/errors" "github.com/cockroachdb/errors"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "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-proto/go-api/v2/schemapb"
) )