updating datasource in request

Signed-off-by: Sean Li <[email protected]>
opensearch-project · Jun 7, 2024 · 471a4ea · 471a4ea
1 parent 06a3264
commit 471a4ea
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/plugins-extra/query_enhancements/public/search/sql_async_search_interceptor.ts b/plugins-extra/query_enhancements/public/search/sql_async_search_interceptor.ts
@@ -37,9 +37,10 @@ export class SQLAsyncQlSearchInterceptor extends SearchInterceptor {
     const { id, ...searchRequest } = request;
     const path = trimEnd('/api/sqlasyncql/jobs');
 
-    const fetchDataFrame = (queryString: string | undefined, df = null) => {
+    const fetchDataFrame = (queryString: string | undefined, dataSource: string, df = null) => {
       const body = stringify({
         query: { qs: queryString, format: 'jdbc' },
+        dataSource,
         df,
       });
       return from(
@@ -53,14 +54,15 @@ export class SQLAsyncQlSearchInterceptor extends SearchInterceptor {
     };
 
     const rawDataFrame = getRawDataFrame(searchRequest);
-    const dataFrame = fetchDataFrame(getRawQueryString(searchRequest), rawDataFrame);
+    const dataFrame = fetchDataFrame(
+      getRawQueryString(searchRequest),
+      searchRequest.params.index,
+      rawDataFrame
+    );
 
     // subscribe to dataFrame to see if an error is returned, display a toast message if so
     dataFrame.subscribe((df) => {
       // TODO: MQL Async: clean later
-      // if (!df.body.error) {
-      //   console.log('SEARCH INTERCEPTOR:', df);
-      // }
       if (!df.body.error) return;
       const jsError = new Error(df.body.error.response);
       this.deps.toasts.addError(jsError, {

diff --git a/plugins-extra/query_enhancements/server/routes/index.ts b/plugins-extra/query_enhancements/server/routes/index.ts
@@ -106,6 +106,7 @@ export function defineRoutes(
             format: schema.string(),
           }),
           df: schema.any(),
+          dataSource: schema.string(),
         }),
       },
     },

diff --git a/plugins-extra/query_enhancements/server/search/async/sql_async_facet.ts b/plugins-extra/query_enhancements/server/search/async/sql_async_facet.ts
@@ -18,7 +18,7 @@ export class SQLAsyncFacet {
       const params = {
         body: {
           query: request.body.query.qs,
-          datasource: df?.name,
+          datasource: request.body.dataSource,
           lang: 'sql',
           sessionId: df?.meta?.sessionId,
         },

diff --git a/src/plugins/data/common/search/search_source/fetch/get_search_params.ts b/src/plugins/data/common/search/search_source/fetch/get_search_params.ts
@@ -77,9 +77,9 @@ export async function getExternalSearchParamsFromRequest(
   const dataFrame =
     getDataFrame() ??
     (dataSource?.name ? getDataFrameBySource(dataSource.name) : null) ??
-    (await setDataFrame(createDataFrame({ name: dataSource?.name ?? '', fields: [] })));
+    (await setDataFrame(createDataFrame({ name: dataSource?.name ?? indexTitle, fields: [] })));
   return {
-    index: indexTitle,
+    index: dataSource ? dataSource.name : indexTitle,
     body: {
       ...searchRequest.body,
       df: dataFrame,
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,6 +106,7 @@ export function defineRoutes( @@
                 format: schema.string(),
               }),
               df: schema.any(),
+              dataSource: schema.string(),
             }),
           },
         },
@@ Expand Down @@