rgw/cache: This commit squashes commits related to boost::redis library.

RGW: Add boost_redis library
RGW: Add boost_redis to CMake
RGW: Add aedis methods to RedisDriver
RGW: Minor RedisDriver cleanup
build: Remove build/boost_redis
build: remove src/redis
build: Set src/boost_redis submodule to release version
RGW: Remove broken boost_redis
RGW: Add boost_redis
rgw: Get rgw_redis_driver to build
rgw/redis: Update `boost::redis` library
rgw/cache: fixing compilation error, by removing aedis header
file and src file includes from redis driver

Signed-off-by: Samarah <samarah.uriarte@ibm.com>
Co-authored-by: Adam Emerson <aemerson@redhat.com>
Co-authored-by: Pritha Srivastava <prsrivas@redhat.com>

diff --git a/.gitmodules b/.gitmodules
index 30307592b5654172ae3f1987edbb6bc5f638a02a..341a8246ece9efbcd6cf49764e59a39c10e56d58 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -81,3 +81,6 @@
 [submodule "src/qatzip"]
        path = src/qatzip
        url = https://github.com/intel/qatzip.git
+[submodule "src/boost_redis"]
+       path = src/boost_redis
+       url = https://github.com/boostorg/redis.git

diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
index 47cd702ca2252679474c5f8426eb43a6828a2b16..3b3b2688426bb9a45f47900ff2e3059e6b9745f0 100644 (file)
--- a/cmake/modules/BuildBoost.cmake
+++ b/cmake/modules/BuildBoost.cmake
@@ -11,6 +11,8 @@
 #  Boost_USE_STATIC_LIBS : boolean (default: OFF)
 #  Boost_USE_MULTITHREADED : boolean (default: OFF)
 #  BOOST_J: integer (defanult 1)
+#
+# Note: Remove boost_redis submodule once upgraded to Boost version that includes it
 
 function(check_boost_version source_dir expected_version)
   set(version_hpp "${source_dir}/boost/version.hpp")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 149bdc45562f389114549ba8b5321a59260130d1..da7c5ea9019d07acc1eec47e9cd93eaf697babc2 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -294,7 +294,7 @@ if(WITH_CEPHFS_JAVA)
 endif()
 
 if(WITH_RADOSGW_D4N)
-  add_subdirectory(cpp_redis)
+  add_subdirectory(cpp_redis) # remove later -Sam
 endif()
 
 if (WITH_BLKIN)

diff --git a/src/boost_redis b/src/boost_redis
new file mode 160000 (submodule)
index 0000000..4652537
--- /dev/null
+++ b/src/boost_redis
@@ -0,0 +1 @@
+Subproject commit 46525371b9247a1ec208a6157880ec77f5ddadc4

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index a54d57f9c5a7fb37d603898f5e0f6a9b669ae5a6..8ad74d1a1cabb8d4393abdb5df6ad77eb3d54c52 100644 (file)
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -297,10 +297,12 @@ target_include_directories(rgw_common
   PUBLIC "${LUA_INCLUDE_DIR}")
 
 if(WITH_RADOSGW_D4N)
-  add_dependencies(rgw_common cpp_redis)
+  add_dependencies(rgw_common cpp_redis) # remove later -Sam
   target_link_libraries(rgw_common PRIVATE cpp_redis)
   target_include_directories(rgw_common SYSTEM PUBLIC "${CMAKE_SOURCE_DIR}/src/cpp_redis/includes")
   target_include_directories(rgw_common SYSTEM PUBLIC "${CMAKE_SOURCE_DIR}/src/cpp_redis/tacopie/includes")
+
+  target_include_directories(rgw_common SYSTEM PUBLIC "${CMAKE_SOURCE_DIR}/src/boost_redis/include")
 endif()
 
 if(WITH_RADOSGW_KAFKA_ENDPOINT)

diff --git a/src/rgw/rgw_redis_driver.cc b/src/rgw/rgw_redis_driver.cc
index 87c488dd4ea9438bcf8248d3af7a9047ae3969d6..0d5d0f23acc56e1ac7bae7811ccd48a2c56e8446 100644 (file)
--- a/src/rgw/rgw_redis_driver.cc
+++ b/src/rgw/rgw_redis_driver.cc
@@ -1,6 +1,7 @@
 #include <boost/algorithm/string.hpp>
 #include "rgw_redis_driver.h"
-//#include "rgw_ssd_driver.h"
+//#include "rgw_ssd_driver.h" // fix -Sam
+//#include <aedis/src.hpp>
 
 #define dout_subsys ceph_subsys_rgw
 #define dout_context g_ceph_context

diff --git a/src/rgw/rgw_redis_driver.h b/src/rgw/rgw_redis_driver.h
index 1f8ea953b94b572e408fce1215a117c5e87e2b2d..c392b5487b83f9b16bda296367d3d1b219e5f5d8 100644 (file)
--- a/src/rgw/rgw_redis_driver.h
+++ b/src/rgw/rgw_redis_driver.h
@@ -1,6 +1,7 @@
 #ifndef CEPH_REDISDRIVER_H
 #define CEPH_REDISDRIVER_H
 
+//#include <aedis.hpp>
 #include <aio.h>
 #include "common/async/completion.h"
 #include <string>