Skip to content

Add redis cache (ported to new codebase) #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbo-ads merged 14 commits into from
Sep 6, 2021
Merged

Add redis cache (ported to new codebase) #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3d61a91
[Redis] Apply Patch To Add Redis Support
etscrivner Dec 3, 2014
54b6860
[Redis] Add Modified Files From Patch
etscrivner Dec 3, 2014
21048fc
[Redis] Remove Duplicate Lines
etscrivner Dec 3, 2014
ca6fa7c
[Redis] Update XML Sample With Redis Config
etscrivner Dec 3, 2014
7c6a171
[Redis] Use SETEX Operation Rather Than SET/EXPIRE
etscrivner Dec 3, 2014
cea86d5
Correct Argument Ordering
etscrivner Dec 4, 2014
e2e5b9f
Move mapcache_cache Member To Top Of Struct
etscrivner Dec 4, 2014
93cf334
[Redis] Improve Error Handling On Port Parsing
etscrivner Dec 4, 2014
1fffe1b
Appropriately Allocate Storage
etscrivner Dec 4, 2014
563e91b
Merge remote-tracking branch 'upstream/main' into add-redis-cache
bmanojlovic Aug 21, 2021
503f166
porting code to newer logic
bmanojlovic Aug 23, 2021
fcf65cb
replace with newer logic get_tile
bmanojlovic Aug 23, 2021
7195135
cleanup
bmanojlovic Aug 23, 2021
08192ce
move include from mapcache.h to cache_redis.c and comment cleanup
bmanojlovic Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ option(WITH_SQLITE "Use sqlite as a cache/dimension backend" ON)
option(WITH_POSTGRESQL "Use PostgreSQL as a dimension backend" OFF)
option(WITH_BERKELEY_DB "Use Berkeley DB as a cache backend" OFF)
option(WITH_MEMCACHE "Use memcache as a cache backend (requires recent apr-util)" OFF)
option(WITH_REDIS "Use redis as a cache backend (requires hiredis library)" OFF)
option(WITH_TIFF "Use TIFFs as a cache backend" OFF)
option(WITH_TIFF_WRITE_SUPPORT "Enable (experimental) support for writable TIFF cache backends" OFF)
option(WITH_GEOTIFF "Allow GeoTIFF metadata creation for TIFF cache backends" OFF)
Expand Down Expand Up @@ -155,6 +156,17 @@ if(WITH_MEMCACHE)

endif(WITH_MEMCACHE)

if(WITH_REDIS)
find_package(Redis)
if(HIREDIS_FOUND)
include_directories(${HIREDIS_INCLUDE_DIR})
target_link_libraries(mapcache ${HIREDIS_LIBRARIES})
set (USE_REDIS 1)
else(HIREDIS_FOUND)
report_optional_not_found(Redis)
endif(HIREDIS_FOUND)
endif(WITH_REDIS)

if(WITH_PIXMAN)
find_package(Pixman)
if(PIXMAN_FOUND)
Expand Down Expand Up @@ -321,6 +333,7 @@ status_optional_component("SQLITE" "${USE_SQLITE}" "${SQLITE_LIBRARY}")
status_optional_component("POSTGRESQL" "${USE_POSTGRESQL}" "${PostgreSQL_LIBRARY}")
status_optional_component("Berkeley DB" "${USE_BDB}" "${BERKELEYDB_LIBRARY}")
status_optional_component("Memcache" "${USE_MEMCACHE}" "${APU_LIBRARY}")
status_optional_component("Redis" "${USE_REDIS}" "${HIREDIS_LIBRARIES} ${HIREDIS_INCLUDE_DIR}")
status_optional_component("TIFF" "${USE_TIFF}" "${TIFF_LIBRARY}")
status_optional_component("GeoTIFF" "${USE_GEOTIFF}" "${GEOTIFF_LIBRARY}")
status_optional_component("Experimental TIFF write support" "${USE_TIFF_WRITE}" "${TIFF_LIBRARY}")
Expand Down
29 changes: 29 additions & 0 deletions cmake/FindRedis.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
IF (HIREDIS_INCLUDE_DIR AND HIREDIS_LIBRARIES)
SET (HIREDIS_FOUND TRUE)
ELSE(HIREDIS_INCLUDE_DIR AND HIREDIS_LIBRARIES)
FIND_PATH(HIREDIS_INCLUDE_DIR hiredis/hiredis.h
/usr/include/
/usr/include/hiredis
/usr/local/include/
/usr/local/include/hiredis
/opt/local/include/
/opt/local/include/hiredis
)

FIND_LIBRARY(HIREDIS_LIBRARIES NAMES hiredis libhiredis
PATHS
/usr/lib
/usr/local/lib
/opt/local/lib
)

IF(HIREDIS_INCLUDE_DIR AND HIREDIS_LIBRARIES)
SET(HIREDIS_FOUND TRUE)
MESSAGE(STATUS "Found hiredis: ${HIREDIS_INCLUDE_DIR}, ${HIREDIS_LIBRARIES}")
ELSE(HIREDIS_INCLUDE_DIR AND HIREDIS_LIBRARIES)
SET(HIREDIS_FOUND FALSE)
MESSAGE(STATUS "hiredis client library not found.")
ENDIF(HIREDIS_INCLUDE_DIR AND HIREDIS_LIBRARIES)

MARK_AS_ADVANCED(HIREDIS_INCLUDE_DIR HIREDIS_LIBRARIES)
ENDIF(HIREDIS_INCLUDE_DIR AND HIREDIS_LIBRARIES)
1 change: 1 addition & 0 deletions include/mapcache-config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#cmakedefine USE_POSTGRESQL 1
#cmakedefine USE_BDB 1
#cmakedefine USE_MEMCACHE 1
#cmakedefine USE_REDIS 1
#cmakedefine USE_TIFF 1
#cmakedefine USE_TIFF_WRITE 1
#cmakedefine USE_GEOTIFF 1
Expand Down
7 changes: 7 additions & 0 deletions include/mapcache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,8 @@ typedef enum {
,MAPCACHE_CACHE_COMPOSITE
,MAPCACHE_CACHE_COUCHBASE
,MAPCACHE_CACHE_RIAK
,MAPCACHE_CACHE_REDIS

} mapcache_cache_type;

/** \interface mapcache_cache
Expand Down Expand Up @@ -408,6 +410,11 @@ mapcache_cache* mapcache_cache_tc_create(mapcache_context *ctx);
*/
mapcache_cache* mapcache_cache_riak_create(mapcache_context *ctx);

/**
* \memberof mapcache_cache_redis
*/
mapcache_cache* mapcache_cache_redis_create(mapcache_context* ctx);

/** @} */


Expand Down
Loading