From: Gal Salomon <gal.salomon@gmail.com>
Date: Tue, 13 Feb 2024 15:47:26 +0000 (+0200)
Subject: adding recent update: json-output and more
X-Git-Tag: v20.0.0~2484^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f50385ef71a3d0ac175018cb070dbf2e767e6ed3;p=ceph.git

adding recent update: json-output and more

Signed-off-by: Gal Salomon <gal.salomon@gmail.com>
---

diff --git a/src/rgw/rgw_s3select.cc b/src/rgw/rgw_s3select.cc
index 7a407b530469..bb2c3686792a 100644
--- a/src/rgw/rgw_s3select.cc
+++ b/src/rgw/rgw_s3select.cc
@@ -529,7 +529,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 91d843873ff0..1ae458f1b8df 160000
--- a/src/s3select
+++ b/src/s3select
@@ -1 +1 @@
-Subproject commit 91d843873ff0411ec08445ab71ec85e62f5e2ea7
+Subproject commit 1ae458f1b8df4447860cb666031e3e416e2c931f