From 1c8af69bce91a7424b907fbe3b045072545464d3 Mon Sep 17 00:00:00 2001 From: Gal Salomon Date: Thu, 5 Sep 2024 19:04:50 +0300 Subject: [PATCH] the returned-bytes metric was missing upon parquet flow. s3select submodule Signed-off-by: Gal Salomon --- src/rgw/rgw_s3select.cc | 9 ++++----- src/s3select | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/rgw/rgw_s3select.cc b/src/rgw/rgw_s3select.cc index 39794e990b02b..f133f7f80169d 100644 --- a/src/rgw/rgw_s3select.cc +++ b/src/rgw/rgw_s3select.cc @@ -761,16 +761,15 @@ void RGWSelectObj_ObjStore_S3::execute(optional_yield y) ldout(s->cct, 10) << "S3select: failed to process query <" << m_sql_query << "> on object " << s->object->get_name() << dendl; op_ret = -ERR_INVALID_REQUEST; } else { - {//status per amount of processed data - //TODO add number of calls to range_request - //TODO check stats for the amount of data processed (scanned, returned) + //status per amount of processed data + m_aws_response_handler.update_total_bytes_returned(m_s3_parquet_object.get_return_result_size()); m_aws_response_handler.init_stats_response(); m_aws_response_handler.send_stats_response(); m_aws_response_handler.init_end_response(); ldpp_dout(this, 10) << "s3select : reached the end of parquet query request : aws_response_handler.get_processed_size() " << m_aws_response_handler.get_processed_size() << "m_object_size_for_processing : " << m_object_size_for_processing << dendl; - } + ldout(s->cct, 10) << "S3select: complete parquet query with success " << dendl; } } else { @@ -796,7 +795,7 @@ void RGWSelectObj_ObjStore_S3::execute(optional_yield y) int RGWSelectObj_ObjStore_S3::parquet_processing(bufferlist& bl, off_t ofs, off_t len) {//purpose: to process the returned buffer from range-request, and to send it to the Parquet-reader. - //range_request() is called by arrow::ReadAt, and upon completion the control is back to execute() + //range_request() is called by arrow::ReadAt, and upon request completion the control is back to RGWSelectObj_ObjStore_S3::execute() fp_chunked_transfer_encoding(); size_t append_in_callback = 0; int part_no = 1; diff --git a/src/s3select b/src/s3select index a8cafe8960816..7ef7e67a29eda 160000 --- a/src/s3select +++ b/src/s3select @@ -1 +1 @@ -Subproject commit a8cafe89608169bc8cc229f9ed14e022e43149b8 +Subproject commit 7ef7e67a29edaaf9ca44f8d39666b4ad6a2552d0 -- 2.39.5