diff --git a/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/queries.spec.js b/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/queries.spec.js index f12c58b16fbd..89da4c1f8a7c 100644 --- a/cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/queries.spec.js +++ b/cypress/integration/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 index a1766e788847..5f1243c0cc2a 100644 --- 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 index db2abe58a375..a61635a7f728 100644 --- 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 index 3633f18a9dae..0cea89e1a868 100644 --- 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 index c13b5e898670..9d2d4c84c1d0 100644 --- 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 index 71ad2302b99e..54da74ddf7ce 100644 --- 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 index d47d2ca41c4a..466ac411f8f5 100644 --- 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 index 09f2775d0fe2..63fc8ca28f18 100644 --- 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 index a080b8833fb7..475f79837200 100644 --- 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 && {