Commit 0d02de8a authored by 余昆's avatar 余昆
Browse files

Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk 


Former-commit-id: 169c49c577f0de6b329fa0d5706f133e44b13ed0
parents c9e825aa 7142dd73

cpp/CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-577 - Unittest Query randomly hung

- MS-587 - Count get wrong result after adding vectors and index built immediately

- MS-599 - search wrong result when table created with metric_type: IP

- MS-601 - Docker logs error caused by get CPUTemperature error



## Improvement

- MS-552 - Add and change the easylogging library
@@ -28,6 +29,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-609 - Update task construct function

- MS-611 - Add resources validity check in ResourceMgr

- MS-619 - Add optimizer class in scheduler

- MS-614 - Preload table at startup



## New Feature

cpp/README.md

+14 −6
Original line number Diff line number Diff line
@@ -105,13 +105,20 @@ please reinstall CMake with curl: 
   ```



##### code format and linting



Install clang-format and clang-tidy

```shell

CentOS 7:   

$ yum install clang

Ubuntu 16.04 or 18.04: 

$ sudo apt-get install clang-format clang-tidy

    

Ubuntu 16.04: 

$ sudo apt-get install clang-tidy

$ wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -

$ sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main"

$ sudo apt-get update

$ sudo apt-get install clang-format-6.0

Ubuntu 18.04: 

$ sudo apt-get install clang-tidy clang-format

```  

```shell

$ ./build.sh -l

```
@@ -122,13 +129,14 @@ $ ./build.sh -u 
```



##### Run code coverage



Install lcov

```shell

CentOS 7:   

$ yum install lcov

Ubuntu 16.04 or 18.04: 

$ sudo apt-get install lcov

    

``` 

```shell  

$ ./build.sh -u -c

```

cpp/conf/server_config.template

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ db_config: 
                                    # sum of insert_buffer_size and cpu_cache_capacity cannot exceed total memory

  build_index_gpu: 0                # gpu id used for building index



  preload_table:                    # preload data at startup, '*' means load all tables, empty value means no preload

                                    # you can specify preload tables like this: table1,table2,table3



metric_config:

  enable_monitor: false             # enable monitoring or not

  collector: prometheus             # prometheus

cpp/coverage.sh

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \ 
    "src/metrics/MetricBase.h"\

    "src/server/Server.cpp"\

    "src/server/DBWrapper.cpp"\

    "src/server/grpc_impl/GrpcMilvusServer.cpp"\

    "src/server/grpc_impl/GrpcServer.cpp"\

    "src/utils/easylogging++.h"\

    "src/utils/easylogging++.cc"\

cpp/src/core/knowhere/knowhere/common/Buffer.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct BufferDeleter { 
        free((void*)buffer->data());

    }

};

}

}  // namespace internal



inline BufferPtr

MakeBufferSmart(uint8_t* data, const int64_t size) {