Unverified Commit c60babeb authored by BossZou's avatar BossZou Committed by GitHub
Browse files

Upgrade mishards to 0.8.0 (#1933) 



* update grpc server of milvus & rename table name to collection

Signed-off-by: default avatarYhz <yinghao.zou@zilliz.com>

* update changlog

Signed-off-by: default avatarYhz <yinghao.zou@zilliz.com>

* [skip ci] Skip CI

Signed-off-by: default avatarYhz <yinghao.zou@zilliz.com>

* [skip ci] Update changlog

Signed-off-by: default avatarYhz <yinghao.zou@zilliz.com>
parent 8d5ab34a

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ Please mark all change in change log and use the issue from GitHub 
-   \#1885 Optimize knowhere unittest

-   \#1886 Refactor log on search and insert request

-   \#1897 Heap pop and push can be realized by heap_swap_top

-   \#1930 Upgrade mishards to 0.8.0



## Task

shards/mishards/exception_codes.py

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ CONNECT_ERROR_CODE = 10001 
CONNECTTION_NOT_FOUND_CODE = 10002

DB_ERROR_CODE = 10003



TABLE_NOT_FOUND_CODE = 20001

COLLECTION_NOT_FOUND_CODE = 20001

INVALID_ARGUMENT_CODE = 20002

INVALID_DATE_RANGE_CODE = 20003

INVALID_TOPK_CODE = 20004

shards/mishards/exception_handlers.py

+10 −10
Original line number Diff line number Diff line
@@ -30,23 +30,23 @@ def resp_handler(err, error_code): 
                          ids=[],

                          distances=[])



    if resp_class == milvus_pb2.TableRowCount:

        return resp_class(status=status, table_row_count=-1)

    if resp_class == milvus_pb2.CollectionRowCount:

        return resp_class(status=status, collection_row_count=-1)



    if resp_class == milvus_pb2.TableName:

        return resp_class(status=status, table_name=[])

    if resp_class == milvus_pb2.CollectionName:

        return resp_class(status=status, collection_name=[])



    if resp_class == milvus_pb2.StringReply:

        return resp_class(status=status, string_reply='')



    if resp_class == milvus_pb2.TableSchema:

        return milvus_pb2.TableSchema(

    if resp_class == milvus_pb2.CollectionSchema:

        return milvus_pb2.CollectionSchema(

            status=status

        )



    if resp_class == milvus_pb2.IndexParam:

        return milvus_pb2.IndexParam(

            table_name=milvus_pb2.TableName(

            collection_name=milvus_pb2.CollectionName(

                status=status

            )

        )
@@ -55,10 +55,10 @@ def resp_handler(err, error_code): 
    return status





@server.errorhandler(exceptions.TableNotFoundError)

def TableNotFoundErrorHandler(err):

@server.errorhandler(exceptions.CollectionNotFoundError)

def CollectionNotFoundErrorHandler(err):

    logger.error(err)

    return resp_handler(err, status_pb2.TABLE_NOT_EXISTS)

    return resp_handler(err, status_pb2.COLLECTION_NOT_EXISTS)





@server.errorhandler(exceptions.InvalidTopKError)

shards/mishards/exceptions.py

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ class DBError(BaseException): 
    code = codes.DB_ERROR_CODE





class TableNotFoundError(BaseException):

    code = codes.TABLE_NOT_FOUND_CODE

class CollectionNotFoundError(BaseException):

    code = codes.COLLECTION_NOT_FOUND_CODE





class InvalidTopKError(BaseException):

shards/mishards/grpc_utils/grpc_args_parser.py

+19 −19
Original line number Diff line number Diff line
@@ -20,25 +20,25 @@ class GrpcArgsParser(object): 


    @classmethod

    @error_status

    def parse_proto_TableSchema(cls, param):

        _table_schema = {

            'collection_name': param.table_name,

    def parse_proto_CollectionSchema(cls, param):

        _collection_schema = {

            'collection_name': param.collection_name,

            'dimension': param.dimension,

            'index_file_size': param.index_file_size,

            'metric_type': param.metric_type

        }



        return param.status, _table_schema

        return param.status, _collection_schema



    @classmethod

    @error_status

    def parse_proto_TableName(cls, param):

        return param.table_name

    def parse_proto_CollectionName(cls, param):

        return param.collection_name



    @classmethod

    @error_status

    def parse_proto_FlushParam(cls, param):

        return list(param.table_name_array)

        return list(param.collection_name_array)



    @classmethod

    @error_status
@@ -53,7 +53,7 @@ class GrpcArgsParser(object): 
    @classmethod

    @error_status

    def parse_proto_IndexParam(cls, param):

        _table_name = param.table_name

        _collection_name = param.collection_name

        _index_type = param.index_type

        _index_param = {}
@@ -61,7 +61,7 @@ class GrpcArgsParser(object): 
            if params.key == 'params':

                _index_param = ujson.loads(str(params.value))



        return _table_name, _index_type, _index_param

        return _collection_name, _index_type, _index_param



    @classmethod

    @error_status
@@ -77,15 +77,15 @@ class GrpcArgsParser(object): 


    @classmethod

    def parse_proto_PartitionParam(cls, param):

        _table_name = param.table_name

        _collection_name = param.collection_name

        _tag = param.tag



        return _table_name, _tag

        return _collection_name, _tag



    @classmethod

    @error_status

    def parse_proto_SearchParam(cls, param):

        _table_name = param.table_name

        _collection_name = param.collection_name

        _topk = param.topk



        if len(param.extra_params) == 0:
@@ -102,28 +102,28 @@ class GrpcArgsParser(object): 
        else:

            raise Exception("Search argument parse error: record array is empty")



        return _table_name, _query_record_array, _topk, _params

        return _collection_name, _query_record_array, _topk, _params



    @classmethod

    @error_status

    def parse_proto_DeleteByIDParam(cls, param):

        _table_name = param.table_name

        _collection_name = param.collection_name

        _id_array = list(param.id_array)



        return _table_name, _id_array

        return _collection_name, _id_array



    @classmethod

    @error_status

    def parse_proto_VectorIdentity(cls, param):

        _table_name = param.table_name

        _collection_name = param.collection_name

        _id = param.id



        return _table_name, _id

        return _collection_name, _id



    @classmethod

    @error_status

    def parse_proto_GetVectorIDsParam(cls, param):

        _table__name = param.table_name

        _collection__name = param.collection_name

        _segment_name = param.segment_name



        return _table__name, _segment_name
 
        return _collection__name, _segment_name