From 03c648df5743ca9f923b4b622a30e97d56ac9877 Mon Sep 17 00:00:00 2001 From: test Date: Wed, 9 Oct 2019 09:35:13 +0000 Subject: [PATCH 1/4] MS-575 Add Clang-format & Clang-tidy & Cpplint Former-commit-id: 4b6f60b7ab2d654b08dbe46ff167477c5612dd1c --- ci/jenkinsfile/milvus_build.groovy | 2 +- ci/jenkinsfile/milvus_build_no_ut.groovy | 2 +- ci/main_jenkinsfile | 2 +- ci/main_jenkinsfile_no_ut | 2 +- ci/nightly_main_jenkinsfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/jenkinsfile/milvus_build.groovy b/ci/jenkinsfile/milvus_build.groovy index 44895ed5c9..23010c5fb8 100644 --- a/ci/jenkinsfile/milvus_build.groovy +++ b/ci/jenkinsfile/milvus_build.groovy @@ -9,7 +9,7 @@ container('milvus-build-env') { sh "git config --global user.email \"test@zilliz.com\"" sh "git config --global user.name \"test\"" withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { - sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j -u -c" + sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -l -j -u -c" } } } catch (exc) { diff --git a/ci/jenkinsfile/milvus_build_no_ut.groovy b/ci/jenkinsfile/milvus_build_no_ut.groovy index a807ec7ad4..586cde1795 100644 --- a/ci/jenkinsfile/milvus_build_no_ut.groovy +++ b/ci/jenkinsfile/milvus_build_no_ut.groovy @@ -9,7 +9,7 @@ container('milvus-build-env') { sh "git config --global user.email \"test@zilliz.com\"" sh "git config --global user.name \"test\"" withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { - sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j" + sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j -l" } } } catch (exc) { diff --git a/ci/main_jenkinsfile b/ci/main_jenkinsfile index d65ad512c2..12c6c81cfd 100644 --- a/ci/main_jenkinsfile +++ b/ci/main_jenkinsfile @@ -44,7 +44,7 @@ metadata: spec: containers: - name: milvus-build-env - image: registry.zilliz.com/milvus/milvus-build-env:v0.12 + image: registry.zilliz.com/milvus/milvus-build-env:v0.13 command: - cat tty: true diff --git a/ci/main_jenkinsfile_no_ut b/ci/main_jenkinsfile_no_ut index 72f6e04948..e7382bd1fd 100644 --- a/ci/main_jenkinsfile_no_ut +++ b/ci/main_jenkinsfile_no_ut @@ -44,7 +44,7 @@ metadata: spec: containers: - name: milvus-build-env - image: registry.zilliz.com/milvus/milvus-build-env:v0.12 + image: registry.zilliz.com/milvus/milvus-build-env:v0.13 command: - cat tty: true diff --git a/ci/nightly_main_jenkinsfile b/ci/nightly_main_jenkinsfile index 51c733f0ea..add9e00fb4 100644 --- a/ci/nightly_main_jenkinsfile +++ b/ci/nightly_main_jenkinsfile @@ -44,7 +44,7 @@ metadata: spec: containers: - name: milvus-build-env - image: registry.zilliz.com/milvus/milvus-build-env:v0.12 + image: registry.zilliz.com/milvus/milvus-build-env:v0.13 command: - cat tty: true From cd4561923a1ac15ff5ad057b2c26b4d833c819e1 Mon Sep 17 00:00:00 2001 From: starlord Date: Wed, 9 Oct 2019 17:51:01 +0800 Subject: [PATCH 2/4] format code Former-commit-id: 162d51623727cf2f655ff54080daf3bc18e02f07 --- cpp/src/metrics/SystemInfo.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cpp/src/metrics/SystemInfo.cpp b/cpp/src/metrics/SystemInfo.cpp index bf2b0407a9..154f7b0797 100644 --- a/cpp/src/metrics/SystemInfo.cpp +++ b/cpp/src/metrics/SystemInfo.cpp @@ -18,16 +18,16 @@ #include "metrics/SystemInfo.h" #include "utils/Log.h" +#include #include +#include +#include #include #include #include #include #include #include -#include -#include -#include namespace milvus { namespace server { @@ -64,7 +64,7 @@ SystemInfo::Init() { nvmlReturn_t nvmlresult; nvmlresult = nvmlInit(); if (NVML_SUCCESS != nvmlresult) { - SERVER_LOG_ERROR << "System information initilization failed"; + SERVER_LOG_ERROR << "System information initilization failed"; return; } nvmlresult = nvmlDeviceGetCount(&num_device_); @@ -243,14 +243,14 @@ SystemInfo::CPUTemperature() { std::vector result; std::string path = "/sys/class/hwmon/"; - DIR *dir = NULL; + DIR* dir = NULL; dir = opendir(path.c_str()); if (!dir) { SERVER_LOG_ERROR << "Could not open hwmon directory"; return result; } - struct dirent *ptr = NULL; + struct dirent* ptr = NULL; while ((ptr = readdir(dir)) != NULL) { std::string filename(path); filename.append(ptr->d_name); @@ -261,7 +261,7 @@ SystemInfo::CPUTemperature() { if (m.find("coretemp") != std::string::npos) { std::string object = filename; object += "/temp1_input"; - FILE *file = fopen(object.c_str(), "r"); + FILE* file = fopen(object.c_str(), "r"); if (file == nullptr) { SERVER_LOG_ERROR << "Could not open temperature file"; return result; From 39c3dd5123e772d0fe1902a15d11f8f6ae444400 Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 9 Oct 2019 19:31:56 +0800 Subject: [PATCH 3/4] Update milvus_build_no_ut.groovy Former-commit-id: 60d4af9f3828a6109b78fa1d857ecc42beec0804 --- ci/jenkinsfile/milvus_build_no_ut.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/jenkinsfile/milvus_build_no_ut.groovy b/ci/jenkinsfile/milvus_build_no_ut.groovy index 586cde1795..f72089e8c3 100644 --- a/ci/jenkinsfile/milvus_build_no_ut.groovy +++ b/ci/jenkinsfile/milvus_build_no_ut.groovy @@ -9,7 +9,8 @@ container('milvus-build-env') { sh "git config --global user.email \"test@zilliz.com\"" sh "git config --global user.name \"test\"" withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { - sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j -l" + sh "./build.sh -l" + sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j" } } } catch (exc) { From a56d6042e6f08f81d074c059a200dff495bbd5fd Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 9 Oct 2019 19:32:32 +0800 Subject: [PATCH 4/4] Update milvus_build.groovy Former-commit-id: 0bf469df7faa46619c13e99c4c0bfc5a1dad885c --- ci/jenkinsfile/milvus_build.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/jenkinsfile/milvus_build.groovy b/ci/jenkinsfile/milvus_build.groovy index 23010c5fb8..6130766400 100644 --- a/ci/jenkinsfile/milvus_build.groovy +++ b/ci/jenkinsfile/milvus_build.groovy @@ -9,7 +9,8 @@ container('milvus-build-env') { sh "git config --global user.email \"test@zilliz.com\"" sh "git config --global user.name \"test\"" withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { - sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -l -j -u -c" + sh "./build.sh -l" + sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j -u -c" } } } catch (exc) {