fix(shardQuerySplitting): start with loading state Loading and switch…

… to Streaming
grafana · Sep 11, 2024 · bbe917c · bbe917c
1 parent ef38488
commit bbe917c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/services/shardQuerySplitting.ts b/src/services/shardQuerySplitting.ts
@@ -61,7 +61,7 @@ function splitQueriesByStreamShard(
   splittingTargets: LokiQuery[]
 ) {
   let shouldStop = false;
-  let mergedResponse: DataQueryResponse = { data: [], state: LoadingState.Streaming, key: uuidv4() };
+  let mergedResponse: DataQueryResponse = { data: [], state: LoadingState.Loading, key: uuidv4() };
   let subquerySubscription: Subscription | null = null;
   let retriesMap = new Map<number, number>();
   let retryTimer: ReturnType<typeof setTimeout> | null = null;
@@ -128,6 +128,9 @@ function splitQueriesByStreamShard(
             return;
           }
         }
+        if (mergedResponse.data.length) {
+          mergedResponse.state = LoadingState.Streaming;
+        }
         mergedResponse = combineResponses(mergedResponse, partialResponse);
       },
       complete: () => {