From 6f4d6a206e7ecd73f21210714e6540e3de60f5c7 Mon Sep 17 00:00:00 2001 From: XanthosXanthopoulos Date: Thu, 2 Jan 2025 15:36:32 +0200 Subject: [PATCH] Comply with C.128 --- libtiledbsoma/src/soma/soma_geometry_column.h | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/libtiledbsoma/src/soma/soma_geometry_column.h b/libtiledbsoma/src/soma/soma_geometry_column.h index d5733dbc1c..e169959cdb 100644 --- a/libtiledbsoma/src/soma/soma_geometry_column.h +++ b/libtiledbsoma/src/soma/soma_geometry_column.h @@ -65,84 +65,80 @@ class SOMAGeometryColumn : public SOMAColumn { : dimensions(dimensions) , attribute(attribute){}; - virtual inline std::string name() const override { + inline std::string name() const override { return SOMA_GEOMETRY_COLUMN_NAME; } - virtual inline bool isIndexColumn() const override { + inline bool isIndexColumn() const override { return true; } - virtual inline void select_columns( + inline void select_columns( const std::unique_ptr& query, bool if_not_empty = false) const override { query->select_columns(std::vector({attribute.name()}), if_not_empty); }; - virtual inline soma_column_datatype_t type() const override { + inline soma_column_datatype_t type() const override { return soma_column_datatype_t::SOMA_COLUMN_GEOMETRY; } - virtual inline std::optional domain_type() - const override { + inline std::optional domain_type() const override { return dimensions.front().type(); } - virtual inline std::optional data_type() const override { + inline std::optional data_type() const override { return attribute.type(); } - virtual inline std::optional> tiledb_dimensions() - override { + inline std::optional> tiledb_dimensions() override { return dimensions; } - virtual inline std::optional> tiledb_attributes() - override { + inline std::optional> tiledb_attributes() override { return std::vector({attribute}); } - virtual inline std::optional> tiledb_enumerations() + inline std::optional> tiledb_enumerations() override { return std::nullopt; } - virtual ArrowArray* arrow_domain_slot( + ArrowArray* arrow_domain_slot( const SOMAContext& ctx, Array& array, enum Domainish kind) const override; - virtual ArrowSchema* arrow_schema_slot( + ArrowSchema* arrow_schema_slot( const SOMAContext& ctx, Array& array) override; protected: - virtual void _set_dim_points( + void _set_dim_points( const std::unique_ptr& query, const SOMAContext& ctx, const std::any& points) const override; - virtual void _set_dim_ranges( + void _set_dim_ranges( const std::unique_ptr& query, const SOMAContext& ctx, const std::any& ranges) const override; - virtual void _set_current_domain_slot( + void _set_current_domain_slot( NDRectangle& rectangle, std::span new_current_domain) const override; - virtual std::pair _can_set_current_domain_slot( + std::pair _can_set_current_domain_slot( std::optional& rectangle, std::span new_current_domain) const override; - virtual std::any _core_domain_slot() const override; + std::any _core_domain_slot() const override; - virtual std::any _non_empty_domain_slot(Array& array) const override; + std::any _non_empty_domain_slot(Array& array) const override; - virtual std::any _core_current_domain_slot( + std::any _core_current_domain_slot( const SOMAContext& ctx, Array& array) const override; - virtual std::any _core_current_domain_slot( - NDRectangle& ndrect) const override; + std::any _core_current_domain_slot(NDRectangle& ndrect) const override; private: /**