rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-05-15 12:30:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: impl instant query interface (#1410)

Browse Source 
Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
This commit is contained in:
Ruihang Xia
2023-04-18 23:25:14 +08:00
committed by GitHub
parent ff2784da0f
commit e8bb00f0be
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/servers/src/prom.rs
View File

@@ -351,20 +351,34 @@ impl PromJsonResponse {
#[derive(Debug, Default, Serialize, Deserialize, JsonSchema)]
pub struct InstantQuery {
query: String,
query: Option<String>,
time: Option<String>,
timeout: Option<String>,
db: Option<String>,
}
#[axum_macros::debug_handler]
pub async fn instant_query(
State(_handler): State<PromHandlerRef>,
Query(_params): Query<InstantQuery>,
State(handler): State<PromHandlerRef>,
Query(params): Query<InstantQuery>,
Form(form_params): Form<InstantQuery>,
) -> Json<PromJsonResponse> {
PromJsonResponse::error(
"not implemented",
"instant query api `/query` is not implemented. Use `/query_range` instead.",
)
let time = params.time.or(form_params.time).unwrap_or_default();
let prom_query = PromQuery {
query: params.query.or(form_params.query).unwrap_or_default(),
start: time.clone(),
end: time,
step: "1s".to_string(),
};
let db = &params.db.unwrap_or(DEFAULT_SCHEMA_NAME.to_string());
let (catalog, schema) = super::parse_catalog_and_schema_from_client_database_name(db);
let query_ctx = QueryContext::with(catalog, schema);
let result = handler.do_query(&prom_query, Arc::new(query_ctx)).await;
let metric_name = retrieve_metric_name(&prom_query.query).unwrap_or_default();
PromJsonResponse::from_query_result(result, metric_name).await
}
#[derive(Debug, Default, Serialize, Deserialize, JsonSchema)]

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

@@ -290,11 +290,16 @@ pub async fn test_prom_http_api(store_type: StorageType) {
let client = TestClient::new(app);
// instant query
let res = client.get("/api/v1/query?query=up").send().await;
let res = client.get("/api/v1/query?query=up&time=1").send().await;
assert_eq!(res.status(), StatusCode::OK);
let res = client.post("/api/v1/query?query=up").send().await;
let res = client
.post("/api/v1/query?query=up&time=1")
.header("Content-Type", "application/x-www-form-urlencoded")
.send()
.await;
assert_eq!(res.status(), StatusCode::OK);
// range query
let res = client
.get("/api/v1/query_range?query=up&start=1&end=100&step=5")
.send()