milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'branch-0.3.0' into 'branch-0.3.0' 

MS-54 - cmake: Change Thirft third party URL to github.com

See merge request megasearch/vecwise_engine!55

Former-commit-id: 56ee19080ac317353da5b7d5bb6dff50ea638cc4
pull/191/head
jinhai 2019-06-02 19:15:20 +08:00
parent a85966aa98 f9e58a1247
commit f0de76cc7e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpp/CHANGELOG.md
View File

@ -36,6 +36,7 @@ Please mark all change in change log and use the ticket from JIRA.
- MS-47 - Add query vps metrics - MS-47 - Add query vps metrics
- MS-37 - Add query, cache usage, disk write speed and file data size metrics - MS-37 - Add query, cache usage, disk write speed and file data size metrics
- MS-30 - Use faiss v1.5.2 - MS-30 - Use faiss v1.5.2
- MS-54 - cmake: Change Thirft third party URL to github.com
## Task ## Task

2
cpp/cmake/ThirdPartyPackages.cmake
View File

@ -288,7 +288,7 @@ if(DEFINED ENV{MEGASEARCH_THRIFT_URL})
set(THRIFT_SOURCE_URL "$ENV{MEGASEARCH_THRIFT_URL}") set(THRIFT_SOURCE_URL "$ENV{MEGASEARCH_THRIFT_URL}")
else() else()
set(THRIFT_SOURCE_URL set(THRIFT_SOURCE_URL
"http://archive.apache.org/dist/thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz") "https://github.com/apache/thrift/archive/${THRIFT_VERSION}.tar.gz")
endif() endif()
if(DEFINED ENV{MEGASEARCH_YAMLCPP_URL}) if(DEFINED ENV{MEGASEARCH_YAMLCPP_URL})

4
cpp/thirdparty/versions.txt vendored
View File

@ -36,7 +36,7 @@ ROCKSDB_VERSION=v6.0.2
SNAPPY_VERSION=1.1.7 SNAPPY_VERSION=1.1.7
SQLITE_VERSION=3280000 SQLITE_VERSION=3280000
SQLITE_ORM_VERSION=master SQLITE_ORM_VERSION=master
THRIFT_VERSION=0.12.0 THRIFT_VERSION=v0.12.0
YAMLCPP_VERSION=0.6.2 YAMLCPP_VERSION=0.6.2
ZLIB_VERSION=v1.2.11 ZLIB_VERSION=v1.2.11
ZSTD_VERSION=v1.4.0 ZSTD_VERSION=v1.4.0
@ -59,7 +59,7 @@ DEPENDENCIES=(
"MEGASEARCH_SNAPPY_URL snappy-${SNAPPY_VERSION}.tar.gz https://github.com/google/snappy/archive/${SNAPPY_VERSION}.tar.gz" "MEGASEARCH_SNAPPY_URL snappy-${SNAPPY_VERSION}.tar.gz https://github.com/google/snappy/archive/${SNAPPY_VERSION}.tar.gz"
"MEGASEARCH_SQLITE_URL sqlite-autoconf-${SQLITE_VERSION}.tar.gz https://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_VERSION}.tar.gz" "MEGASEARCH_SQLITE_URL sqlite-autoconf-${SQLITE_VERSION}.tar.gz https://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_VERSION}.tar.gz"
"MEGASEARCH_SQLITE_ORM_URL sqlite_orm-${SQLITE_ORM_VERSION}.tar.gz https://github.com/fnc12/sqlite_orm/archive/${SQLITE_ORM_VERSION}.tar.gz" "MEGASEARCH_SQLITE_ORM_URL sqlite_orm-${SQLITE_ORM_VERSION}.tar.gz https://github.com/fnc12/sqlite_orm/archive/${SQLITE_ORM_VERSION}.tar.gz"
"MEGASEARCH_THRIFT_URL thrift-${THRIFT_VERSION}.tar.gz http://archive.apache.org/dist/thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz" "MEGASEARCH_THRIFT_URL thrift-${THRIFT_VERSION}.tar.gz https://github.com/apache/thrift/archive/${THRIFT_VERSION}.tar.gz"
"MEGASEARCH_YAMLCPP_URL yaml-cpp-${YAMLCPP_VERSION}.tar.gz https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-${YAMLCPP_VERSION}.tar.gz" "MEGASEARCH_YAMLCPP_URL yaml-cpp-${YAMLCPP_VERSION}.tar.gz https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-${YAMLCPP_VERSION}.tar.gz"
"MEGASEARCH_ZLIB_URL zlib-${ZLIB_VERSION}.tar.gz https://github.com/madler/zlib/archive/${ZLIB_VERSION}.tar.gz" "MEGASEARCH_ZLIB_URL zlib-${ZLIB_VERSION}.tar.gz https://github.com/madler/zlib/archive/${ZLIB_VERSION}.tar.gz"
"MEGASEARCH_ZSTD_URL zstd-${ZSTD_VERSION}.tar.gz https://github.com/facebook/zstd/archive/${ZSTD_VERSION}.tar.gz" "MEGASEARCH_ZSTD_URL zstd-${ZSTD_VERSION}.tar.gz https://github.com/facebook/zstd/archive/${ZSTD_VERSION}.tar.gz"