From 644a4881905b4cf88eae2c2e19b62aa8c07b9cc6 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Fri, 2 Dec 2022 11:34:44 -0500 Subject: [PATCH] RGW - Zipper - move rgw/store to rgw/driver Signed-off-by: Daniel Gryniewicz --- src/rgw/CMakeLists.txt | 106 +++++++++--------- src/rgw/{store => driver}/daos/README.md | 0 .../{store => driver}/dbstore/CMakeLists.txt | 0 src/rgw/{store => driver}/dbstore/README.md | 2 +- .../dbstore/common/connection_pool.h | 0 .../dbstore/common/dbstore.cc | 0 .../dbstore/common/dbstore.h | 0 .../dbstore/common/dbstore_log.h | 0 .../dbstore/config/sqlite.cc | 0 .../{store => driver}/dbstore/config/sqlite.h | 0 .../dbstore/config/sqlite_schema.h | 0 .../{store => driver}/dbstore/config/store.cc | 0 .../{store => driver}/dbstore/config/store.h | 0 .../{store => driver}/dbstore/dbstore_main.cc | 0 .../{store => driver}/dbstore/dbstore_mgr.cc | 0 .../{store => driver}/dbstore/dbstore_mgr.h | 0 .../dbstore/sqlite/CMakeLists.txt | 0 .../dbstore/sqlite/connection.cc | 0 .../dbstore/sqlite/connection.h | 0 .../{store => driver}/dbstore/sqlite/error.cc | 0 .../{store => driver}/dbstore/sqlite/error.h | 0 .../dbstore/sqlite/sqliteDB.cc | 0 .../dbstore/sqlite/sqliteDB.h | 2 +- .../dbstore/sqlite/statement.cc | 0 .../dbstore/sqlite/statement.h | 0 .../dbstore/tests/CMakeLists.txt | 0 .../dbstore/tests/dbstore_mgr_tests.cc | 2 +- .../dbstore/tests/dbstore_tests.cc | 0 .../immutable_config/store.cc | 0 .../immutable_config/store.h | 0 .../{store => driver}/json_config/store.cc | 2 +- src/rgw/{store => driver}/json_config/store.h | 2 +- .../rados/cls_fifo_legacy.cc | 0 .../{store => driver}/rados/cls_fifo_legacy.h | 0 .../{store => driver}/rados/config/impl.cc | 0 src/rgw/{store => driver}/rados/config/impl.h | 0 .../{store => driver}/rados/config/period.cc | 2 +- .../rados/config/period_config.cc | 2 +- .../{store => driver}/rados/config/realm.cc | 2 +- .../{store => driver}/rados/config/store.cc | 0 .../{store => driver}/rados/config/store.h | 0 .../{store => driver}/rados/config/zone.cc | 2 +- .../rados/config/zonegroup.cc | 2 +- src/rgw/{store => driver}/rados/rgw_bucket.cc | 0 src/rgw/{store => driver}/rados/rgw_bucket.h | 0 .../rados/rgw_bucket_sync.cc | 0 .../{store => driver}/rados/rgw_bucket_sync.h | 0 .../{store => driver}/rados/rgw_cr_rados.cc | 0 .../{store => driver}/rados/rgw_cr_rados.h | 0 .../{store => driver}/rados/rgw_cr_tools.cc | 0 .../{store => driver}/rados/rgw_cr_tools.h | 0 .../rados/rgw_d3n_datacache.cc | 0 .../rados/rgw_d3n_datacache.h | 0 .../{store => driver}/rados/rgw_data_sync.cc | 0 .../{store => driver}/rados/rgw_data_sync.h | 0 .../{store => driver}/rados/rgw_datalog.cc | 0 src/rgw/{store => driver}/rados/rgw_datalog.h | 0 .../rados/rgw_datalog_notify.cc | 0 .../rados/rgw_datalog_notify.h | 0 .../rados/rgw_etag_verifier.cc | 0 .../rados/rgw_etag_verifier.h | 0 src/rgw/{store => driver}/rados/rgw_gc.cc | 0 src/rgw/{store => driver}/rados/rgw_gc.h | 0 src/rgw/{store => driver}/rados/rgw_gc_log.cc | 0 .../{store => driver}/rados/rgw_lc_tier.cc | 0 src/rgw/{store => driver}/rados/rgw_lc_tier.h | 0 .../rados/rgw_log_backing.cc | 0 .../{store => driver}/rados/rgw_log_backing.h | 0 .../{store => driver}/rados/rgw_metadata.cc | 0 .../{store => driver}/rados/rgw_metadata.h | 0 src/rgw/{store => driver}/rados/rgw_notify.cc | 0 src/rgw/{store => driver}/rados/rgw_notify.h | 0 .../rados/rgw_obj_manifest.cc | 0 .../rados/rgw_obj_manifest.h | 0 .../rados/rgw_object_expirer_core.cc | 0 .../rados/rgw_object_expirer_core.h | 0 src/rgw/{store => driver}/rados/rgw_otp.cc | 0 src/rgw/{store => driver}/rados/rgw_otp.h | 0 src/rgw/{store => driver}/rados/rgw_period.cc | 0 .../rados/rgw_rest_pubsub.cc | 0 .../{store => driver}/rados/rgw_rest_pubsub.h | 0 .../{store => driver}/rados/rgw_rest_realm.cc | 0 .../{store => driver}/rados/rgw_rest_realm.h | 0 .../{store => driver}/rados/rgw_rest_user.cc | 0 .../{store => driver}/rados/rgw_rest_user.h | 0 .../{store => driver}/rados/rgw_sal_rados.cc | 0 .../{store => driver}/rados/rgw_sal_rados.h | 0 .../{store => driver}/rados/rgw_service.cc | 0 src/rgw/{store => driver}/rados/rgw_service.h | 0 src/rgw/{store => driver}/rados/rgw_sync.cc | 0 src/rgw/{store => driver}/rados/rgw_sync.h | 0 .../rados/rgw_sync_counters.cc | 0 .../rados/rgw_sync_counters.h | 0 .../rados/rgw_sync_error_repo.cc | 0 .../rados/rgw_sync_error_repo.h | 0 .../rados/rgw_sync_module.cc | 0 .../{store => driver}/rados/rgw_sync_module.h | 0 .../rados/rgw_sync_module_aws.cc | 0 .../rados/rgw_sync_module_aws.h | 0 .../rados/rgw_sync_module_es.cc | 0 .../rados/rgw_sync_module_es.h | 0 .../rados/rgw_sync_module_es_rest.cc | 0 .../rados/rgw_sync_module_es_rest.h | 0 .../rados/rgw_sync_module_log.cc | 0 .../rados/rgw_sync_module_log.h | 0 .../{store => driver}/rados/rgw_sync_trace.cc | 0 .../{store => driver}/rados/rgw_sync_trace.h | 0 src/rgw/{store => driver}/rados/rgw_tools.cc | 0 src/rgw/{store => driver}/rados/rgw_tools.h | 0 .../{store => driver}/rados/rgw_trim_bilog.cc | 0 .../{store => driver}/rados/rgw_trim_bilog.h | 0 .../rados/rgw_trim_datalog.cc | 0 .../rados/rgw_trim_datalog.h | 0 .../{store => driver}/rados/rgw_trim_mdlog.cc | 0 .../{store => driver}/rados/rgw_trim_mdlog.h | 0 src/rgw/{store => driver}/rados/rgw_user.cc | 0 src/rgw/{store => driver}/rados/rgw_user.h | 0 src/rgw/{store => driver}/rados/rgw_zone.cc | 0 src/rgw/{store => driver}/rados/rgw_zone.h | 0 src/rgw/rgw_rados.cc | 2 +- src/rgw/rgw_sal.cc | 6 +- src/rgw/rgw_sal_dbstore.h | 4 +- src/test/CMakeLists.txt | 8 +- 123 files changed, 73 insertions(+), 73 deletions(-) rename src/rgw/{store => driver}/daos/README.md (100%) rename src/rgw/{store => driver}/dbstore/CMakeLists.txt (100%) rename src/rgw/{store => driver}/dbstore/README.md (97%) rename src/rgw/{store => driver}/dbstore/common/connection_pool.h (100%) rename src/rgw/{store => driver}/dbstore/common/dbstore.cc (100%) rename src/rgw/{store => driver}/dbstore/common/dbstore.h (100%) rename src/rgw/{store => driver}/dbstore/common/dbstore_log.h (100%) rename src/rgw/{store => driver}/dbstore/config/sqlite.cc (100%) rename src/rgw/{store => driver}/dbstore/config/sqlite.h (100%) rename src/rgw/{store => driver}/dbstore/config/sqlite_schema.h (100%) rename src/rgw/{store => driver}/dbstore/config/store.cc (100%) rename src/rgw/{store => driver}/dbstore/config/store.h (100%) rename src/rgw/{store => driver}/dbstore/dbstore_main.cc (100%) rename src/rgw/{store => driver}/dbstore/dbstore_mgr.cc (100%) rename src/rgw/{store => driver}/dbstore/dbstore_mgr.h (100%) rename src/rgw/{store => driver}/dbstore/sqlite/CMakeLists.txt (100%) rename src/rgw/{store => driver}/dbstore/sqlite/connection.cc (100%) rename src/rgw/{store => driver}/dbstore/sqlite/connection.h (100%) rename src/rgw/{store => driver}/dbstore/sqlite/error.cc (100%) rename src/rgw/{store => driver}/dbstore/sqlite/error.h (100%) rename src/rgw/{store => driver}/dbstore/sqlite/sqliteDB.cc (100%) rename src/rgw/{store => driver}/dbstore/sqlite/sqliteDB.h (99%) rename src/rgw/{store => driver}/dbstore/sqlite/statement.cc (100%) rename src/rgw/{store => driver}/dbstore/sqlite/statement.h (100%) rename src/rgw/{store => driver}/dbstore/tests/CMakeLists.txt (100%) rename src/rgw/{store => driver}/dbstore/tests/dbstore_mgr_tests.cc (99%) rename src/rgw/{store => driver}/dbstore/tests/dbstore_tests.cc (100%) rename src/rgw/{store => driver}/immutable_config/store.cc (100%) rename src/rgw/{store => driver}/immutable_config/store.h (100%) rename src/rgw/{store => driver}/json_config/store.cc (99%) rename src/rgw/{store => driver}/json_config/store.h (93%) rename src/rgw/{store => driver}/rados/cls_fifo_legacy.cc (100%) rename src/rgw/{store => driver}/rados/cls_fifo_legacy.h (100%) rename src/rgw/{store => driver}/rados/config/impl.cc (100%) rename src/rgw/{store => driver}/rados/config/impl.h (100%) rename src/rgw/{store => driver}/rados/config/period.cc (99%) rename src/rgw/{store => driver}/rados/config/period_config.cc (97%) rename src/rgw/{store => driver}/rados/config/realm.cc (99%) rename src/rgw/{store => driver}/rados/config/store.cc (100%) rename src/rgw/{store => driver}/rados/config/store.h (100%) rename src/rgw/{store => driver}/rados/config/zone.cc (99%) rename src/rgw/{store => driver}/rados/config/zonegroup.cc (99%) rename src/rgw/{store => driver}/rados/rgw_bucket.cc (100%) rename src/rgw/{store => driver}/rados/rgw_bucket.h (100%) rename src/rgw/{store => driver}/rados/rgw_bucket_sync.cc (100%) rename src/rgw/{store => driver}/rados/rgw_bucket_sync.h (100%) rename src/rgw/{store => driver}/rados/rgw_cr_rados.cc (100%) rename src/rgw/{store => driver}/rados/rgw_cr_rados.h (100%) rename src/rgw/{store => driver}/rados/rgw_cr_tools.cc (100%) rename src/rgw/{store => driver}/rados/rgw_cr_tools.h (100%) rename src/rgw/{store => driver}/rados/rgw_d3n_datacache.cc (100%) rename src/rgw/{store => driver}/rados/rgw_d3n_datacache.h (100%) rename src/rgw/{store => driver}/rados/rgw_data_sync.cc (100%) rename src/rgw/{store => driver}/rados/rgw_data_sync.h (100%) rename src/rgw/{store => driver}/rados/rgw_datalog.cc (100%) rename src/rgw/{store => driver}/rados/rgw_datalog.h (100%) rename src/rgw/{store => driver}/rados/rgw_datalog_notify.cc (100%) rename src/rgw/{store => driver}/rados/rgw_datalog_notify.h (100%) rename src/rgw/{store => driver}/rados/rgw_etag_verifier.cc (100%) rename src/rgw/{store => driver}/rados/rgw_etag_verifier.h (100%) rename src/rgw/{store => driver}/rados/rgw_gc.cc (100%) rename src/rgw/{store => driver}/rados/rgw_gc.h (100%) rename src/rgw/{store => driver}/rados/rgw_gc_log.cc (100%) rename src/rgw/{store => driver}/rados/rgw_lc_tier.cc (100%) rename src/rgw/{store => driver}/rados/rgw_lc_tier.h (100%) rename src/rgw/{store => driver}/rados/rgw_log_backing.cc (100%) rename src/rgw/{store => driver}/rados/rgw_log_backing.h (100%) rename src/rgw/{store => driver}/rados/rgw_metadata.cc (100%) rename src/rgw/{store => driver}/rados/rgw_metadata.h (100%) rename src/rgw/{store => driver}/rados/rgw_notify.cc (100%) rename src/rgw/{store => driver}/rados/rgw_notify.h (100%) rename src/rgw/{store => driver}/rados/rgw_obj_manifest.cc (100%) rename src/rgw/{store => driver}/rados/rgw_obj_manifest.h (100%) rename src/rgw/{store => driver}/rados/rgw_object_expirer_core.cc (100%) rename src/rgw/{store => driver}/rados/rgw_object_expirer_core.h (100%) rename src/rgw/{store => driver}/rados/rgw_otp.cc (100%) rename src/rgw/{store => driver}/rados/rgw_otp.h (100%) rename src/rgw/{store => driver}/rados/rgw_period.cc (100%) rename src/rgw/{store => driver}/rados/rgw_rest_pubsub.cc (100%) rename src/rgw/{store => driver}/rados/rgw_rest_pubsub.h (100%) rename src/rgw/{store => driver}/rados/rgw_rest_realm.cc (100%) rename src/rgw/{store => driver}/rados/rgw_rest_realm.h (100%) rename src/rgw/{store => driver}/rados/rgw_rest_user.cc (100%) rename src/rgw/{store => driver}/rados/rgw_rest_user.h (100%) rename src/rgw/{store => driver}/rados/rgw_sal_rados.cc (100%) rename src/rgw/{store => driver}/rados/rgw_sal_rados.h (100%) rename src/rgw/{store => driver}/rados/rgw_service.cc (100%) rename src/rgw/{store => driver}/rados/rgw_service.h (100%) rename src/rgw/{store => driver}/rados/rgw_sync.cc (100%) rename src/rgw/{store => driver}/rados/rgw_sync.h (100%) rename src/rgw/{store => driver}/rados/rgw_sync_counters.cc (100%) rename src/rgw/{store => driver}/rados/rgw_sync_counters.h (100%) rename src/rgw/{store => driver}/rados/rgw_sync_error_repo.cc (100%) rename src/rgw/{store => driver}/rados/rgw_sync_error_repo.h (100%) rename src/rgw/{store => driver}/rados/rgw_sync_module.cc (100%) rename src/rgw/{store => driver}/rados/rgw_sync_module.h (100%) rename src/rgw/{store => driver}/rados/rgw_sync_module_aws.cc (100%) rename src/rgw/{store => driver}/rados/rgw_sync_module_aws.h (100%) rename src/rgw/{store => driver}/rados/rgw_sync_module_es.cc (100%) rename src/rgw/{store => driver}/rados/rgw_sync_module_es.h (100%) rename src/rgw/{store => driver}/rados/rgw_sync_module_es_rest.cc (100%) rename src/rgw/{store => driver}/rados/rgw_sync_module_es_rest.h (100%) rename src/rgw/{store => driver}/rados/rgw_sync_module_log.cc (100%) rename src/rgw/{store => driver}/rados/rgw_sync_module_log.h (100%) rename src/rgw/{store => driver}/rados/rgw_sync_trace.cc (100%) rename src/rgw/{store => driver}/rados/rgw_sync_trace.h (100%) rename src/rgw/{store => driver}/rados/rgw_tools.cc (100%) rename src/rgw/{store => driver}/rados/rgw_tools.h (100%) rename src/rgw/{store => driver}/rados/rgw_trim_bilog.cc (100%) rename src/rgw/{store => driver}/rados/rgw_trim_bilog.h (100%) rename src/rgw/{store => driver}/rados/rgw_trim_datalog.cc (100%) rename src/rgw/{store => driver}/rados/rgw_trim_datalog.h (100%) rename src/rgw/{store => driver}/rados/rgw_trim_mdlog.cc (100%) rename src/rgw/{store => driver}/rados/rgw_trim_mdlog.h (100%) rename src/rgw/{store => driver}/rados/rgw_user.cc (100%) rename src/rgw/{store => driver}/rados/rgw_user.h (100%) rename src/rgw/{store => driver}/rados/rgw_zone.cc (100%) rename src/rgw/{store => driver}/rados/rgw_zone.h (100%) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index 7b6ac917f85..8d663be01fb 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -142,57 +142,57 @@ set(librgw_common_srcs rgw_bucket_encryption.cc rgw_tracer.cc rgw_lua_background.cc - store/rados/cls_fifo_legacy.cc - store/rados/rgw_bucket.cc - store/rados/rgw_bucket_sync.cc - store/rados/rgw_cr_rados.cc - store/rados/rgw_cr_tools.cc - store/rados/rgw_d3n_datacache.cc - store/rados/rgw_datalog.cc - store/rados/rgw_datalog_notify.cc - store/rados/rgw_data_sync.cc - store/rados/rgw_etag_verifier.cc - store/rados/rgw_gc.cc - store/rados/rgw_gc_log.cc - store/rados/rgw_lc_tier.cc - store/rados/rgw_log_backing.cc - store/rados/rgw_metadata.cc - store/rados/rgw_notify.cc - store/rados/rgw_obj_manifest.cc - store/rados/rgw_object_expirer_core.cc - store/rados/rgw_otp.cc - store/rados/rgw_period.cc - store/rados/rgw_rest_pubsub.cc - store/rados/rgw_rest_realm.cc - store/rados/rgw_rest_user.cc - store/rados/rgw_sal_rados.cc - store/rados/rgw_service.cc - store/rados/rgw_sync.cc - store/rados/rgw_sync_counters.cc - store/rados/rgw_sync_error_repo.cc - store/rados/rgw_sync_module.cc - store/rados/rgw_sync_module_aws.cc - store/rados/rgw_sync_module_es.cc - store/rados/rgw_sync_module_es_rest.cc - store/rados/rgw_sync_module_log.cc - store/rados/rgw_sync_trace.cc - store/rados/rgw_tools.cc - store/rados/rgw_trim_bilog.cc - store/rados/rgw_trim_datalog.cc - store/rados/rgw_trim_mdlog.cc - store/rados/rgw_user.cc - store/rados/rgw_zone.cc) + driver/rados/cls_fifo_legacy.cc + driver/rados/rgw_bucket.cc + driver/rados/rgw_bucket_sync.cc + driver/rados/rgw_cr_rados.cc + driver/rados/rgw_cr_tools.cc + driver/rados/rgw_d3n_datacache.cc + driver/rados/rgw_datalog.cc + driver/rados/rgw_datalog_notify.cc + driver/rados/rgw_data_sync.cc + driver/rados/rgw_etag_verifier.cc + driver/rados/rgw_gc.cc + driver/rados/rgw_gc_log.cc + driver/rados/rgw_lc_tier.cc + driver/rados/rgw_log_backing.cc + driver/rados/rgw_metadata.cc + driver/rados/rgw_notify.cc + driver/rados/rgw_obj_manifest.cc + driver/rados/rgw_object_expirer_core.cc + driver/rados/rgw_otp.cc + driver/rados/rgw_period.cc + driver/rados/rgw_rest_pubsub.cc + driver/rados/rgw_rest_realm.cc + driver/rados/rgw_rest_user.cc + driver/rados/rgw_sal_rados.cc + driver/rados/rgw_service.cc + driver/rados/rgw_sync.cc + driver/rados/rgw_sync_counters.cc + driver/rados/rgw_sync_error_repo.cc + driver/rados/rgw_sync_module.cc + driver/rados/rgw_sync_module_aws.cc + driver/rados/rgw_sync_module_es.cc + driver/rados/rgw_sync_module_es_rest.cc + driver/rados/rgw_sync_module_log.cc + driver/rados/rgw_sync_trace.cc + driver/rados/rgw_tools.cc + driver/rados/rgw_trim_bilog.cc + driver/rados/rgw_trim_datalog.cc + driver/rados/rgw_trim_mdlog.cc + driver/rados/rgw_user.cc + driver/rados/rgw_zone.cc) list(APPEND librgw_common_srcs - store/immutable_config/store.cc - store/json_config/store.cc - store/rados/config/impl.cc - store/rados/config/period.cc - store/rados/config/period_config.cc - store/rados/config/realm.cc - store/rados/config/store.cc - store/rados/config/zone.cc - store/rados/config/zonegroup.cc) + driver/immutable_config/store.cc + driver/json_config/store.cc + driver/rados/config/impl.cc + driver/rados/config/period.cc + driver/rados/config/period_config.cc + driver/rados/config/realm.cc + driver/rados/config/store.cc + driver/rados/config/zone.cc + driver/rados/config/zonegroup.cc) if(WITH_RADOSGW_AMQP_ENDPOINT) list(APPEND librgw_common_srcs rgw_amqp.cc) @@ -201,7 +201,7 @@ if(WITH_RADOSGW_KAFKA_ENDPOINT) list(APPEND librgw_common_srcs rgw_kafka.cc) endif() if(WITH_RADOSGW_DBSTORE) - add_subdirectory(store/dbstore) + add_subdirectory(driver/dbstore) list(APPEND librgw_common_srcs rgw_sal_dbstore.cc) endif() if(WITH_RADOSGW_MOTR) @@ -253,7 +253,7 @@ target_link_libraries(rgw_common spawn) target_include_directories(rgw_common PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/services" - PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/store/rados" + PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/driver/rados" PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw" PUBLIC "${LUA_INCLUDE_DIR}") if(WITH_RADOSGW_KAFKA_ENDPOINT) @@ -334,7 +334,7 @@ set(rgw_a_srcs rgw_rest_log.cc rgw_rest_metadata.cc rgw_rest_ratelimit.cc - store/rados/rgw_rest_realm.cc + driver/rados/rgw_rest_realm.cc rgw_rest_sts.cc rgw_rest_swift.cc rgw_rest_usage.cc @@ -359,7 +359,7 @@ target_include_directories(rgw_a SYSTEM PUBLIC "../rapidjson/include" PUBLIC "${CMAKE_SOURCE_DIR}/src/dmclock/support/src" PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw" - PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/store/rados" + PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/driver/rados" PRIVATE "${CMAKE_SOURCE_DIR}/src/libkmip") if(WITH_RADOSGW_AMQP_ENDPOINT) diff --git a/src/rgw/store/daos/README.md b/src/rgw/driver/daos/README.md similarity index 100% rename from src/rgw/store/daos/README.md rename to src/rgw/driver/daos/README.md diff --git a/src/rgw/store/dbstore/CMakeLists.txt b/src/rgw/driver/dbstore/CMakeLists.txt similarity index 100% rename from src/rgw/store/dbstore/CMakeLists.txt rename to src/rgw/driver/dbstore/CMakeLists.txt diff --git a/src/rgw/store/dbstore/README.md b/src/rgw/driver/dbstore/README.md similarity index 97% rename from src/rgw/store/dbstore/README.md rename to src/rgw/driver/dbstore/README.md index 659bc205276..0867bc2cca4 100644 --- a/src/rgw/store/dbstore/README.md +++ b/src/rgw/driver/dbstore/README.md @@ -47,7 +47,7 @@ To execute DBStore unit test cases (using Gtest framework), from build directory To execute Sample test file - ninja src/rgw/store/dbstore/install + ninja src/rgw/driver/dbstore/install ./bin/dbstore-bin [logfile] [loglevel] (default logfile: rgw_dbstore_bin.log, loglevel: 20) diff --git a/src/rgw/store/dbstore/common/connection_pool.h b/src/rgw/driver/dbstore/common/connection_pool.h similarity index 100% rename from src/rgw/store/dbstore/common/connection_pool.h rename to src/rgw/driver/dbstore/common/connection_pool.h diff --git a/src/rgw/store/dbstore/common/dbstore.cc b/src/rgw/driver/dbstore/common/dbstore.cc similarity index 100% rename from src/rgw/store/dbstore/common/dbstore.cc rename to src/rgw/driver/dbstore/common/dbstore.cc diff --git a/src/rgw/store/dbstore/common/dbstore.h b/src/rgw/driver/dbstore/common/dbstore.h similarity index 100% rename from src/rgw/store/dbstore/common/dbstore.h rename to src/rgw/driver/dbstore/common/dbstore.h diff --git a/src/rgw/store/dbstore/common/dbstore_log.h b/src/rgw/driver/dbstore/common/dbstore_log.h similarity index 100% rename from src/rgw/store/dbstore/common/dbstore_log.h rename to src/rgw/driver/dbstore/common/dbstore_log.h diff --git a/src/rgw/store/dbstore/config/sqlite.cc b/src/rgw/driver/dbstore/config/sqlite.cc similarity index 100% rename from src/rgw/store/dbstore/config/sqlite.cc rename to src/rgw/driver/dbstore/config/sqlite.cc diff --git a/src/rgw/store/dbstore/config/sqlite.h b/src/rgw/driver/dbstore/config/sqlite.h similarity index 100% rename from src/rgw/store/dbstore/config/sqlite.h rename to src/rgw/driver/dbstore/config/sqlite.h diff --git a/src/rgw/store/dbstore/config/sqlite_schema.h b/src/rgw/driver/dbstore/config/sqlite_schema.h similarity index 100% rename from src/rgw/store/dbstore/config/sqlite_schema.h rename to src/rgw/driver/dbstore/config/sqlite_schema.h diff --git a/src/rgw/store/dbstore/config/store.cc b/src/rgw/driver/dbstore/config/store.cc similarity index 100% rename from src/rgw/store/dbstore/config/store.cc rename to src/rgw/driver/dbstore/config/store.cc diff --git a/src/rgw/store/dbstore/config/store.h b/src/rgw/driver/dbstore/config/store.h similarity index 100% rename from src/rgw/store/dbstore/config/store.h rename to src/rgw/driver/dbstore/config/store.h diff --git a/src/rgw/store/dbstore/dbstore_main.cc b/src/rgw/driver/dbstore/dbstore_main.cc similarity index 100% rename from src/rgw/store/dbstore/dbstore_main.cc rename to src/rgw/driver/dbstore/dbstore_main.cc diff --git a/src/rgw/store/dbstore/dbstore_mgr.cc b/src/rgw/driver/dbstore/dbstore_mgr.cc similarity index 100% rename from src/rgw/store/dbstore/dbstore_mgr.cc rename to src/rgw/driver/dbstore/dbstore_mgr.cc diff --git a/src/rgw/store/dbstore/dbstore_mgr.h b/src/rgw/driver/dbstore/dbstore_mgr.h similarity index 100% rename from src/rgw/store/dbstore/dbstore_mgr.h rename to src/rgw/driver/dbstore/dbstore_mgr.h diff --git a/src/rgw/store/dbstore/sqlite/CMakeLists.txt b/src/rgw/driver/dbstore/sqlite/CMakeLists.txt similarity index 100% rename from src/rgw/store/dbstore/sqlite/CMakeLists.txt rename to src/rgw/driver/dbstore/sqlite/CMakeLists.txt diff --git a/src/rgw/store/dbstore/sqlite/connection.cc b/src/rgw/driver/dbstore/sqlite/connection.cc similarity index 100% rename from src/rgw/store/dbstore/sqlite/connection.cc rename to src/rgw/driver/dbstore/sqlite/connection.cc diff --git a/src/rgw/store/dbstore/sqlite/connection.h b/src/rgw/driver/dbstore/sqlite/connection.h similarity index 100% rename from src/rgw/store/dbstore/sqlite/connection.h rename to src/rgw/driver/dbstore/sqlite/connection.h diff --git a/src/rgw/store/dbstore/sqlite/error.cc b/src/rgw/driver/dbstore/sqlite/error.cc similarity index 100% rename from src/rgw/store/dbstore/sqlite/error.cc rename to src/rgw/driver/dbstore/sqlite/error.cc diff --git a/src/rgw/store/dbstore/sqlite/error.h b/src/rgw/driver/dbstore/sqlite/error.h similarity index 100% rename from src/rgw/store/dbstore/sqlite/error.h rename to src/rgw/driver/dbstore/sqlite/error.h diff --git a/src/rgw/store/dbstore/sqlite/sqliteDB.cc b/src/rgw/driver/dbstore/sqlite/sqliteDB.cc similarity index 100% rename from src/rgw/store/dbstore/sqlite/sqliteDB.cc rename to src/rgw/driver/dbstore/sqlite/sqliteDB.cc diff --git a/src/rgw/store/dbstore/sqlite/sqliteDB.h b/src/rgw/driver/dbstore/sqlite/sqliteDB.h similarity index 99% rename from src/rgw/store/dbstore/sqlite/sqliteDB.h rename to src/rgw/driver/dbstore/sqlite/sqliteDB.h index 038b24fe5b3..4f651448a99 100644 --- a/src/rgw/store/dbstore/sqlite/sqliteDB.h +++ b/src/rgw/driver/dbstore/sqlite/sqliteDB.h @@ -8,7 +8,7 @@ #include #include #include -#include "rgw/store/dbstore/common/dbstore.h" +#include "rgw/driver/dbstore/common/dbstore.h" using namespace rgw::store; diff --git a/src/rgw/store/dbstore/sqlite/statement.cc b/src/rgw/driver/dbstore/sqlite/statement.cc similarity index 100% rename from src/rgw/store/dbstore/sqlite/statement.cc rename to src/rgw/driver/dbstore/sqlite/statement.cc diff --git a/src/rgw/store/dbstore/sqlite/statement.h b/src/rgw/driver/dbstore/sqlite/statement.h similarity index 100% rename from src/rgw/store/dbstore/sqlite/statement.h rename to src/rgw/driver/dbstore/sqlite/statement.h diff --git a/src/rgw/store/dbstore/tests/CMakeLists.txt b/src/rgw/driver/dbstore/tests/CMakeLists.txt similarity index 100% rename from src/rgw/store/dbstore/tests/CMakeLists.txt rename to src/rgw/driver/dbstore/tests/CMakeLists.txt diff --git a/src/rgw/store/dbstore/tests/dbstore_mgr_tests.cc b/src/rgw/driver/dbstore/tests/dbstore_mgr_tests.cc similarity index 99% rename from src/rgw/store/dbstore/tests/dbstore_mgr_tests.cc rename to src/rgw/driver/dbstore/tests/dbstore_mgr_tests.cc index 4f58f476465..02ecd9f1565 100644 --- a/src/rgw/store/dbstore/tests/dbstore_mgr_tests.cc +++ b/src/rgw/driver/dbstore/tests/dbstore_mgr_tests.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "common/ceph_context.h" -#include "rgw/store/dbstore/dbstore_mgr.h" +#include "rgw/driver/dbstore/dbstore_mgr.h" #include #include diff --git a/src/rgw/store/dbstore/tests/dbstore_tests.cc b/src/rgw/driver/dbstore/tests/dbstore_tests.cc similarity index 100% rename from src/rgw/store/dbstore/tests/dbstore_tests.cc rename to src/rgw/driver/dbstore/tests/dbstore_tests.cc diff --git a/src/rgw/store/immutable_config/store.cc b/src/rgw/driver/immutable_config/store.cc similarity index 100% rename from src/rgw/store/immutable_config/store.cc rename to src/rgw/driver/immutable_config/store.cc diff --git a/src/rgw/store/immutable_config/store.h b/src/rgw/driver/immutable_config/store.h similarity index 100% rename from src/rgw/store/immutable_config/store.h rename to src/rgw/driver/immutable_config/store.h diff --git a/src/rgw/store/json_config/store.cc b/src/rgw/driver/json_config/store.cc similarity index 99% rename from src/rgw/store/json_config/store.cc rename to src/rgw/driver/json_config/store.cc index 49837a8eacd..330aa344dc5 100644 --- a/src/rgw/store/json_config/store.cc +++ b/src/rgw/driver/json_config/store.cc @@ -17,7 +17,7 @@ #include "common/errno.h" #include "common/ceph_json.h" #include "rgw_zone.h" -#include "store/immutable_config/store.h" +#include "driver/immutable_config/store.h" #include "store.h" namespace rgw::sal { diff --git a/src/rgw/store/json_config/store.h b/src/rgw/driver/json_config/store.h similarity index 93% rename from src/rgw/store/json_config/store.h rename to src/rgw/driver/json_config/store.h index 63ddf6fdcca..4482f671651 100644 --- a/src/rgw/store/json_config/store.h +++ b/src/rgw/driver/json_config/store.h @@ -14,7 +14,7 @@ #pragma once -#include "store/immutable_config/store.h" +#include "driver/immutable_config/store.h" namespace rgw::sal { diff --git a/src/rgw/store/rados/cls_fifo_legacy.cc b/src/rgw/driver/rados/cls_fifo_legacy.cc similarity index 100% rename from src/rgw/store/rados/cls_fifo_legacy.cc rename to src/rgw/driver/rados/cls_fifo_legacy.cc diff --git a/src/rgw/store/rados/cls_fifo_legacy.h b/src/rgw/driver/rados/cls_fifo_legacy.h similarity index 100% rename from src/rgw/store/rados/cls_fifo_legacy.h rename to src/rgw/driver/rados/cls_fifo_legacy.h diff --git a/src/rgw/store/rados/config/impl.cc b/src/rgw/driver/rados/config/impl.cc similarity index 100% rename from src/rgw/store/rados/config/impl.cc rename to src/rgw/driver/rados/config/impl.cc diff --git a/src/rgw/store/rados/config/impl.h b/src/rgw/driver/rados/config/impl.h similarity index 100% rename from src/rgw/store/rados/config/impl.h rename to src/rgw/driver/rados/config/impl.h diff --git a/src/rgw/store/rados/config/period.cc b/src/rgw/driver/rados/config/period.cc similarity index 99% rename from src/rgw/store/rados/config/period.cc rename to src/rgw/driver/rados/config/period.cc index 04650cebfaf..bc3fa27e72c 100644 --- a/src/rgw/store/rados/config/period.cc +++ b/src/rgw/driver/rados/config/period.cc @@ -15,7 +15,7 @@ #include "common/dout.h" #include "common/errno.h" #include "rgw_zone.h" -#include "store/rados/config/store.h" +#include "driver/rados/config/store.h" #include "impl.h" diff --git a/src/rgw/store/rados/config/period_config.cc b/src/rgw/driver/rados/config/period_config.cc similarity index 97% rename from src/rgw/store/rados/config/period_config.cc rename to src/rgw/driver/rados/config/period_config.cc index b17a48aaa60..ec984ebdc8c 100644 --- a/src/rgw/store/rados/config/period_config.cc +++ b/src/rgw/driver/rados/config/period_config.cc @@ -13,7 +13,7 @@ */ #include "rgw_zone.h" -#include "store/rados/config/store.h" +#include "driver/rados/config/store.h" #include "impl.h" diff --git a/src/rgw/store/rados/config/realm.cc b/src/rgw/driver/rados/config/realm.cc similarity index 99% rename from src/rgw/store/rados/config/realm.cc rename to src/rgw/driver/rados/config/realm.cc index f62cb7a2879..331e0ffd26e 100644 --- a/src/rgw/store/rados/config/realm.cc +++ b/src/rgw/driver/rados/config/realm.cc @@ -16,7 +16,7 @@ #include "common/errno.h" #include "rgw_realm_watcher.h" #include "rgw_zone.h" -#include "store/rados/config/store.h" +#include "driver/rados/config/store.h" #include "impl.h" diff --git a/src/rgw/store/rados/config/store.cc b/src/rgw/driver/rados/config/store.cc similarity index 100% rename from src/rgw/store/rados/config/store.cc rename to src/rgw/driver/rados/config/store.cc diff --git a/src/rgw/store/rados/config/store.h b/src/rgw/driver/rados/config/store.h similarity index 100% rename from src/rgw/store/rados/config/store.h rename to src/rgw/driver/rados/config/store.h diff --git a/src/rgw/store/rados/config/zone.cc b/src/rgw/driver/rados/config/zone.cc similarity index 99% rename from src/rgw/store/rados/config/zone.cc rename to src/rgw/driver/rados/config/zone.cc index c1151f57510..e06c1606c1a 100644 --- a/src/rgw/store/rados/config/zone.cc +++ b/src/rgw/driver/rados/config/zone.cc @@ -15,7 +15,7 @@ #include "common/dout.h" #include "common/errno.h" #include "rgw_zone.h" -#include "store/rados/config/store.h" +#include "driver/rados/config/store.h" #include "impl.h" diff --git a/src/rgw/store/rados/config/zonegroup.cc b/src/rgw/driver/rados/config/zonegroup.cc similarity index 99% rename from src/rgw/store/rados/config/zonegroup.cc rename to src/rgw/driver/rados/config/zonegroup.cc index 984fda17407..1766a68ce65 100644 --- a/src/rgw/store/rados/config/zonegroup.cc +++ b/src/rgw/driver/rados/config/zonegroup.cc @@ -15,7 +15,7 @@ #include "common/dout.h" #include "common/errno.h" #include "rgw_zone.h" -#include "store/rados/config/store.h" +#include "driver/rados/config/store.h" #include "impl.h" diff --git a/src/rgw/store/rados/rgw_bucket.cc b/src/rgw/driver/rados/rgw_bucket.cc similarity index 100% rename from src/rgw/store/rados/rgw_bucket.cc rename to src/rgw/driver/rados/rgw_bucket.cc diff --git a/src/rgw/store/rados/rgw_bucket.h b/src/rgw/driver/rados/rgw_bucket.h similarity index 100% rename from src/rgw/store/rados/rgw_bucket.h rename to src/rgw/driver/rados/rgw_bucket.h diff --git a/src/rgw/store/rados/rgw_bucket_sync.cc b/src/rgw/driver/rados/rgw_bucket_sync.cc similarity index 100% rename from src/rgw/store/rados/rgw_bucket_sync.cc rename to src/rgw/driver/rados/rgw_bucket_sync.cc diff --git a/src/rgw/store/rados/rgw_bucket_sync.h b/src/rgw/driver/rados/rgw_bucket_sync.h similarity index 100% rename from src/rgw/store/rados/rgw_bucket_sync.h rename to src/rgw/driver/rados/rgw_bucket_sync.h diff --git a/src/rgw/store/rados/rgw_cr_rados.cc b/src/rgw/driver/rados/rgw_cr_rados.cc similarity index 100% rename from src/rgw/store/rados/rgw_cr_rados.cc rename to src/rgw/driver/rados/rgw_cr_rados.cc diff --git a/src/rgw/store/rados/rgw_cr_rados.h b/src/rgw/driver/rados/rgw_cr_rados.h similarity index 100% rename from src/rgw/store/rados/rgw_cr_rados.h rename to src/rgw/driver/rados/rgw_cr_rados.h diff --git a/src/rgw/store/rados/rgw_cr_tools.cc b/src/rgw/driver/rados/rgw_cr_tools.cc similarity index 100% rename from src/rgw/store/rados/rgw_cr_tools.cc rename to src/rgw/driver/rados/rgw_cr_tools.cc diff --git a/src/rgw/store/rados/rgw_cr_tools.h b/src/rgw/driver/rados/rgw_cr_tools.h similarity index 100% rename from src/rgw/store/rados/rgw_cr_tools.h rename to src/rgw/driver/rados/rgw_cr_tools.h diff --git a/src/rgw/store/rados/rgw_d3n_datacache.cc b/src/rgw/driver/rados/rgw_d3n_datacache.cc similarity index 100% rename from src/rgw/store/rados/rgw_d3n_datacache.cc rename to src/rgw/driver/rados/rgw_d3n_datacache.cc diff --git a/src/rgw/store/rados/rgw_d3n_datacache.h b/src/rgw/driver/rados/rgw_d3n_datacache.h similarity index 100% rename from src/rgw/store/rados/rgw_d3n_datacache.h rename to src/rgw/driver/rados/rgw_d3n_datacache.h diff --git a/src/rgw/store/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc similarity index 100% rename from src/rgw/store/rados/rgw_data_sync.cc rename to src/rgw/driver/rados/rgw_data_sync.cc diff --git a/src/rgw/store/rados/rgw_data_sync.h b/src/rgw/driver/rados/rgw_data_sync.h similarity index 100% rename from src/rgw/store/rados/rgw_data_sync.h rename to src/rgw/driver/rados/rgw_data_sync.h diff --git a/src/rgw/store/rados/rgw_datalog.cc b/src/rgw/driver/rados/rgw_datalog.cc similarity index 100% rename from src/rgw/store/rados/rgw_datalog.cc rename to src/rgw/driver/rados/rgw_datalog.cc diff --git a/src/rgw/store/rados/rgw_datalog.h b/src/rgw/driver/rados/rgw_datalog.h similarity index 100% rename from src/rgw/store/rados/rgw_datalog.h rename to src/rgw/driver/rados/rgw_datalog.h diff --git a/src/rgw/store/rados/rgw_datalog_notify.cc b/src/rgw/driver/rados/rgw_datalog_notify.cc similarity index 100% rename from src/rgw/store/rados/rgw_datalog_notify.cc rename to src/rgw/driver/rados/rgw_datalog_notify.cc diff --git a/src/rgw/store/rados/rgw_datalog_notify.h b/src/rgw/driver/rados/rgw_datalog_notify.h similarity index 100% rename from src/rgw/store/rados/rgw_datalog_notify.h rename to src/rgw/driver/rados/rgw_datalog_notify.h diff --git a/src/rgw/store/rados/rgw_etag_verifier.cc b/src/rgw/driver/rados/rgw_etag_verifier.cc similarity index 100% rename from src/rgw/store/rados/rgw_etag_verifier.cc rename to src/rgw/driver/rados/rgw_etag_verifier.cc diff --git a/src/rgw/store/rados/rgw_etag_verifier.h b/src/rgw/driver/rados/rgw_etag_verifier.h similarity index 100% rename from src/rgw/store/rados/rgw_etag_verifier.h rename to src/rgw/driver/rados/rgw_etag_verifier.h diff --git a/src/rgw/store/rados/rgw_gc.cc b/src/rgw/driver/rados/rgw_gc.cc similarity index 100% rename from src/rgw/store/rados/rgw_gc.cc rename to src/rgw/driver/rados/rgw_gc.cc diff --git a/src/rgw/store/rados/rgw_gc.h b/src/rgw/driver/rados/rgw_gc.h similarity index 100% rename from src/rgw/store/rados/rgw_gc.h rename to src/rgw/driver/rados/rgw_gc.h diff --git a/src/rgw/store/rados/rgw_gc_log.cc b/src/rgw/driver/rados/rgw_gc_log.cc similarity index 100% rename from src/rgw/store/rados/rgw_gc_log.cc rename to src/rgw/driver/rados/rgw_gc_log.cc diff --git a/src/rgw/store/rados/rgw_lc_tier.cc b/src/rgw/driver/rados/rgw_lc_tier.cc similarity index 100% rename from src/rgw/store/rados/rgw_lc_tier.cc rename to src/rgw/driver/rados/rgw_lc_tier.cc diff --git a/src/rgw/store/rados/rgw_lc_tier.h b/src/rgw/driver/rados/rgw_lc_tier.h similarity index 100% rename from src/rgw/store/rados/rgw_lc_tier.h rename to src/rgw/driver/rados/rgw_lc_tier.h diff --git a/src/rgw/store/rados/rgw_log_backing.cc b/src/rgw/driver/rados/rgw_log_backing.cc similarity index 100% rename from src/rgw/store/rados/rgw_log_backing.cc rename to src/rgw/driver/rados/rgw_log_backing.cc diff --git a/src/rgw/store/rados/rgw_log_backing.h b/src/rgw/driver/rados/rgw_log_backing.h similarity index 100% rename from src/rgw/store/rados/rgw_log_backing.h rename to src/rgw/driver/rados/rgw_log_backing.h diff --git a/src/rgw/store/rados/rgw_metadata.cc b/src/rgw/driver/rados/rgw_metadata.cc similarity index 100% rename from src/rgw/store/rados/rgw_metadata.cc rename to src/rgw/driver/rados/rgw_metadata.cc diff --git a/src/rgw/store/rados/rgw_metadata.h b/src/rgw/driver/rados/rgw_metadata.h similarity index 100% rename from src/rgw/store/rados/rgw_metadata.h rename to src/rgw/driver/rados/rgw_metadata.h diff --git a/src/rgw/store/rados/rgw_notify.cc b/src/rgw/driver/rados/rgw_notify.cc similarity index 100% rename from src/rgw/store/rados/rgw_notify.cc rename to src/rgw/driver/rados/rgw_notify.cc diff --git a/src/rgw/store/rados/rgw_notify.h b/src/rgw/driver/rados/rgw_notify.h similarity index 100% rename from src/rgw/store/rados/rgw_notify.h rename to src/rgw/driver/rados/rgw_notify.h diff --git a/src/rgw/store/rados/rgw_obj_manifest.cc b/src/rgw/driver/rados/rgw_obj_manifest.cc similarity index 100% rename from src/rgw/store/rados/rgw_obj_manifest.cc rename to src/rgw/driver/rados/rgw_obj_manifest.cc diff --git a/src/rgw/store/rados/rgw_obj_manifest.h b/src/rgw/driver/rados/rgw_obj_manifest.h similarity index 100% rename from src/rgw/store/rados/rgw_obj_manifest.h rename to src/rgw/driver/rados/rgw_obj_manifest.h diff --git a/src/rgw/store/rados/rgw_object_expirer_core.cc b/src/rgw/driver/rados/rgw_object_expirer_core.cc similarity index 100% rename from src/rgw/store/rados/rgw_object_expirer_core.cc rename to src/rgw/driver/rados/rgw_object_expirer_core.cc diff --git a/src/rgw/store/rados/rgw_object_expirer_core.h b/src/rgw/driver/rados/rgw_object_expirer_core.h similarity index 100% rename from src/rgw/store/rados/rgw_object_expirer_core.h rename to src/rgw/driver/rados/rgw_object_expirer_core.h diff --git a/src/rgw/store/rados/rgw_otp.cc b/src/rgw/driver/rados/rgw_otp.cc similarity index 100% rename from src/rgw/store/rados/rgw_otp.cc rename to src/rgw/driver/rados/rgw_otp.cc diff --git a/src/rgw/store/rados/rgw_otp.h b/src/rgw/driver/rados/rgw_otp.h similarity index 100% rename from src/rgw/store/rados/rgw_otp.h rename to src/rgw/driver/rados/rgw_otp.h diff --git a/src/rgw/store/rados/rgw_period.cc b/src/rgw/driver/rados/rgw_period.cc similarity index 100% rename from src/rgw/store/rados/rgw_period.cc rename to src/rgw/driver/rados/rgw_period.cc diff --git a/src/rgw/store/rados/rgw_rest_pubsub.cc b/src/rgw/driver/rados/rgw_rest_pubsub.cc similarity index 100% rename from src/rgw/store/rados/rgw_rest_pubsub.cc rename to src/rgw/driver/rados/rgw_rest_pubsub.cc diff --git a/src/rgw/store/rados/rgw_rest_pubsub.h b/src/rgw/driver/rados/rgw_rest_pubsub.h similarity index 100% rename from src/rgw/store/rados/rgw_rest_pubsub.h rename to src/rgw/driver/rados/rgw_rest_pubsub.h diff --git a/src/rgw/store/rados/rgw_rest_realm.cc b/src/rgw/driver/rados/rgw_rest_realm.cc similarity index 100% rename from src/rgw/store/rados/rgw_rest_realm.cc rename to src/rgw/driver/rados/rgw_rest_realm.cc diff --git a/src/rgw/store/rados/rgw_rest_realm.h b/src/rgw/driver/rados/rgw_rest_realm.h similarity index 100% rename from src/rgw/store/rados/rgw_rest_realm.h rename to src/rgw/driver/rados/rgw_rest_realm.h diff --git a/src/rgw/store/rados/rgw_rest_user.cc b/src/rgw/driver/rados/rgw_rest_user.cc similarity index 100% rename from src/rgw/store/rados/rgw_rest_user.cc rename to src/rgw/driver/rados/rgw_rest_user.cc diff --git a/src/rgw/store/rados/rgw_rest_user.h b/src/rgw/driver/rados/rgw_rest_user.h similarity index 100% rename from src/rgw/store/rados/rgw_rest_user.h rename to src/rgw/driver/rados/rgw_rest_user.h diff --git a/src/rgw/store/rados/rgw_sal_rados.cc b/src/rgw/driver/rados/rgw_sal_rados.cc similarity index 100% rename from src/rgw/store/rados/rgw_sal_rados.cc rename to src/rgw/driver/rados/rgw_sal_rados.cc diff --git a/src/rgw/store/rados/rgw_sal_rados.h b/src/rgw/driver/rados/rgw_sal_rados.h similarity index 100% rename from src/rgw/store/rados/rgw_sal_rados.h rename to src/rgw/driver/rados/rgw_sal_rados.h diff --git a/src/rgw/store/rados/rgw_service.cc b/src/rgw/driver/rados/rgw_service.cc similarity index 100% rename from src/rgw/store/rados/rgw_service.cc rename to src/rgw/driver/rados/rgw_service.cc diff --git a/src/rgw/store/rados/rgw_service.h b/src/rgw/driver/rados/rgw_service.h similarity index 100% rename from src/rgw/store/rados/rgw_service.h rename to src/rgw/driver/rados/rgw_service.h diff --git a/src/rgw/store/rados/rgw_sync.cc b/src/rgw/driver/rados/rgw_sync.cc similarity index 100% rename from src/rgw/store/rados/rgw_sync.cc rename to src/rgw/driver/rados/rgw_sync.cc diff --git a/src/rgw/store/rados/rgw_sync.h b/src/rgw/driver/rados/rgw_sync.h similarity index 100% rename from src/rgw/store/rados/rgw_sync.h rename to src/rgw/driver/rados/rgw_sync.h diff --git a/src/rgw/store/rados/rgw_sync_counters.cc b/src/rgw/driver/rados/rgw_sync_counters.cc similarity index 100% rename from src/rgw/store/rados/rgw_sync_counters.cc rename to src/rgw/driver/rados/rgw_sync_counters.cc diff --git a/src/rgw/store/rados/rgw_sync_counters.h b/src/rgw/driver/rados/rgw_sync_counters.h similarity index 100% rename from src/rgw/store/rados/rgw_sync_counters.h rename to src/rgw/driver/rados/rgw_sync_counters.h diff --git a/src/rgw/store/rados/rgw_sync_error_repo.cc b/src/rgw/driver/rados/rgw_sync_error_repo.cc similarity index 100% rename from src/rgw/store/rados/rgw_sync_error_repo.cc rename to src/rgw/driver/rados/rgw_sync_error_repo.cc diff --git a/src/rgw/store/rados/rgw_sync_error_repo.h b/src/rgw/driver/rados/rgw_sync_error_repo.h similarity index 100% rename from src/rgw/store/rados/rgw_sync_error_repo.h rename to src/rgw/driver/rados/rgw_sync_error_repo.h diff --git a/src/rgw/store/rados/rgw_sync_module.cc b/src/rgw/driver/rados/rgw_sync_module.cc similarity index 100% rename from src/rgw/store/rados/rgw_sync_module.cc rename to src/rgw/driver/rados/rgw_sync_module.cc diff --git a/src/rgw/store/rados/rgw_sync_module.h b/src/rgw/driver/rados/rgw_sync_module.h similarity index 100% rename from src/rgw/store/rados/rgw_sync_module.h rename to src/rgw/driver/rados/rgw_sync_module.h diff --git a/src/rgw/store/rados/rgw_sync_module_aws.cc b/src/rgw/driver/rados/rgw_sync_module_aws.cc similarity index 100% rename from src/rgw/store/rados/rgw_sync_module_aws.cc rename to src/rgw/driver/rados/rgw_sync_module_aws.cc diff --git a/src/rgw/store/rados/rgw_sync_module_aws.h b/src/rgw/driver/rados/rgw_sync_module_aws.h similarity index 100% rename from src/rgw/store/rados/rgw_sync_module_aws.h rename to src/rgw/driver/rados/rgw_sync_module_aws.h diff --git a/src/rgw/store/rados/rgw_sync_module_es.cc b/src/rgw/driver/rados/rgw_sync_module_es.cc similarity index 100% rename from src/rgw/store/rados/rgw_sync_module_es.cc rename to src/rgw/driver/rados/rgw_sync_module_es.cc diff --git a/src/rgw/store/rados/rgw_sync_module_es.h b/src/rgw/driver/rados/rgw_sync_module_es.h similarity index 100% rename from src/rgw/store/rados/rgw_sync_module_es.h rename to src/rgw/driver/rados/rgw_sync_module_es.h diff --git a/src/rgw/store/rados/rgw_sync_module_es_rest.cc b/src/rgw/driver/rados/rgw_sync_module_es_rest.cc similarity index 100% rename from src/rgw/store/rados/rgw_sync_module_es_rest.cc rename to src/rgw/driver/rados/rgw_sync_module_es_rest.cc diff --git a/src/rgw/store/rados/rgw_sync_module_es_rest.h b/src/rgw/driver/rados/rgw_sync_module_es_rest.h similarity index 100% rename from src/rgw/store/rados/rgw_sync_module_es_rest.h rename to src/rgw/driver/rados/rgw_sync_module_es_rest.h diff --git a/src/rgw/store/rados/rgw_sync_module_log.cc b/src/rgw/driver/rados/rgw_sync_module_log.cc similarity index 100% rename from src/rgw/store/rados/rgw_sync_module_log.cc rename to src/rgw/driver/rados/rgw_sync_module_log.cc diff --git a/src/rgw/store/rados/rgw_sync_module_log.h b/src/rgw/driver/rados/rgw_sync_module_log.h similarity index 100% rename from src/rgw/store/rados/rgw_sync_module_log.h rename to src/rgw/driver/rados/rgw_sync_module_log.h diff --git a/src/rgw/store/rados/rgw_sync_trace.cc b/src/rgw/driver/rados/rgw_sync_trace.cc similarity index 100% rename from src/rgw/store/rados/rgw_sync_trace.cc rename to src/rgw/driver/rados/rgw_sync_trace.cc diff --git a/src/rgw/store/rados/rgw_sync_trace.h b/src/rgw/driver/rados/rgw_sync_trace.h similarity index 100% rename from src/rgw/store/rados/rgw_sync_trace.h rename to src/rgw/driver/rados/rgw_sync_trace.h diff --git a/src/rgw/store/rados/rgw_tools.cc b/src/rgw/driver/rados/rgw_tools.cc similarity index 100% rename from src/rgw/store/rados/rgw_tools.cc rename to src/rgw/driver/rados/rgw_tools.cc diff --git a/src/rgw/store/rados/rgw_tools.h b/src/rgw/driver/rados/rgw_tools.h similarity index 100% rename from src/rgw/store/rados/rgw_tools.h rename to src/rgw/driver/rados/rgw_tools.h diff --git a/src/rgw/store/rados/rgw_trim_bilog.cc b/src/rgw/driver/rados/rgw_trim_bilog.cc similarity index 100% rename from src/rgw/store/rados/rgw_trim_bilog.cc rename to src/rgw/driver/rados/rgw_trim_bilog.cc diff --git a/src/rgw/store/rados/rgw_trim_bilog.h b/src/rgw/driver/rados/rgw_trim_bilog.h similarity index 100% rename from src/rgw/store/rados/rgw_trim_bilog.h rename to src/rgw/driver/rados/rgw_trim_bilog.h diff --git a/src/rgw/store/rados/rgw_trim_datalog.cc b/src/rgw/driver/rados/rgw_trim_datalog.cc similarity index 100% rename from src/rgw/store/rados/rgw_trim_datalog.cc rename to src/rgw/driver/rados/rgw_trim_datalog.cc diff --git a/src/rgw/store/rados/rgw_trim_datalog.h b/src/rgw/driver/rados/rgw_trim_datalog.h similarity index 100% rename from src/rgw/store/rados/rgw_trim_datalog.h rename to src/rgw/driver/rados/rgw_trim_datalog.h diff --git a/src/rgw/store/rados/rgw_trim_mdlog.cc b/src/rgw/driver/rados/rgw_trim_mdlog.cc similarity index 100% rename from src/rgw/store/rados/rgw_trim_mdlog.cc rename to src/rgw/driver/rados/rgw_trim_mdlog.cc diff --git a/src/rgw/store/rados/rgw_trim_mdlog.h b/src/rgw/driver/rados/rgw_trim_mdlog.h similarity index 100% rename from src/rgw/store/rados/rgw_trim_mdlog.h rename to src/rgw/driver/rados/rgw_trim_mdlog.h diff --git a/src/rgw/store/rados/rgw_user.cc b/src/rgw/driver/rados/rgw_user.cc similarity index 100% rename from src/rgw/store/rados/rgw_user.cc rename to src/rgw/driver/rados/rgw_user.cc diff --git a/src/rgw/store/rados/rgw_user.h b/src/rgw/driver/rados/rgw_user.h similarity index 100% rename from src/rgw/store/rados/rgw_user.h rename to src/rgw/driver/rados/rgw_user.h diff --git a/src/rgw/store/rados/rgw_zone.cc b/src/rgw/driver/rados/rgw_zone.cc similarity index 100% rename from src/rgw/store/rados/rgw_zone.cc rename to src/rgw/driver/rados/rgw_zone.cc diff --git a/src/rgw/store/rados/rgw_zone.h b/src/rgw/driver/rados/rgw_zone.h similarity index 100% rename from src/rgw/store/rados/rgw_zone.h rename to src/rgw/driver/rados/rgw_zone.h diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index e3234751f4a..4f2820c6cb6 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -3021,7 +3021,7 @@ int RGWRados::Object::Write::_do_write_meta(const DoutPrefixProvider *dpp, string req_id; if (!s) { // fake req_id - req_id = store->svc.zone_utils->unique_id(store->store->get_new_req_id()); + req_id = store->svc.zone_utils->unique_id(store->driver->get_new_req_id()); } else { req_id = s->req_id; } diff --git a/src/rgw/rgw_sal.cc b/src/rgw/rgw_sal.cc index 0eee88fd674..8a793f75314 100644 --- a/src/rgw/rgw_sal.cc +++ b/src/rgw/rgw_sal.cc @@ -23,13 +23,13 @@ #include "rgw_sal.h" #include "rgw_sal_rados.h" -#include "store/rados/config/store.h" -#include "store/json_config/store.h" +#include "driver/rados/config/store.h" +#include "driver/json_config/store.h" #include "rgw_d3n_datacache.h" #ifdef WITH_RADOSGW_DBSTORE #include "rgw_sal_dbstore.h" -#include "store/dbstore/config/store.h" +#include "driver/dbstore/config/store.h" #endif #ifdef WITH_RADOSGW_MOTR diff --git a/src/rgw/rgw_sal_dbstore.h b/src/rgw/rgw_sal_dbstore.h index c46fb6f842e..a7f496191c7 100644 --- a/src/rgw/rgw_sal_dbstore.h +++ b/src/rgw/rgw_sal_dbstore.h @@ -21,8 +21,8 @@ #include "rgw_lc.h" #include "rgw_multi.h" -#include "store/dbstore/common/dbstore.h" -#include "store/dbstore/dbstore_mgr.h" +#include "driver/dbstore/common/dbstore.h" +#include "driver/dbstore/dbstore_mgr.h" namespace rgw { namespace sal { diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 0a38a469860..8909788a4f8 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -320,7 +320,7 @@ add_executable(ceph_test_librgw_file_nfsns target_include_directories(ceph_test_librgw_file_nfsns PUBLIC "${LUA_INCLUDE_DIR}" SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw" - SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw/store/rados") + SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw/driver/rados") target_link_libraries(ceph_test_librgw_file_nfsns rgw librados @@ -352,7 +352,7 @@ add_executable(ceph_test_librgw_file_marker target_include_directories(ceph_test_librgw_file_marker PUBLIC "${LUA_INCLUDE_DIR}" SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw" - SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw/store/rados") + SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw/driver/rados") target_link_libraries(ceph_test_librgw_file_marker rgw librados @@ -370,7 +370,7 @@ add_executable(ceph_test_librgw_file_xattr target_include_directories(ceph_test_librgw_file_xattr PUBLIC "${LUA_INCLUDE_DIR}" SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw" - SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw/store/rados") + SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw/driver/rados") target_link_libraries(ceph_test_librgw_file_xattr rgw librados @@ -399,7 +399,7 @@ add_executable(test_rgw_ldap ) target_include_directories(test_rgw_ldap SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw" - SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw/store/rados") + SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw/driver/rados") target_link_libraries(test_rgw_ldap librados ceph-common -- 2.47.3