From 77bad53af4d9df49442867f11c68efefcc380f47 Mon Sep 17 00:00:00 2001 From: Gal Salomon Date: Tue, 13 Feb 2024 17:47:26 +0200 Subject: [PATCH] adding recent update: json-output and more Signed-off-by: Gal Salomon (cherry picked from commit f50385ef71a3d0ac175018cb070dbf2e767e6ed3) --- src/rgw/rgw_s3select.cc | 3 ++- src/s3select | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_s3select.cc b/src/rgw/rgw_s3select.cc index c7eaa69842f3d..7ca1f239e976d 100644 --- 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 9ade26c63ef10..1ae458f1b8df4 160000 --- a/src/s3select +++ b/src/s3select @@ -1 +1 @@ -Subproject commit 9ade26c63ef1016dac868f53270a61e6232be9ba +Subproject commit 1ae458f1b8df4447860cb666031e3e416e2c931f -- 2.39.5