Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0

Former-commit-id: f28807108222ec0d89626472a5df659aafda009b

core/CHANGELOG.md

@@ -23,6 +23,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-652 - IVFSQH quantization double free
 - MS-605 - Server going down during searching vectors
 - 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

core/src/index/CMakeLists.txt

@@ -86,6 +86,10 @@ include(DefineOptionsCore)
 include(BuildUtilsCore)
 include(ThirdPartyPackagesCore)
 
+if (CUSTOMIZATION)
+    add_definitions(-DCUSTOMIZATION)
+endif (CUSTOMIZATION)
+
 add_subdirectory(knowhere)
 
 if (BUILD_COVERAGE STREQUAL "ON")

core/unittest/CMakeLists.txt

@@ -16,6 +16,9 @@
 # specific language governing permissions and limitations
 # under the License.
 #-------------------------------------------------------------------------------
+if (CUSTOMIZATION)
+    add_definitions(-DCUSTOMIZATION)
+endif (CUSTOMIZATION)
 
 include_directories("${CUDA_TOOLKIT_ROOT_DIR}/include")