adding recent update: json-output and more

Signed-off-by: Gal Salomon <gal.salomon@gmail.com>
(cherry picked from commit f50385ef71a3d0ac175018cb070dbf2e767e6ed3)

diff --git a/src/rgw/rgw_s3select.cc b/src/rgw/rgw_s3select.cc
index c7eaa69842f3d9207a9ad76948137f8efb55bd6e..7ca1f239e976dc896f52067e495ee3d2e9920091 100644 (file)
--- a/src/rgw/rgw_s3select.cc
+++ b/src/rgw/rgw_s3select.cc
@@ -527,7 +527,8 @@ int RGWSelectObj_ObjStore_S3::run_s3select_on_json(const char* query, const char
   }
     
   //initializing json processor
-  m_s3_json_object.set_json_query(&s3select_syntax);
+  json_object::csv_definitions output_definition;
+  m_s3_json_object.set_json_query(&s3select_syntax,output_definition);
 
   if (input == nullptr) {
     input = "";

diff --git a/src/s3select b/src/s3select
index 9ade26c63ef1016dac868f53270a61e6232be9ba..1ae458f1b8df4447860cb666031e3e416e2c931f 160000 (submodule)
--- a/src/s3select
+++ b/src/s3select
@@ -1 +1 @@
-Subproject commit 9ade26c63ef1016dac868f53270a61e6232be9ba
+Subproject commit 1ae458f1b8df4447860cb666031e3e416e2c931f