rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-03 20:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: treat all number types as field candidates (#3670)

Browse Source 
Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
This commit is contained in:
Ruihang Xia
2024-04-09 12:28:21 +09:00
committed by GitHub
parent 1629435888
commit 50bea2f107
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/servers/src/http/prometheus_resp.rs
View File

@@ -36,7 +36,7 @@ use super::header::{collect_plan_metrics, GREPTIME_DB_HEADER_METRICS};
use super::prometheus::{
PromData, PromQueryResult, PromSeriesMatrix, PromSeriesVector, PrometheusResponse,
};
use crate::error::{CollectRecordbatchSnafu, InternalSnafu, Result};
use crate::error::{CollectRecordbatchSnafu, Result, UnexpectedResultSnafu};
#[derive(Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq)]
pub struct PrometheusJsonResponse {
@@ -183,7 +183,17 @@ impl PrometheusJsonResponse {
timestamp_column_index = Some(i);
}
}
ConcreteDataType::Float64(_) => {
// Treat all value types as field
ConcreteDataType::Float32(_)
| ConcreteDataType::Float64(_)
| ConcreteDataType::Int8(_)
| ConcreteDataType::Int16(_)
| ConcreteDataType::Int32(_)
| ConcreteDataType::Int64(_)
| ConcreteDataType::UInt8(_)
| ConcreteDataType::UInt16(_)
| ConcreteDataType::UInt32(_)
| ConcreteDataType::UInt64(_) => {
if first_field_column_index.is_none() {
first_field_column_index = Some(i);
}
@@ -195,11 +205,11 @@ impl PrometheusJsonResponse {
}
}
let timestamp_column_index = timestamp_column_index.context(InternalSnafu {
err_msg: "no timestamp column found".to_string(),
let timestamp_column_index = timestamp_column_index.context(UnexpectedResultSnafu {
reason: "no timestamp column found".to_string(),
})?;
let first_field_column_index = first_field_column_index.context(InternalSnafu {
err_msg: "no value column found".to_string(),
let first_field_column_index = first_field_column_index.context(UnexpectedResultSnafu {
reason: "no value column found".to_string(),
})?;
let metric_name = (METRIC_NAME.to_string(), metric_name);
@@ -226,8 +236,11 @@ impl PrometheusJsonResponse {
.as_any()
.downcast_ref::<TimestampMillisecondVector>()
.unwrap();
let field_column = batch
let casted_field_column = batch
.column(first_field_column_index)
.cast(&ConcreteDataType::float64_datatype())
.unwrap();
let field_column = casted_field_column
.as_any()
.downcast_ref::<Float64Vector>()
.unwrap();

6
tests-integration/tests/http.rs
View File

@@ -436,6 +436,12 @@ pub async fn test_prom_http_api(store_type: StorageType) {
.send()
.await;
assert_eq!(res.status(), StatusCode::OK);
let res = client
.post("/v1/prometheus/api/v1/query_range?query=count(count(up))&start=1&end=100&step=5")
.header("Content-Type", "application/x-www-form-urlencoded")
.send()
.await;
assert_eq!(res.status(), StatusCode::OK);
// labels
let res = client