]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rgw: define a hierarchy of basic type headers 49336/head
authorMatt Benjamin <mbenjamin@redhat.com>
Sat, 19 Sep 2020 00:59:31 +0000 (20:59 -0400)
committerDaniel Gryniewicz <dang@redhat.com>
Thu, 8 Dec 2022 19:42:34 +0000 (14:42 -0500)
commitc30449b35b5151f0da54cf0cfa59b9d7b8050314
tree1de20e65a6084c9e9ce77467e4b4bcf42a011575
parent9ee09fc27fb2b9783cffb094360b6e8a93ce5506
rgw: define a hierarchy of basic type headers

Defines a hierarchy of "simple" data types ensured to be
safe to include in any context above the zipper line, and
also from CLS.

The following headers are currently defined to contain basic
types only:

 rewrite src/rgw/rgw_basic_types.h (70%) // includes the whole hierarchy
 create mode 100644 src/rgw/rgw_acl_types.h
 create mode 100644 src/rgw/rgw_bucket_types.h
 create mode 100644 src/rgw/rgw_obj_types.h
 create mode 100644 src/rgw/rgw_placement_types.h
 create mode 100644 src/rgw/rgw_pool_types.h
 create mode 100644 src/rgw/rgw_quota_types.h
 create mode 100644 src/rgw/rgw_user_types.h
 create mode 100644 src/rgw/rgw_zone_types.h

This commit consolidates the following original commits:

* rgw: move RGWUploadPartInfo to rgw_basic_types.{h,cc}
* rgw: move rgw_obj_key to rgw_basic_types.{h,cc}
* rgw: move rgw_placement_rule to rgw_basic_types.{h,cc}
* rgw: move rgw_obj to rgw_basic_types.{h,cc}
* rgw: include rgw_compression_types.h in rgw_basic_types.{h,cc}
* rgw: move rgw_raw_obj to rgw_basic_types.{h,cc}
* rgw: rgw_multi.h: remove unused RGWMPObj forward decl

and the following cleanups from review:

* rgw: remove stray comments
* rgw: move rgw_obj_manifest.h inclusion to top of rgw_basic_types.h
* rgw: nit: indentation
* rgw: remove this line
* rgw: move rgw_bucket_shard to rgw_bucket_types.h, cleanup
* rgw: fix rgw_quota.h

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
23 files changed:
src/cls/CMakeLists.txt
src/cls/rgw/cls_rgw_types.h
src/rgw/driver/rados/rgw_obj_manifest.h
src/rgw/driver/rados/rgw_user.cc
src/rgw/driver/rados/rgw_zone.h
src/rgw/rgw_acl.h
src/rgw/rgw_acl_types.h [new file with mode: 0644]
src/rgw/rgw_basic_types.h
src/rgw/rgw_bucket_layout.h
src/rgw/rgw_bucket_types.h [new file with mode: 0644]
src/rgw/rgw_common.h
src/rgw/rgw_compression_types.h
src/rgw/rgw_multi.h
src/rgw/rgw_obj_types.h [new file with mode: 0644]
src/rgw/rgw_placement_types.h [new file with mode: 0644]
src/rgw/rgw_pool_types.h [new file with mode: 0644]
src/rgw/rgw_quota.h
src/rgw/rgw_quota_types.h [new file with mode: 0644]
src/rgw/rgw_rados.h
src/rgw/rgw_user_types.h [new file with mode: 0644]
src/rgw/rgw_zone_features.h
src/rgw/rgw_zone_types.h [new file with mode: 0644]
src/test/librados/CMakeLists.txt