Skip to content

Commit 8032bfc

Browse files
BigVanlihuiba
authored andcommitted
move photon/cache/ to photon/fs/cache/
Signed-off-by: Yifan Yuan <tuji.yyf@alibaba-inc.com>
1 parent c2c1d64 commit 8032bfc

49 files changed

Lines changed: 19 additions & 19 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ if (APPLE)
215215
list(APPEND PHOTON_SRC io/kqueue.cpp)
216216
else ()
217217
file(GLOB CACHE_SRC
218-
cache/*.cpp
219-
cache/full_file_cache/*.cpp
220-
cache/persistent_cache/*.cpp
218+
fs/cache/*.cpp
219+
fs/cache/full_file_cache/*.cpp
220+
fs/cache/persistent_cache/*.cpp
221221
)
222222
list(APPEND PHOTON_SRC
223223
io/aio-wrapper.cpp
@@ -253,7 +253,7 @@ if (NOT ${PHOTON_ENABLE_LIBCURL})
253253
list(REMOVE_ITEM PHOTON_SRC net/curl.cpp fs/httpfs/httpfs.cpp)
254254
endif ()
255255
if (PHOTON_BUILD_OCF_CACHE)
256-
add_subdirectory(cache/ocf_cache)
256+
add_subdirectory(fs/cache/ocf_cache)
257257
endif()
258258

259259

@@ -446,7 +446,7 @@ if (PHOTON_BUILD_TESTING)
446446
add_subdirectory(thread/test)
447447
add_subdirectory(net/security-context/test)
448448
if (NOT APPLE)
449-
add_subdirectory(cache/test)
449+
add_subdirectory(fs/cache/test)
450450
endif()
451451
if (PHOTON_ENABLE_ECOSYSTEM)
452452
add_subdirectory(ecosystem/test)

cache/ocf_cache/include/ocf

Lines changed: 0 additions & 1 deletion
This file was deleted.
File renamed without changes.

cache/cache.h renamed to fs/cache/cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
#include <stdlib.h>
2121
#include <fcntl.h>
2222
#include <photon/fs/filesystem.h>
23-
#include <photon/cache/pool_store.h>
23+
#include <photon/fs/cache/pool_store.h>
2424

2525
#define O_WRITE_THROUGH 0x01000000 // write backing store and cache
2626
#define O_WRITE_AROUND 0x02000000 // write backing store only, default
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
#include <photon/cache/cache.h>
17+
#include <photon/fs/cache/cache.h>
1818
#include <photon/common/alog.h>
1919
#include <photon/common/io-alloc.h>
2020
#include <photon/common/iovector.h>
2121
#include <photon/common/string_view.h>
2222
#include <photon/fs/filesystem.h>
2323
#include <photon/fs/range-split.h>
24-
#include <photon/cache/pool_store.h>
24+
#include <photon/fs/cache/pool_store.h>
2525

2626
namespace photon {
2727
namespace fs {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ limitations under the License.
2525
#include <photon/thread/timer.h>
2626
#include <photon/common/string-keyed.h>
2727
#include "../policy/lru.h"
28-
#include <photon/cache/pool_store.h>
28+
#include <photon/fs/cache/pool_store.h>
2929

3030
#include <photon/fs/filesystem.h>
3131

0 commit comments

Comments
 (0)