Commit c884b9fd authored by jinhai's avatar jinhai
Browse files

Merge branch 'branch-0.5.0' into 'branch-0.5.0' 

solve cpplint

See merge request megasearch/milvus!688

Former-commit-id: ecd1da1744a2b0e7ccb0743aa195e7b23478064d
parents 93925b5b 75de7e19

cpp/src/db/engine/ExecutionEngineImpl.cpp

+4 −4
Original line number Diff line number Diff line
@@ -31,18 +31,18 @@ 
#include "wrapper/ConfAdapter.h"

#include "wrapper/ConfAdapterMgr.h"



#include <src/scheduler/Utils.h>

#include <stdexcept>

#include <utility>

#include <src/scheduler/Utils.h>

#include <vector>



namespace milvus {

namespace engine {



class CachedQuantizer : public cache::DataObj {

 public:

    explicit

    CachedQuantizer(knowhere::QuantizerPtr data)

        : data_(std::move(data)) {}

    explicit CachedQuantizer(knowhere::QuantizerPtr data) : data_(std::move(data)) {

    }



    knowhere::QuantizerPtr

    Data() {

cpp/src/scheduler/JobMgr.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#include "TaskCreator.h"

#include "task/Task.h"



#include <utility>

#include <src/scheduler/optimizer/Optimizer.h>

#include <utility>



namespace milvus {

namespace scheduler {

cpp/src/scheduler/Utils.cpp

+4 −2
Original line number Diff line number Diff line
@@ -15,12 +15,14 @@ 
// specific language governing permissions and limitations

// under the License.



#include "server/Config.h"

#include "scheduler/Utils.h"

#include "server/Config.h"

#include "utils/Log.h"



#include <cuda_runtime.h>

#include <chrono>

#include <set>

#include <string>



namespace milvus {

namespace scheduler {
@@ -75,7 +77,7 @@ get_gpu_pool() { 
    }



    return gpu_pool;

};

}



}  // namespace scheduler

}  // namespace milvus

cpp/src/wrapper/VecImpl.h

+1 −1

File changed.

Contains only whitespace changes.

cpp/src/core/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp

+1 −1

File changed.

Contains only whitespace changes.

cpp/src/core/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.h

+1 −1

File changed.

Contains only whitespace changes.

cpp/src/db/engine/ExecutionEngineImpl.h

+1 −1

File changed.

Contains only whitespace changes.