rgw/sfs: change column names to match ADR names

change creation -> create, deletion -> delete in versioned objects table. Signed-off-by: Xavi Garcia <xavi.garcia@suse.com>
0xavi0 · May 17, 2023 · 831dc47 · 831dc47
1 parent 8c9cae7
commit 831dc47
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/rgw/driver/sfs/sqlite/dbconn.h b/src/rgw/driver/sfs/sqlite/dbconn.h
@@ -144,10 +144,10 @@ inline auto _make_storage(const std::string& path) {
           sqlite_orm::make_column("checksum", &DBVersionedObject::checksum),
           sqlite_orm::make_column("size", &DBVersionedObject::size),
           sqlite_orm::make_column(
-              "creation_time", &DBVersionedObject::create_time
+              "create_time", &DBVersionedObject::create_time
           ),
           sqlite_orm::make_column(
-              "deletion_time", &DBVersionedObject::delete_time
+              "delete_time", &DBVersionedObject::delete_time
           ),
           sqlite_orm::make_column(
               "commit_time", &DBVersionedObject::commit_time

diff --git a/src/test/rgw/sfs/compatibility_test_cases/columns_added.h b/src/test/rgw/sfs/compatibility_test_cases/columns_added.h
@@ -205,10 +205,10 @@ inline auto _make_test_storage(const std::string& path) {
           sqlite_orm::make_column("checksum", &DBTestVersionedObject::checksum),
           sqlite_orm::make_column("size", &DBTestVersionedObject::size),
           sqlite_orm::make_column(
-              "creation_time", &DBTestVersionedObject::create_time
+              "create_time", &DBTestVersionedObject::create_time
           ),
           sqlite_orm::make_column(
-              "deletion_time", &DBTestVersionedObject::delete_time
+              "delete_time", &DBTestVersionedObject::delete_time
           ),
           sqlite_orm::make_column(
               "commit_time", &DBTestVersionedObject::commit_time

diff --git a/src/test/rgw/sfs/compatibility_test_cases/columns_deleted.h b/src/test/rgw/sfs/compatibility_test_cases/columns_deleted.h
@@ -203,10 +203,10 @@ inline auto _make_test_storage(const std::string& path) {
           sqlite_orm::make_column("checksum", &DBTestVersionedObject::checksum),
           sqlite_orm::make_column("size", &DBTestVersionedObject::size),
           sqlite_orm::make_column(
-              "creation_time", &DBTestVersionedObject::create_time
+              "create_time", &DBTestVersionedObject::create_time
           ),
           sqlite_orm::make_column(
-              "deletion_time", &DBTestVersionedObject::delete_time
+              "delete_time", &DBTestVersionedObject::delete_time
           ),
           sqlite_orm::make_column(
               "commit_time", &DBTestVersionedObject::commit_time

diff --git a/src/test/rgw/sfs/compatibility_test_cases/optional_columns_added.h b/src/test/rgw/sfs/compatibility_test_cases/optional_columns_added.h
@@ -202,10 +202,10 @@ inline auto _make_test_storage(const std::string& path) {
           sqlite_orm::make_column("checksum", &DBTestVersionedObject::checksum),
           sqlite_orm::make_column("size", &DBTestVersionedObject::size),
           sqlite_orm::make_column(
-              "creation_time", &DBTestVersionedObject::create_time
+              "create_time", &DBTestVersionedObject::create_time
           ),
           sqlite_orm::make_column(
-              "deletion_time", &DBTestVersionedObject::delete_time
+              "delete_time", &DBTestVersionedObject::delete_time
           ),
           sqlite_orm::make_column(
               "commit_time", &DBTestVersionedObject::commit_time