From: Gal Salomon Date: Wed, 7 Aug 2024 08:38:37 +0000 (+0300) Subject: rebase X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9d1106c9ad65028fd02eb029aca378408a15f736;p=ceph.git rebase Signed-off-by: Gal Salomon --- diff --git a/src/rgw/rgw_s3select.cc b/src/rgw/rgw_s3select.cc index d30fac1e457..5d558bb4e84 100644 --- a/src/rgw/rgw_s3select.cc +++ b/src/rgw/rgw_s3select.cc @@ -287,6 +287,7 @@ RGWSelectObj_ObjStore_S3::RGWSelectObj_ObjStore_S3(): m_object_size_for_processing(0), m_parquet_type(false), m_json_type(false), + m_outputFormat(OutputFormat::CSV), chunk_number(0), m_requested_range(0), m_scan_offset(1024), @@ -530,10 +531,6 @@ int RGWSelectObj_ObjStore_S3::run_s3select_on_json(const char* query, const char fp_s3select_result_format, fp_result_header_format, fp_debug_mesg); - const char* s3select_processTime_error = "s3select-ProcessingTime-Error"; - const char* s3select_syntax_error = "s3select-Syntax-Error"; - const char* s3select_resource_id = "resourcse-id"; - const char* s3select_json_error = "json-Format-Error"; json_object::csv_definitions json; m_aws_response_handler.init_response(); diff --git a/src/s3select b/src/s3select index 224d1d0eff3..a6168396d24 160000 --- a/src/s3select +++ b/src/s3select @@ -1 +1 @@ -Subproject commit 224d1d0eff3a6f5a8e0946f6240769a9c5b7b70c +Subproject commit a6168396d246184ea4aadfb8ab3b9ab33848294c