diff --git a/configs/advanced/proxy.yaml b/configs/advanced/proxy.yaml index 16df144927..0d3163c0d1 100644 --- a/configs/advanced/proxy.yaml +++ b/configs/advanced/proxy.yaml @@ -28,5 +28,4 @@ proxy: bufSize: 512 maxNameLength: 255 - maxFieldNum: 64 - maxDimension: 32768 \ No newline at end of file + maxFieldNum: 64 \ No newline at end of file diff --git a/internal/allocator/segment.go b/internal/allocator/segment.go index 0efcfef522..1e2c565432 100644 --- a/internal/allocator/segment.go +++ b/internal/allocator/segment.go @@ -189,10 +189,7 @@ func (sa *SegIDAssigner) syncSegments() { for _, info := range resp.PerChannelAssignment { assign := sa.getAssign(info.CollName, info.PartitionTag, info.ChannelID) if assign == nil { - colInfos, ok := sa.assignInfos[info.CollName] - if !ok { - colInfos = list.New() - } + colInfos := sa.assignInfos[info.CollName] segInfo := make(map[UniqueID]uint32) segInfo[info.SegID] = info.Count newAssign := &assignInfo{ diff --git a/internal/core/src/query/visitors/ExecExprVisitor.cpp b/internal/core/src/query/visitors/ExecExprVisitor.cpp index 04bcd51fb3..d1b5c3d963 100644 --- a/internal/core/src/query/visitors/ExecExprVisitor.cpp +++ b/internal/core/src/query/visitors/ExecExprVisitor.cpp @@ -192,11 +192,10 @@ ExecExprVisitor::visit(RangeExpr& expr) { Assert(expr.data_type_ == field_meta.get_data_type()); RetType ret; switch (expr.data_type_) { - // case DataType::BOOL: { - // ret = ExecRangeVisitorDispatcher(expr); - // break; - //} - // case DataType::BOOL: + case DataType::BOOL: { + ret = ExecRangeVisitorDispatcher(expr); + break; + } case DataType::INT8: { ret = ExecRangeVisitorDispatcher(expr); break; diff --git a/internal/core/src/segcore/ConcurrentVector.h b/internal/core/src/segcore/ConcurrentVector.h index 46062b8950..8373b6ee2f 100644 --- a/internal/core/src/segcore/ConcurrentVector.h +++ b/internal/core/src/segcore/ConcurrentVector.h @@ -20,6 +20,7 @@ #include #include #include "utils/EasyAssert.h" +#include namespace milvus::segcore { @@ -51,7 +52,7 @@ namespace milvus::segcore { //}; template -using FixedVector = std::vector; +using FixedVector = boost::container::vector; constexpr int64_t DefaultElementPerChunk = 32 * 1024; template diff --git a/internal/proxy/paramtable.go b/internal/proxy/paramtable.go index ce36f7c628..5b6b029a0e 100644 --- a/internal/proxy/paramtable.go +++ b/internal/proxy/paramtable.go @@ -480,18 +480,6 @@ func (pt *ParamTable) MaxFieldNum() int64 { return maxFieldNum } -func (pt *ParamTable) MaxDimension() int64 { - str, err := pt.Load("proxy.maxDimension") - if err != nil { - panic(err) - } - maxDimension, err := strconv.ParseInt(str, 10, 64) - if err != nil { - panic(err) - } - return maxDimension -} - func (pt *ParamTable) defaultPartitionTag() string { tag, err := pt.Load("common.defaultPartitionTag") if err != nil { diff --git a/internal/proxy/task.go b/internal/proxy/task.go index b523813d15..65afdbfc84 100644 --- a/internal/proxy/task.go +++ b/internal/proxy/task.go @@ -181,33 +181,6 @@ func (cct *CreateCollectionTask) PreExecute() error { if err := ValidateFieldName(field.Name); err != nil { return err } - if field.DataType == schemapb.DataType_VECTOR_FLOAT || field.DataType == schemapb.DataType_VECTOR_BINARY { - exist := false - var dim int64 = 0 - for _, param := range field.TypeParams { - if param.Key == "dim" { - exist = true - tmp, err := strconv.ParseInt(param.Value, 10, 64) - if err != nil { - return err - } - dim = tmp - break - } - } - if !exist { - return errors.New("dimension is not defined in field type params") - } - if field.DataType == schemapb.DataType_VECTOR_FLOAT { - if err := ValidateDimension(dim, false); err != nil { - return err - } - } else { - if err := ValidateDimension(dim, true); err != nil { - return err - } - } - } } return nil diff --git a/internal/proxy/validate_util.go b/internal/proxy/validate_util.go index ec33005491..4f892603f9 100644 --- a/internal/proxy/validate_util.go +++ b/internal/proxy/validate_util.go @@ -116,14 +116,3 @@ func ValidateFieldName(fieldName string) error { } return nil } - -func ValidateDimension(dim int64, isBinary bool) error { - if dim <= 0 || dim > Params.MaxDimension() { - return errors.New("invalid dimension: " + strconv.FormatInt(dim, 10) + ". should be in range 1 ~ " + - strconv.FormatInt(Params.MaxDimension(), 10) + ".") - } - if isBinary && dim%8 != 0 { - return errors.New("invalid dimension: " + strconv.FormatInt(dim, 10) + ". should be multiple of 8.") - } - return nil -} diff --git a/internal/proxy/validate_util_test.go b/internal/proxy/validate_util_test.go index 3b14d78ff4..336425f9de 100644 --- a/internal/proxy/validate_util_test.go +++ b/internal/proxy/validate_util_test.go @@ -82,16 +82,3 @@ func TestValidateFieldName(t *testing.T) { assert.NotNil(t, ValidateFieldName(name)) } } - -func TestValidateDimension(t *testing.T) { - Params.Init() - assert.Nil(t, ValidateDimension(1, false)) - assert.Nil(t, ValidateDimension(Params.MaxDimension(), false)) - assert.Nil(t, ValidateDimension(8, true)) - assert.Nil(t, ValidateDimension(Params.MaxDimension(), true)) - - // invalid dim - assert.NotNil(t, ValidateDimension(-1, false)) - assert.NotNil(t, ValidateDimension(Params.MaxDimension()+1, false)) - assert.NotNil(t, ValidateDimension(9, true)) -}