From dafd5a45cdac80b286d82b41b545d16025f2f873 Mon Sep 17 00:00:00 2001
From: groot <yihua.mo@zilliz.com>
Date: Sun, 14 Apr 2019 14:36:45 +0800
Subject: [PATCH] add cache classes

Former-commit-id: 9bbc325ab6b6a1916801c05e3eb08e356db38299
---
 cpp/src/CMakeLists.txt             | 2 +-
 cpp/src/cache/CacheMgr.cpp         | 6 +++---
 cpp/src/cache/CacheMgr.h           | 4 ++--
 cpp/unittest/cache/CMakeLists.txt  | 4 +---
 cpp/unittest/cache/cache_tests.cpp | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index bd314be8e6..0dfdf91d5a 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -4,7 +4,7 @@
 # Proprietary and confidential.
 #-------------------------------------------------------------------------------
 
-AUX_SOURCE_DIRECTORY(./cache cache_files)
+aux_source_directory(./cache cache_files)
 
 set(vecwise_engine_src
         ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
diff --git a/cpp/src/cache/CacheMgr.cpp b/cpp/src/cache/CacheMgr.cpp
index d5e66cd7be..df53c42510 100644
--- a/cpp/src/cache/CacheMgr.cpp
+++ b/cpp/src/cache/CacheMgr.cpp
@@ -15,15 +15,15 @@ CacheMgr::CacheMgr() {
     cache_ = std::make_shared<Cache>(16, 1UL<<32);
 }
 
-size_t CacheMgr::ItemCount() const {
+uint64_t CacheMgr::ItemCount() const {
     if(cache_ == nullptr) {
         return 0;
     }
 
-    return cache_->size();
+    return (uint64_t)(cache_->size());
 }
 
-bool CacheMgr::IsExists(const std::string& key) {
+bool CacheMgr::ItemExists(const std::string& key) {
     if(cache_ == nullptr) {
         return false;
     }
diff --git a/cpp/src/cache/CacheMgr.h b/cpp/src/cache/CacheMgr.h
index 22d461734a..759e76b9a1 100644
--- a/cpp/src/cache/CacheMgr.h
+++ b/cpp/src/cache/CacheMgr.h
@@ -19,9 +19,9 @@ public:
         return mgr;
     }
 
-    size_t ItemCount() const;
+    uint64_t ItemCount() const;
 
-    bool IsExists(const std::string& key);
+    bool ItemExists(const std::string& key);
 
     DataObjPtr GetItem(const std::string& key);
 
diff --git a/cpp/unittest/cache/CMakeLists.txt b/cpp/unittest/cache/CMakeLists.txt
index eb1856ae1a..9a088d7c44 100644
--- a/cpp/unittest/cache/CMakeLists.txt
+++ b/cpp/unittest/cache/CMakeLists.txt
@@ -5,9 +5,7 @@
 #-------------------------------------------------------------------------------
 include_directories(../../src)
 
-set(cache_srcs
-        ../../src/cache/Cache.cpp
-        ../../src/cache/CacheMgr.cpp)
+aux_source_directory(../../src/cache cache_srcs)
 
 set(cache_test_src
         ${unittest_srcs}
diff --git a/cpp/unittest/cache/cache_tests.cpp b/cpp/unittest/cache/cache_tests.cpp
index 3505f5aa8f..7526c1f6cd 100644
--- a/cpp/unittest/cache/cache_tests.cpp
+++ b/cpp/unittest/cache/cache_tests.cpp
@@ -32,7 +32,7 @@ TEST(CacheTest, CACHE_TEST) {
     cache_mgr.InsertItem(key, MAKE_100MB_DATA);
     cache::DataObjPtr data = cache_mgr.GetItem(key);
     ASSERT_TRUE(data != nullptr);
-    ASSERT_TRUE(cache_mgr.IsExists(key));
+    ASSERT_TRUE(cache_mgr.ItemExists(key));
     ASSERT_EQ(data->size(), 100*1024*1024);
 
     cache_mgr.EraseItem(key);