fix conflict (8e93c4d8) · Commits · SUMMER2020 / students / proj-2018085

ci/jenkinsfile/milvus_build.groovy

+8 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,14 @@ container('milvus-build-env') {
		sh "git config --global user.name \"test\""
		withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
		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"
		sh "rm -rf cmake_build"
		sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' \
		&& export JFROG_USER_NAME='${USERNAME}' \
		&& export JFROG_PASSWORD='${PASSWORD}' \
		&& export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \
		&& ./build.sh -t ${params.BUILD_TYPE} -j -u -c"

		sh "./coverage.sh -u root -p Fantast1c -t 192.168.1.194"
		}
		}
		} catch (exc) {

ci/jenkinsfile/milvus_build_no_ut.groovy

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ container('milvus-build-env') {
		withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
		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"
		sh "./coverage.sh -u root -p Fantast1c -t 192.168.1.194"
		}
		}
		} catch (exc) {

core/CHANGELOG.md

+11 −6

Original line number	Diff line number	Diff line
		@@ -11,17 +11,21 @@ Please mark all change in change log and use the ticket from JIRA.
		- MS-587 - Count get wrong result after adding vectors and index built immediately
		- MS-599 - Search wrong result when table created with metric_type: IP
		- MS-601 - Docker logs error caused by get CPUTemperature error
		- MS-622 - Delete vectors should be failed if date range is invalid
		- MS-605 - Server going down during searching vectors
		- MS-620 - Get table row counts display wrong error code
		- MS-622 - Delete vectors should be failed if date range is invalid
		- MS-624 - Search vectors failed if time ranges long enough
		- MS-637 - Out of memory when load too many tasks
		- MS-639 - SQ8H index created failed and server hang
		- MS-640 - Cache object size calculate incorrect
		- MS-641 - Segment fault(signal 11) in PickToLoad
		- MS-639 - SQ8H index created failed and server hang
		- MS-647 - [monitor] grafana display average cpu-temp
		- MS-644 - Search crashed with index-type: flat
		- MS-624 - Search vectors failed if time ranges long enough
		- MS-647 - grafana display average cpu-temp
		- MS-652 - IVFSQH quantization double free
		- MS-650 - SQ8H index create issue
		- MS-653 - When config check fail, Milvus close without message
		- MS-654 - Describe index timeout when building index
		- MS-658 - Fix SQ8 Hybrid can't search

		## Improvement
		- MS-552 - Add and change the easylogging library
		@@ -39,10 +43,11 @@ Please mark all change in change log and use the ticket from JIRA.
		- MS-608 - Update TODO names
		- MS-609 - Update task construct function
		- MS-611 - Add resources validity check in ResourceMgr
		- MS-619 - Add optimizer class in scheduler
		- MS-614 - Preload table at startup
		- MS-619 - Add optimizer class in scheduler
		- MS-626 - Refactor DataObj to support cache any type data
		- MS-648 - Improve unittest
		- MS-655 - Upgrade SPTAG

		## New Feature
		- MS-627 - Integrate new index: IVFSQHybrid
		@@ -60,8 +65,8 @@ Please mark all change in change log and use the ticket from JIRA.
		- MS-600 - Reconstruct unittest code
		- 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
		- MS-635 - Add compile option to support customized faiss

		# Milvus 0.4.0 (2019-09-12)

core/CMakeLists.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -125,10 +125,6 @@ set(MILVUS_SOURCE_DIR ${PROJECT_SOURCE_DIR})
		set(MILVUS_BINARY_DIR ${PROJECT_BINARY_DIR})
		set(MILVUS_ENGINE_SRC ${PROJECT_SOURCE_DIR}/src)

		if (CUSTOMIZATION)
		add_definitions(-DCUSTOMIZATION)
		endif (CUSTOMIZATION)

		include(ExternalProject)
		include(DefineOptions)
		include(BuildUtils)
		@@ -136,6 +132,10 @@ include(ThirdPartyPackages)

		config_summary()

		if (CUSTOMIZATION)
		add_definitions(-DCUSTOMIZATION)
		endif (CUSTOMIZATION)

		add_subdirectory(src)

		if (BUILD_UNIT_TEST STREQUAL "ON")

core/README.md

+13 −4

Original line number	Diff line number	Diff line
		@@ -76,13 +76,13 @@ $ sudo ln -s /path/to/libmysqlclient.so /path/to/libmysqlclient_r.so
		###### Step 2 Build

		```shell
		$ cd [Milvus sourcecode path]/cpp
		$ cd [Milvus sourcecode path]/core
		$ ./build.sh -t Debug
		or
		$ ./build.sh -t Release
		```

		When the build is completed, all the stuff that you need in order to run Milvus will be installed under `[Milvus root path]/cpp/milvus`.
		When the build is completed, all the stuff that you need in order to run Milvus will be installed under `[Milvus root path]/core/milvus`.

		If you encounter the following error message,
		`protocol https not supported or disabled in libcurl`
		@@ -148,11 +148,20 @@ $ sudo apt-get install lcov
		```shell
		$ ./build.sh -u -c
		```
		Run mysql docker
		```shell
		docker pull mysql:latest
		docker run -p 3306:3306 -e MYSQL_ROOT_PASSWORD=123456 -d mysql:latest
		```
		Run code coverage
		```shell
		$ ./coverage.sh -u root -p 123456 -t 127.0.0.1
		```

		##### Launch Milvus server

		```shell
		$ cd [Milvus root path]/cpp/milvus
		$ cd [Milvus root path]/core/milvus
		```

		Add `lib/` directory to `LD_LIBRARY_PATH`
		@@ -202,7 +211,7 @@ $ python3 example.py

		```shell
		# Run Milvus C++ example
		$ cd [Milvus root path]/cpp/milvus/bin
		$ cd [Milvus root path]/core/milvus/bin
		$ ./sdk_simple
		```