Commit a7240a2c authored by groot's avatar groot
Browse files

merge 0.5.0 branch 


Former-commit-id: 58db6126255936032152792092682deadf595432
parent 67766682

core/src/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ target_link_libraries(milvus_server 
install(TARGETS milvus_server DESTINATION bin)



install(FILES

        ${CMAKE_SOURCE_DIR}/src/core/thirdparty/tbb/${CMAKE_SHARED_LIBRARY_PREFIX}tbb${CMAKE_SHARED_LIBRARY_SUFFIX}

        ${CMAKE_SOURCE_DIR}/src/core/thirdparty/tbb/${CMAKE_SHARED_LIBRARY_PREFIX}tbb${CMAKE_SHARED_LIBRARY_SUFFIX}.2

        ${CMAKE_SOURCE_DIR}/src/index/thirdparty/tbb/${CMAKE_SHARED_LIBRARY_PREFIX}tbb${CMAKE_SHARED_LIBRARY_SUFFIX}

        ${CMAKE_SOURCE_DIR}/src/index/thirdparty/tbb/${CMAKE_SHARED_LIBRARY_PREFIX}tbb${CMAKE_SHARED_LIBRARY_SUFFIX}.2

        ${CMAKE_BINARY_DIR}/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}mysqlpp${CMAKE_SHARED_LIBRARY_SUFFIX}

        ${CMAKE_BINARY_DIR}/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}mysqlpp${CMAKE_SHARED_LIBRARY_SUFFIX}.3

        ${CMAKE_BINARY_DIR}/mysqlpp_ep-prefix/src/mysqlpp_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}mysqlpp${CMAKE_SHARED_LIBRARY_SUFFIX}.3.2.4

core/src/db/engine/ExecutionEngineImpl.cpp

+4 −4
Original line number Diff line number Diff line
@@ -25,14 +25,14 @@ 


#include "knowhere/common/Config.h"

#include "knowhere/common/Exception.h"

#include "knowhere/index/vector_index/IndexIVFSQHybrid.h"

#include "scheduler/Utils.h"

#include "server/Config.h"

#include "src/wrapper/VecImpl.h"

#include "src/wrapper/VecIndex.h"

#include "wrapper/ConfAdapter.h"

#include "wrapper/ConfAdapterMgr.h"

#include "wrapper/VecImpl.h"

#include "wrapper/VecIndex.h"



#include <src/core/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.h>

#include <src/scheduler/Utils.h>

#include <stdexcept>

#include <utility>

#include <vector>

core/src/db/engine/ExecutionEngineImpl.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#pragma once



#include "ExecutionEngine.h"

#include "src/wrapper/VecIndex.h"

#include "wrapper/VecIndex.h"



#include <memory>

#include <string>

core/src/db/meta/MetaTypes.h

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ using DateT = int; 
const DateT EmptyDate = -1;

using DatesT = std::vector<DateT>;



struct DateRange {

    DateT start_date_ = 0x1 << 32;

    DateT end_date_ = 0;

};



struct TableSchema {

    typedef enum {

        NORMAL,

core/src/scheduler/BuildMgr.cpp

0 → 100644
+22 −0
Original line number Diff line number Diff line 
// Licensed to the Apache Software Foundation (ASF) under one

// or more contributor license agreements.  See the NOTICE file

// distributed with this work for additional information

// regarding copyright ownership.  The ASF licenses this file

// to you under the Apache License, Version 2.0 (the

// "License"); you may not use this file except in compliance

// with the License.  You may obtain a copy of the License at

//

//   http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing,

// software distributed under the License is distributed on an

// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

// KIND, either express or implied.  See the License for the

// specific language governing permissions and limitations

// under the License.



#include "scheduler/BuildMgr.h"



namespace milvus {

namespace scheduler {}  // namespace scheduler

}  // namespace milvus