update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rgw / rgw_sync_module_es_rest.cc

diff --git a/ceph/src/rgw/rgw_sync_module_es_rest.cc b/ceph/src/rgw/rgw_sync_module_es_rest.cc
index 192d20fa1175bb3f306d21e70331fd0a1b9b5ff1..751d822085f26b7eafb56e620b5be2cb70f2d167 100644 (file)
--- a/ceph/src/rgw/rgw_sync_module_es_rest.cc
+++ b/ceph/src/rgw/rgw_sync_module_es_rest.cc
@@ -1,3 +1,6 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #include "rgw_sync_module_es.h"
 #include "rgw_sync_module_es_rest.h"
 #include "rgw_es_query.h"
@@ -137,17 +140,16 @@ public:
     es_module = static_cast<RGWElasticSyncModuleInstance *>(sync_module_ref.get());
   }
 
-  int verify_permission() {
+  int verify_permission() override {
     return 0;
   }
   virtual int get_params() = 0;
-  void pre_exec();
-  void execute();
+  void pre_exec() override;
+  void execute() override;
 
-  virtual void send_response() = 0;
-  virtual const string name() { return "metadata_search"; }
-  virtual RGWOpType get_type() { return RGW_OP_METADATA_SEARCH; }
-  virtual uint32_t op_mask() { return RGW_OP_TYPE_READ; }
+  const char* name() const override { return "metadata_search"; }
+  virtual RGWOpType get_type() override { return RGW_OP_METADATA_SEARCH; }
+  virtual uint32_t op_mask() override { return RGW_OP_TYPE_READ; }
 };
 
 void RGWMetadataSearchOp::pre_exec()
@@ -271,7 +273,7 @@ void RGWMetadataSearchOp::execute()
 
 class RGWMetadataSearch_ObjStore_S3 : public RGWMetadataSearchOp {
 public:
-  RGWMetadataSearch_ObjStore_S3(const RGWSyncModuleInstanceRef& _sync_module) : RGWMetadataSearchOp(_sync_module) {
+  explicit RGWMetadataSearch_ObjStore_S3(const RGWSyncModuleInstanceRef& _sync_module) : RGWMetadataSearchOp(_sync_module) {
     custom_prefix = "x-amz-meta-";
   }
 
@@ -375,7 +377,7 @@ public:
 
 class RGWHandler_REST_MDSearch_S3 : public RGWHandler_REST_S3 {
 protected:
-  RGWOp *op_get() {
+  RGWOp *op_get() override {
     if (s->info.args.exists("query")) {
       return new RGWMetadataSearch_ObjStore_S3(store->get_sync_module());
     }
@@ -385,14 +387,14 @@ protected:
     }
     return nullptr;
   }
-  RGWOp *op_head() {
+  RGWOp *op_head() override {
     return nullptr;
   }
-  RGWOp *op_post() {
+  RGWOp *op_post() override {
     return nullptr;
   }
 public:
-  RGWHandler_REST_MDSearch_S3(const rgw::auth::StrategyRegistry& auth_registry) : RGWHandler_REST_S3(auth_registry) {}
+  explicit RGWHandler_REST_MDSearch_S3(const rgw::auth::StrategyRegistry& auth_registry) : RGWHandler_REST_S3(auth_registry) {}
   virtual ~RGWHandler_REST_MDSearch_S3() {}
 };