From 675e4dcaa2538b533ea21bd2915dd2992d8ec78c Mon Sep 17 00:00:00 2001 From: godchen Date: Tue, 21 Dec 2021 18:24:58 +0800 Subject: [PATCH] Remove dablooms (#13881) Signed-off-by: godchen0212 --- .gitignore | 1 - scripts/cwrapper_dablooms_build.sh | 80 ------------------------------ scripts/run_go_unittest.sh | 1 - 3 files changed, 82 deletions(-) delete mode 100755 scripts/cwrapper_dablooms_build.sh diff --git a/.gitignore b/.gitignore index c979c5c6dd..674fb1e864 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,6 @@ lib/ .DS_Store *.sw[po] cwrapper_build -cwrapper_dablooms_build **/cwrapper_rocksdb_build/ **/.clangd/* **/compile_commands.json diff --git a/scripts/cwrapper_dablooms_build.sh b/scripts/cwrapper_dablooms_build.sh deleted file mode 100755 index f6e17bd87c..0000000000 --- a/scripts/cwrapper_dablooms_build.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# Licensed to the LF AI & Data foundation 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. - -SOURCE=${BASH_SOURCE[0]} -while [ -h $SOURCE ]; do # resolve $SOURCE until the file is no longer a symlink - DIR=$( cd -P $( dirname $SOURCE ) && pwd ) - SOURCE=$(readlink $SOURCE) - [[ $SOURCE != /* ]] && SOURCE=$DIR/$SOURCE # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located -done -DIR=$( cd -P $( dirname $SOURCE ) && pwd ) -# DIR=${DIR}/../internal/util/dablooms/cwrapper - -CMAKE_BUILD=${DIR}/../cwrapper_dablooms_build -OUTPUT_LIB=${DIR}/../internal/util/dablooms/cwrapper/output -SRC_DIR=${DIR}/../internal/util/dablooms/cwrapper - -if [ ! -d ${CMAKE_BUILD} ];then - mkdir ${CMAKE_BUILD} -fi - -if [ -d ${OUTPUT_LIB} ];then - rm -rf ${OUTPUT_LIB} -fi -mkdir ${OUTPUT_LIB} - -BUILD_TYPE="Debug" -CUSTOM_THIRDPARTY_PATH="" - -while getopts "t:h:f:" arg; do - case $arg in - f) - CUSTOM_THIRDPARTY_PATH=$OPTARG - ;; - t) - BUILD_TYPE=$OPTARG # BUILD_TYPE - ;; - h) # help - echo "-t: build type(default: Debug) --f: custom thirdparty path(default: "") --h: help - " - exit 0 - ;; - ?) - echo "ERROR! unknown argument" - exit 1 - ;; - esac -done -echo "BUILD_TYPE: " $BUILD_TYPE -echo "CUSTOM_THIRDPARTY_PATH: " $CUSTOM_THIRDPARTY_PATH - -pushd ${CMAKE_BUILD} -CMAKE_CMD="cmake \ --DCMAKE_INSTALL_PREFIX=${OUTPUT_LIB} \ --DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ --DCUSTOM_THIRDPARTY_DOWNLOAD_PATH=${CUSTOM_THIRDPARTY_PATH} ${SRC_DIR}" - -${CMAKE_CMD} -echo ${CMAKE_CMD} - -if [[ ! ${jobs+1} ]]; then - jobs=$(nproc) -fi -make -j ${jobs} && make install diff --git a/scripts/run_go_unittest.sh b/scripts/run_go_unittest.sh index fcf83b8151..77b14ffcb1 100755 --- a/scripts/run_go_unittest.sh +++ b/scripts/run_go_unittest.sh @@ -36,7 +36,6 @@ go test -race -cover "${MILVUS_DIR}/kv/..." -failfast go test -race -cover "${MILVUS_DIR}/msgstream/..." -failfast go test -race -cover "${MILVUS_DIR}/storage" -failfast go test -race -cover "${MILVUS_DIR}/tso/..." -failfast -go test -race -cover "${MILVUS_DIR}/util/dablooms/..." -failfast go test -race -cover "${MILVUS_DIR}/util/funcutil/..." -failfast go test -race -cover "${MILVUS_DIR}/util/mqclient/..." -failfast go test -race -cover "${MILVUS_DIR}/util/paramtable/..." -failfast