remove sample size in query string but use advanced setting

Signed-off-by: abbyhu2000 <[email protected]>
opensearch-project · Feb 7, 2025 · d3fe9fb · d3fe9fb
1 parent 2ff6f19
commit d3fe9fb
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 7 deletions.
diff --git a/.../core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/queries.spec.js b/.../core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/queries.spec.js
@@ -98,7 +98,7 @@ const queriesTestSuite = () => {
         // Default SQL query should be set
         cy.waitForLoader(true);
         cy.getElementByTestId(`osdQueryEditor__multiLine`).contains(
-          `SELECT * FROM ${INDEX_WITH_TIME_1}* LIMIT 10`
+          `SELECT * FROM ${INDEX_WITH_TIME_1}`
         );
         cy.getElementByTestId(`queryResultCompleteMsg`).should('be.visible');
 

diff --git a/cypress/utils/apps/query_enhancements/shared.js b/cypress/utils/apps/query_enhancements/shared.js
@@ -122,7 +122,7 @@ export const getDefaultQuery = (datasetName, language) => {
     case QueryLanguages.PPL.name:
       return `source = ${datasetName}`;
     case QueryLanguages.SQL.name:
-      return `SELECT * FROM ${datasetName} LIMIT 10`;
+      return `SELECT * FROM ${datasetName}`;
   }
 };
 

diff --git a/src/plugins/data/public/query/query_string/dataset_service/lib/index_pattern_type.ts b/src/plugins/data/public/query/query_string/dataset_service/lib/index_pattern_type.ts
@@ -86,7 +86,7 @@ export const indexPatternTypeConfig: DatasetTypeConfig = {
             title: i18n.translate('data.indexPatternType.sampleQuery.basicSQLQuery', {
               defaultMessage: 'Sample query for SQL',
             }),
-            query: `SELECT * FROM ${dataset.title} LIMIT 10`,
+            query: `SELECT * FROM ${dataset.title}`,
           },
         ];
     }

diff --git a/src/plugins/data/public/query/query_string/dataset_service/lib/index_type.ts b/src/plugins/data/public/query/query_string/dataset_service/lib/index_type.ts
@@ -109,7 +109,7 @@ export const indexTypeConfig: DatasetTypeConfig = {
             title: i18n.translate('data.indexType.sampleQuery.basicSQLQuery', {
               defaultMessage: 'Sample query for SQL',
             }),
-            query: `SELECT * FROM ${dataset.title} LIMIT 10`,
+            query: `SELECT * FROM ${dataset.title}`,
           },
         ];
     }

diff --git a/src/plugins/query_enhancements/public/datasets/s3_type.ts b/src/plugins/query_enhancements/public/datasets/s3_type.ts
@@ -140,7 +140,7 @@ export const s3TypeConfig: DatasetTypeConfig = {
             title: i18n.translate('queryEnhancements.s3Type.sampleQuery.basicSQLQuery', {
               defaultMessage: 'Sample query for SQL',
             }),
-            query: `SELECT * FROM ${dataset.title} LIMIT 10`,
+            query: `SELECT * FROM ${dataset.title}`,
           },
         ];
     }

diff --git a/src/plugins/query_enhancements/public/plugin.tsx b/src/plugins/query_enhancements/public/plugin.tsx
@@ -130,8 +130,7 @@ export class QueryEnhancementsPlugin
         startServices: core.getStartServices(),
         usageCollector: data.search.usageCollector,
       }),
-      getQueryString: (currentQuery: Query) =>
-        `SELECT * FROM ${currentQuery.dataset?.title} LIMIT 10`,
+      getQueryString: (currentQuery: Query) => `SELECT * FROM ${currentQuery.dataset?.title}`,
       fields: { sortable: false, filterable: false, visualizable: false },
       docLink: {
         title: i18n.translate('queryEnhancements.sqlLanguage.docLink', {

diff --git a/src/plugins/query_enhancements/server/search/ppl_search_strategy.ts b/src/plugins/query_enhancements/server/search/ppl_search_strategy.ts
@@ -35,6 +35,7 @@ export const pplSearchStrategyProvider = (
   return {
     search: async (context, request: any, options) => {
       try {
+        request.body.fetch_size = await context.core.uiSettings.client.get('discover:sampleSize');
         const query: Query = request.body.query;
         const aggConfig: QueryAggConfig | undefined = request.body.aggConfig;
         const rawResponse: any = await pplFacet.describeQuery(context, request);

diff --git a/src/plugins/query_enhancements/server/search/sql_search_strategy.ts b/src/plugins/query_enhancements/server/search/sql_search_strategy.ts
@@ -33,6 +33,7 @@ export const sqlSearchStrategyProvider = (
   return {
     search: async (context, request: any, options) => {
       try {
+        request.body.fetch_size = await context.core.uiSettings.client.get('discover:sampleSize');
         const query: Query = request.body.query;
         const rawResponse: any = await sqlFacet.describeQuery(context, request);
 

diff --git a/src/plugins/query_enhancements/server/utils/facet.ts b/src/plugins/query_enhancements/server/utils/facet.ts
@@ -43,6 +43,7 @@ export class Facet {
       const { format, lang } = request.body;
       const params = {
         body: {
+          fetch_size: request.body.fetch_size,
           query: query.query,
           ...(meta?.name && { datasource: meta.name }),
           ...(meta?.sessionId && {