From: Matt Benjamin <mbenjamin@redhat.com>
Date: Thu, 25 Jun 2020 15:05:22 +0000 (-0400)
Subject: Merge pull request #33228 from galsalomon66/s3select_integration_into_RGW_2
X-Git-Tag: wip-pdonnell-testing-20200918.022351~860
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a094e84158a292b1b1d090884316181e241e5fcd;p=ceph-ci.git

Merge pull request #33228 from galsalomon66/s3select_integration_into_RGW_2

rgw: add s3select support
---

a094e84158a292b1b1d090884316181e241e5fcd
diff --cc src/rgw/rgw_rest_s3.cc
index 849ff4892da,75ba9f07518..47be196e596
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@@ -16,7 -15,9 +16,8 @@@
  #include "auth/Crypto.h"
  #include <boost/algorithm/string.hpp>
  #include <boost/algorithm/string/replace.hpp>
 -#include <boost/utility/string_view.hpp>
  #include <boost/tokenizer.hpp>
+ #include <s3select/include/s3select.h>
  
  #include <liboath/oath.h>
  
diff --cc src/rgw/rgw_rest_s3.h
index c0b58f75971,42ea0231e1a..1993f647e80
--- a/src/rgw/rgw_rest_s3.h
+++ b/src/rgw/rgw_rest_s3.h
@@@ -6,9 -6,10 +6,10 @@@
  #define TIME_BUF_SIZE 128
  
  #include <mutex>
 +#include <string_view>
  
 -#include <boost/utility/string_view.hpp>
  #include <boost/container/static_vector.hpp>
+ #include <boost/crc.hpp> 
  
  #include "common/sstring.hh"
  #include "rgw_op.h"