[Discover] fix PPL to not throw error if aggregation query fails (#8992)

Signed-off-by: Joshua Li <[email protected]>
opensearch-project · Dec 3, 2024 · d5e0087 · d5e0087
1 parent 340326f
commit d5e0087
Show file tree

Hide file tree

Showing 7 changed files with 387 additions and 15 deletions.
diff --git a/src/plugins/query_enhancements/common/utils.test.ts b/src/plugins/query_enhancements/common/utils.test.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { handleFacetError } from './utils';
+import { throwFacetError } from './utils';
 
 describe('handleFacetError', () => {
   const error = new Error('mock-error');
@@ -16,9 +16,9 @@ describe('handleFacetError', () => {
       data: error,
     };
 
-    expect(() => handleFacetError(response)).toThrowError();
+    expect(() => throwFacetError(response)).toThrowError();
     try {
-      handleFacetError(response);
+      throwFacetError(response);
     } catch (err: any) {
       expect(err.message).toBe('test error message');
       expect(err.name).toBe('400');

diff --git a/src/plugins/query_enhancements/common/utils.ts b/src/plugins/query_enhancements/common/utils.ts
@@ -42,7 +42,7 @@ export const removeKeyword = (queryString: string | undefined) => {
   return queryString?.replace(new RegExp('.keyword'), '') ?? '';
 };
 
-export const handleFacetError = (response: any) => {
+export const throwFacetError = (response: any) => {
   const error = new Error(response.data.body?.message ?? response.data.body ?? response.data);
   error.name = response.data.status ?? response.status ?? response.data.statusCode;
   (error as any).status = error.name;

diff --git a/src/plugins/query_enhancements/server/search/ppl_async_search_strategy.ts b/src/plugins/query_enhancements/server/search/ppl_async_search_strategy.ts
@@ -13,7 +13,7 @@ import {
   Query,
 } from '../../../data/common';
 import { ISearchStrategy, SearchUsage } from '../../../data/server';
-import { buildQueryStatusConfig, getFields, handleFacetError, SEARCH_STRATEGY } from '../../common';
+import { buildQueryStatusConfig, getFields, throwFacetError, SEARCH_STRATEGY } from '../../common';
 import { Facet } from '../utils';
 
 export const pplAsyncSearchStrategyProvider = (
@@ -45,7 +45,7 @@ export const pplAsyncSearchStrategyProvider = (
           request.body = { ...request.body, lang: SEARCH_STRATEGY.PPL };
           const rawResponse: any = await pplAsyncFacet.describeQuery(context, request);
 
-          if (!rawResponse.success) handleFacetError(rawResponse);
+          if (!rawResponse.success) throwFacetError(rawResponse);
 
           const statusConfig = buildQueryStatusConfig(rawResponse);
 
@@ -60,7 +60,7 @@ export const pplAsyncSearchStrategyProvider = (
           request.params = { queryId: inProgressQueryId };
           const queryStatusResponse = await pplAsyncJobsFacet.describeQuery(context, request);
 
-          if (!queryStatusResponse.success) handleFacetError(queryStatusResponse);
+          if (!queryStatusResponse.success) throwFacetError(queryStatusResponse);
 
           const queryStatus = queryStatusResponse.data?.status;
           logger.info(`pplAsyncSearchStrategy: JOB: ${inProgressQueryId} - STATUS: ${queryStatus}`);