]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #33228 from galsalomon66/s3select_integration_into_RGW_2
authorMatt Benjamin <mbenjamin@redhat.com>
Thu, 25 Jun 2020 15:05:22 +0000 (11:05 -0400)
committerGitHub <noreply@github.com>
Thu, 25 Jun 2020 15:05:22 +0000 (11:05 -0400)
rgw: add s3select support

1  2 
src/rgw/rgw_rest.cc
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_rest_s3.h

Simple merge
index 849ff4892daba770ee4c03079f7b723f542b3a37,75ba9f075187d2972e4f6a0a3e32da8e8593e3cb..47be196e596078dd3e128a15d652da3223b87dd9
@@@ -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>
  
index c0b58f7597156a64f3c1f5b66a8395373662b639,42ea0231e1a308d71fb1c7b374f00cdb6f5c2254..1993f647e800a8bab863d1f034e19c32a220894f
@@@ -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"