diff --git a/internal/core/src/common/Types.h b/internal/core/src/common/Types.h index 77e4fff282..bd985db85b 100644 --- a/internal/core/src/common/Types.h +++ b/internal/core/src/common/Types.h @@ -10,19 +10,22 @@ // or implied. See the License for the specific language governing permissions and limitations under the License #pragma once -#include "utils/Types.h" -#include "faiss/utils/BitsetView.h" -#include -#include -#include + #include -#include -#include #include +#include +#include +#include +#include #include + +#include "faiss/utils/BitsetView.h" +#include "faiss/MetricType.h" #include "pb/schema.pb.h" +#include "utils/Types.h" namespace milvus { + using Timestamp = uint64_t; // TODO: use TiKV-like timestamp constexpr auto MAX_TIMESTAMP = std::numeric_limits::max(); @@ -33,11 +36,11 @@ using ScalarArray = proto::schema::ScalarField; using DataArray = proto::schema::FieldData; using VectorArray = proto::schema::VectorField; using IdArray = proto::schema::IDs; - using MetricType = faiss::MetricType; MetricType GetMetricType(const std::string& type); + std::string MetricTypeToName(MetricType metric_type); @@ -52,8 +55,6 @@ constexpr std::false_type always_false{}; template using aligned_vector = std::vector>; -struct EntityResult {}; - /////////////////////////////////////////////////////////////////////////////////////////////////// struct SearchResult { SearchResult() = default; @@ -94,10 +95,6 @@ struct RetrieveResult { using RetrieveResultPtr = std::shared_ptr; -struct EntityResults { - // use protobuf results to simplify -}; - namespace impl { // hide identifier name to make auto completion happy struct FieldIdTag;