提交 430b4858 编写于 作者: H Heisenberg

Merge branch 'branch-0.5.0' into fix_thermal_bug


Former-commit-id: cf72cc68bba0ccabd4075ec4b81e01e9589d93e7
...@@ -105,13 +105,20 @@ please reinstall CMake with curl: ...@@ -105,13 +105,20 @@ please reinstall CMake with curl:
``` ```
##### code format and linting ##### code format and linting
Install clang-format and clang-tidy
```shell ```shell
CentOS 7: CentOS 7:
$ yum install clang $ yum install clang
Ubuntu 16.04 or 18.04: Ubuntu 16.04:
$ sudo apt-get install clang-format clang-tidy $ 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 $ ./build.sh -l
``` ```
...@@ -122,13 +129,14 @@ $ ./build.sh -u ...@@ -122,13 +129,14 @@ $ ./build.sh -u
``` ```
##### Run code coverage ##### Run code coverage
Install lcov
```shell ```shell
CentOS 7: CentOS 7:
$ yum install lcov $ yum install lcov
Ubuntu 16.04 or 18.04: Ubuntu 16.04 or 18.04:
$ sudo apt-get install lcov $ sudo apt-get install lcov
```
```shell
$ ./build.sh -u -c $ ./build.sh -u -c
``` ```
......
...@@ -76,7 +76,7 @@ ConvertToDataset(std::vector<SPTAG::QueryResult> query_results) { ...@@ -76,7 +76,7 @@ ConvertToDataset(std::vector<SPTAG::QueryResult> query_results) {
auto p_id = (int64_t*)malloc(sizeof(int64_t) * elems); auto p_id = (int64_t*)malloc(sizeof(int64_t) * elems);
auto p_dist = (float*)malloc(sizeof(float) * elems); auto p_dist = (float*)malloc(sizeof(float) * elems);
// TODO: throw if malloc failed. // TODO: throw if malloc failed.
#pragma omp parallel for #pragma omp parallel for
for (auto i = 0; i < query_results.size(); ++i) { for (auto i = 0; i < query_results.size(); ++i) {
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
// specific language governing permissions and limitations // specific language governing permissions and limitations
// under the License. // under the License.
#include <faiss/IndexIVFPQ.h>
#include <faiss/gpu/GpuAutoTune.h> #include <faiss/gpu/GpuAutoTune.h>
#include <faiss/gpu/GpuIndexIVFPQ.h> #include <faiss/gpu/GpuIndexIVFPQ.h>
#include <memory> #include <memory>
......
...@@ -296,7 +296,8 @@ DBImpl::CreateIndex(const std::string& table_id, const TableIndex& index) { ...@@ -296,7 +296,8 @@ DBImpl::CreateIndex(const std::string& table_id, const TableIndex& index) {
std::vector<int> file_types; std::vector<int> file_types;
if (index.engine_type_ == static_cast<int32_t>(EngineType::FAISS_IDMAP)) { if (index.engine_type_ == static_cast<int32_t>(EngineType::FAISS_IDMAP)) {
file_types = { file_types = {
static_cast<int32_t>(meta::TableFileSchema::NEW), static_cast<int32_t>(meta::TableFileSchema::NEW_MERGE), static_cast<int32_t>(meta::TableFileSchema::NEW),
static_cast<int32_t>(meta::TableFileSchema::NEW_MERGE),
}; };
} else { } else {
file_types = { file_types = {
......
...@@ -55,9 +55,9 @@ MemTableFile::CreateTableFile() { ...@@ -55,9 +55,9 @@ MemTableFile::CreateTableFile() {
Status Status
MemTableFile::Add(const VectorSourcePtr& source, IDNumbers& vector_ids) { MemTableFile::Add(const VectorSourcePtr& source, IDNumbers& vector_ids) {
if (table_file_schema_.dimension_ <= 0) { if (table_file_schema_.dimension_ <= 0) {
std::string err_msg = "MemTableFile::Add: table_file_schema dimension = " + std::string err_msg =
std::to_string(table_file_schema_.dimension_) + ", table_id = " + "MemTableFile::Add: table_file_schema dimension = " + std::to_string(table_file_schema_.dimension_) +
table_file_schema_.table_id_; ", table_id = " + table_file_schema_.table_id_;
ENGINE_LOG_ERROR << err_msg; ENGINE_LOG_ERROR << err_msg;
return Status(DB_ERROR, "Not able to create table file"); return Status(DB_ERROR, "Not able to create table file");
} }
......
...@@ -148,15 +148,18 @@ static const MetaSchema TABLES_SCHEMA(META_TABLES, { ...@@ -148,15 +148,18 @@ static const MetaSchema TABLES_SCHEMA(META_TABLES, {
}); });
// TableFiles schema // TableFiles schema
static const MetaSchema TABLEFILES_SCHEMA( static const MetaSchema TABLEFILES_SCHEMA(META_TABLEFILES, {
META_TABLEFILES, MetaField("id", "BIGINT", "PRIMARY KEY AUTO_INCREMENT"),
{ MetaField("table_id", "VARCHAR(255)", "NOT NULL"),
MetaField("id", "BIGINT", "PRIMARY KEY AUTO_INCREMENT"), MetaField("table_id", "VARCHAR(255)", "NOT NULL"), MetaField("engine_type", "INT", "DEFAULT 1 NOT NULL"),
MetaField("engine_type", "INT", "DEFAULT 1 NOT NULL"), MetaField("file_id", "VARCHAR(255)", "NOT NULL"), MetaField("file_id", "VARCHAR(255)", "NOT NULL"),
MetaField("file_type", "INT", "DEFAULT 0 NOT NULL"), MetaField("file_size", "BIGINT", "DEFAULT 0 NOT NULL"), MetaField("file_type", "INT", "DEFAULT 0 NOT NULL"),
MetaField("row_count", "BIGINT", "DEFAULT 0 NOT NULL"), MetaField("updated_time", "BIGINT", "NOT NULL"), MetaField("file_size", "BIGINT", "DEFAULT 0 NOT NULL"),
MetaField("created_on", "BIGINT", "NOT NULL"), MetaField("date", "INT", "DEFAULT -1 NOT NULL"), MetaField("row_count", "BIGINT", "DEFAULT 0 NOT NULL"),
}); MetaField("updated_time", "BIGINT", "NOT NULL"),
MetaField("created_on", "BIGINT", "NOT NULL"),
MetaField("date", "INT", "DEFAULT -1 NOT NULL"),
});
} // namespace } // namespace
......
...@@ -157,8 +157,8 @@ XSearchTask::Load(LoadType type, uint8_t device_id) { ...@@ -157,8 +157,8 @@ XSearchTask::Load(LoadType type, uint8_t device_id) {
size_t file_size = index_engine_->PhysicalSize(); size_t file_size = index_engine_->PhysicalSize();
std::string info = "Load file id:" + std::to_string(file_->id_) + " file type:" + std::string info = "Load file id:" + std::to_string(file_->id_) +
std::to_string(file_->file_type_) + " size:" + std::to_string(file_size) + " file type:" + std::to_string(file_->file_type_) + " size:" + std::to_string(file_size) +
" bytes from location: " + file_->location_ + " totally cost"; " bytes from location: " + file_->location_ + " totally cost";
double span = rc.ElapseFromBegin(info); double span = rc.ElapseFromBegin(info);
// for (auto &context : search_contexts_) { // for (auto &context : search_contexts_) {
......
...@@ -511,8 +511,8 @@ InsertTask::OnExecute() { ...@@ -511,8 +511,8 @@ InsertTask::OnExecute() {
} }
// step 6: update table flag // step 6: update table flag
user_provide_ids ? table_info.flag_ |= engine::meta::FLAG_MASK_HAS_USERID : table_info.flag_ |= user_provide_ids ? table_info.flag_ |= engine::meta::FLAG_MASK_HAS_USERID
engine::meta::FLAG_MASK_NO_USERID; : table_info.flag_ |= engine::meta::FLAG_MASK_NO_USERID;
status = DBWrapper::DB()->UpdateTableFlag(insert_param_->table_name(), table_info.flag_); status = DBWrapper::DB()->UpdateTableFlag(insert_param_->table_name(), table_info.flag_);
#ifdef MILVUS_ENABLE_PROFILING #ifdef MILVUS_ENABLE_PROFILING
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册