Skip to content

Commit 0399ba1

Browse files
fix: create stream before merge schema
issue: merge schema and commit to memory happening before stream creation from storage fix: first create stream from storage if not present then merge schema and commit to memory
1 parent a883589 commit 0399ba1

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/handlers/http/query.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,15 @@ pub async fn get_records_and_fields(
8989

9090
let query: LogicalQuery =
9191
into_query(query_request, &session_state, time_range, &tables).await?;
92+
update_schema_when_distributed(&tables).await?;
9293
let creds = extract_session_key_from_req(req)?;
9394
let permissions = Users.get_permissions(&creds);
9495

9596
let table_name = tables
9697
.first()
9798
.ok_or_else(|| QueryError::MalformedQuery("No table name found in query"))?;
9899
user_auth_for_datasets(&permissions, &tables).await?;
99-
update_schema_when_distributed(&tables).await?;
100+
100101
let (records, fields) = execute(query, table_name, false).await?;
101102

102103
let records = match records {
@@ -114,9 +115,10 @@ pub async fn query(req: HttpRequest, query_request: Query) -> Result<HttpRespons
114115
let time_range =
115116
TimeRange::parse_human_time(&query_request.start_time, &query_request.end_time)?;
116117
let tables = resolve_stream_names(&query_request.query)?;
117-
update_schema_when_distributed(&tables).await?;
118+
118119
let query: LogicalQuery =
119120
into_query(&query_request, &session_state, time_range, &tables).await?;
121+
update_schema_when_distributed(&tables).await?;
120122
let creds = extract_session_key_from_req(&req)?;
121123
let permissions = Users.get_permissions(&creds);
122124

0 commit comments

Comments
 (0)