Skip to content

chore(query): fix udf metrics #17134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,18 @@ impl TransformUdfServer {
record_connect_external_duration(func.func_name.clone(), connect_duration);

Profile::record_usize_profile(ProfileStatisticsName::ExternalServerRequestCount, 1);
record_running_requests_external_start(func.name.clone(), 1);
record_request_external_block_rows(func.func_name.clone(), num_rows);

let result_batch = client
.do_exchange(&func.func_name, input_batch.clone())
.await?;
.await;

let request_duration = instant.elapsed() - connect_duration;
record_running_requests_external_finish(func.name.clone(), 1);
record_request_external_duration(func.func_name.clone(), request_duration);

let result_batch = result_batch?;
let schema = DataSchema::try_from(&(*result_batch.schema()))?;
let (result_block, result_schema) = DataBlock::from_record_batch(&schema, &result_batch)
.map_err(|err| {
Expand Down Expand Up @@ -241,7 +246,6 @@ impl AsyncTransform for TransformUdfServer {
.map(|start| data_block.slice(start..start + batch_rows.min(rows - start)))
.collect();
for func in self.funcs.iter() {
record_request_external_block_rows(func.func_name.clone(), rows);
let server_addr = func.udf_type.as_server().unwrap();
let endpoint = self.endpoints.get(server_addr).unwrap();
let tasks: Vec<_> = batch_blocks
Expand Down Expand Up @@ -285,10 +289,7 @@ impl AsyncTransform for TransformUdfServer {
})
.collect();

let task_len = tasks.len() as u64;
record_running_requests_external_start(func.name.clone(), task_len);
let task_results = futures::future::join_all(tasks).await;
record_running_requests_external_finish(func.name.clone(), task_len);
batch_blocks = task_results
.into_iter()
.map(|b| b.unwrap())
Expand Down
14 changes: 13 additions & 1 deletion tests/sqllogictests/suites/udf_server/udf_server_test.test
Original file line number Diff line number Diff line change
Expand Up @@ -557,9 +557,21 @@ select * from _tmp_table order by field1;
5



statement ok
remove @udf_stage;

statement ok
drop FUNCTION url_len;


query I
select metric, max(value::Int > 0) from system.metrics where metric in ('external_block_rows_count', 'external_requests_total', 'external_retry_total') group by metric order by metric;
----
external_block_rows_count 1
external_requests_total 1
external_retry_total 1

query I
select sum((value::Int != 0)::Int) from system.metrics where metric = 'external_running_requests_total';
----
0
Loading