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

Former-commit-id: 906885f862d0ecc58eac49dbf2f08b8e7e47395f

.dockerignore

@@ -1,3 +0,0 @@
-.git/
-.gitignore
-.idea/

.gitignore

@@ -1,9 +1,9 @@
 # CLion generated files
-cpp/cmake-build-debug/
-cpp/cmake-build-release/
-cpp/cmake_build
-cpp/.idea/
-cpp/thirdparty/knowhere_build
+core/cmake-build-debug/
+core/cmake-build-release/
+core/cmake_build
+core/.idea/
+core/thirdparty/knowhere_build
 
 .idea/
 .ycm_extra_conf.py

CHANGELOGS.md

@@ -1,21 +0,0 @@
-# Changelog
-
-Please mark all change in change log and use the ticket from JIRA.
-
-## [Unreleased]
-
-### Bug
-
-### Improvement
-- MS-4 - Refactor the vecwise_engine code structure
-
-### New Feature
-- MS-3 - Define the SDK C++ interface
-
-### Task
-
-- MS-1 - Add CHANGELOG.md
-- MS-161 - Add CI / CD Module to Milvus Project
-- MS-202 - Add Milvus Jenkins project email notification
-- MS-215 - Add Milvus cluster CI/CD groovy file 
-- MS-277 - Update CUDA Version to V10.1

Dockerfile

@@ -1,15 +0,0 @@
-FROM nvidia/cuda:9.0-devel-ubuntu16.04
-
-ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
-
-WORKDIR /app
-
-COPY environment.yaml install/miniconda.sh /app/
-
-RUN ./miniconda.sh -p $HOME/miniconda -b -f \
-    && echo ". /root/miniconda/etc/profile.d/conda.sh" >> /root/.bashrc \
-    && /root/miniconda/bin/conda env create -f environment.yaml \
-    && echo "conda activate vec_engine" >> /root/.bashrc \
-    && rm /app/*
-
-COPY . /app

README.md

@@ -1,33 +0,0 @@
-# Vecwise Engine Dev Guide
-
-## Install via Conda
-1.  Install Miniconda first
-    - `bash vecwise_engine/install/miniconda.sh`
-
-2.  Create environment
-    - `conda env create -f vecwise_engine/environment.yaml`
-
-3.  Test your installation
-
-## Install via Docker
-
-1.  Install nvidia-docker
-
-2.  `docker build -t cuda9.0/VecEngine .`
-
-3.  `docker run -it cuda9.0/VecEngine bash`
-
-
-## Create Database
-1. Install MySQL
-    - `sudo apt-get update`
-    - `sudo apt-get install mariadb-server`
-
-2. Create user and database:
-    - `create user vecwise;`
-    - `create database vecdata;`
-    - `grant all privileges on vecdata.* to 'vecwise'@'%';`
-    - `flush privileges;`
-
-3. Create table:
-    - `cd vecwise_engine/pyengine && python manager.py create_all`

cmake-format.py

@@ -1,59 +0,0 @@
-# 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.
-
-# cmake-format configuration file
-# Use run-cmake-format.py to reformat all cmake files in the source tree
-
-# How wide to allow formatted cmake files
-line_width = 90
-
-# How many spaces to tab for indent
-tab_size = 2
-
-# If arglists are longer than this, break them always
-max_subargs_per_line = 4
-
-# If true, separate flow control names from their parentheses with a space
-separate_ctrl_name_with_space = False
-
-# If true, separate function names from parentheses with a space
-separate_fn_name_with_space = False
-
-# If a statement is wrapped to more than one line, than dangle the closing
-# parenthesis on it's own line
-dangle_parens = False
-
-# What style line endings to use in the output.
-line_ending = 'unix'
-
-# Format command names consistently as 'lower' or 'upper' case
-command_case = 'lower'
-
-# Format keywords consistently as 'lower' or 'upper' case
-keyword_case = 'unchanged'
-
-# enable comment markup parsing and reflow
-enable_markup = False
-
-# If comment markup is enabled, don't reflow the first comment block in
-# eachlistfile. Use this to preserve formatting of your
-# copyright/licensestatements.
-first_comment_is_literal = False
-
-# If comment markup is enabled, don't reflow any comment block which matchesthis
-# (regex) pattern. Default is `None` (disabled).
-literal_comment_pattern = None

core/CHANGELOG.md

@@ -57,6 +57,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-602 - Remove zilliz namespace
 - MS-610 - Change error code base value from hex to decimal
 - MS-635 - Add compile option to support customized faiss
+- MS-624 - Re-organize project directory for open-source
 
 # Milvus 0.4.0 (2019-09-12)
 

core/build-support/lint_exclusions.txt

@@ -1,7 +1,7 @@
 *cmake-build-debug*
 *cmake-build-release*
 *cmake_build*
-*src/core/thirdparty*
+*src/index/thirdparty*
 *thirdparty*
 *easylogging++*
 *SqliteMetaImpl.cpp

core/cmake/ThirdPartyPackages.cmake

@@ -324,7 +324,8 @@ if(DEFINED ENV{MILVUS_SQLITE_ORM_URL})
     set(SQLITE_ORM_SOURCE_URL "$ENV{MILVUS_SQLITE_ORM_URL}")
 else()
     set(SQLITE_ORM_SOURCE_URL
-            "https://github.com/fnc12/sqlite_orm/archive/${SQLITE_ORM_VERSION}.zip")
+            "http://192.168.1.105:6060/Test/sqlite_orm/-/archive/master/sqlite_orm-master.zip")
+#            "https://github.com/fnc12/sqlite_orm/archive/${SQLITE_ORM_VERSION}.zip")
 endif()
 set(SQLITE_ORM_MD5 "ba9a405a8a1421c093aa8ce988ff8598")
 

core/coverage.sh

@@ -98,8 +98,8 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \
     "/usr/*" \
     "*/boost/*" \
     "*/cmake_build/*_ep-prefix/*" \
-    "src/core/cmake_build*" \
-    "src/core/thirdparty*" \
+    "src/index/cmake_build*" \
+    "src/index/thirdparty*" \
     "src/grpc*"\
     "src/metrics/MetricBase.h"\
     "src/server/Server.cpp"\
@@ -109,4 +109,4 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \
     "src/utils/easylogging++.cc"\
 
 # gen html report
-${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/
+${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/

core/src/CMakeLists.txt

@@ -25,7 +25,7 @@ include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-status)
 include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-milvus)
 
 #this statement must put here, since the CORE_INCLUDE_DIRS is defined in code/CMakeList.txt
-add_subdirectory(core)
+add_subdirectory(index)
 set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)
 foreach (dir ${CORE_INCLUDE_DIRS})
     include_directories(${dir})
@@ -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

@@ -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

@@ -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

@@ -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,