diff --git a/superset-frontend/src/SqlLab/constants.ts b/superset-frontend/src/SqlLab/constants.ts index 108ce895618a0..03f725c09d614 100644 --- a/superset-frontend/src/SqlLab/constants.ts +++ b/superset-frontend/src/SqlLab/constants.ts @@ -83,6 +83,7 @@ export const BYTES_PER_CHAR = 2; // browser's localStorage max usage constants export const LOCALSTORAGE_MAX_QUERY_AGE_MS = 24 * 60 * 60 * 1000; // 24 hours export const LOCALSTORAGE_MAX_USAGE_KB = 5 * 1024; // 5M +export const LOCALSTORAGE_MAX_QUERY_RESULTS_KB = 1 * 1024; // 1M export const LOCALSTORAGE_WARNING_THRESHOLD = 0.9; export const LOCALSTORAGE_WARNING_MESSAGE_THROTTLE_MS = 8000; // danger type toast duration diff --git a/superset-frontend/src/SqlLab/utils/emptyQueryResults.test.js b/superset-frontend/src/SqlLab/utils/emptyQueryResults.test.js index 6a441062bea6f..1f201938cda42 100644 --- a/superset-frontend/src/SqlLab/utils/emptyQueryResults.test.js +++ b/superset-frontend/src/SqlLab/utils/emptyQueryResults.test.js @@ -23,6 +23,11 @@ import { import { LOCALSTORAGE_MAX_QUERY_AGE_MS } from 'src/SqlLab/constants'; import { queries, defaultQueryEditor } from '../fixtures'; +jest.mock('src/SqlLab/constants', () => ({ + ...jest.requireActual('src/SqlLab/constants'), + LOCALSTORAGE_MAX_QUERY_RESULTS_KB: 1, +})); + describe('reduxStateToLocalStorageHelper', () => { const queriesObj = {}; beforeEach(() => { @@ -45,6 +50,38 @@ describe('reduxStateToLocalStorageHelper', () => { expect(emptiedQuery[id].results).toEqual({}); }); + it('should empty query.results if query,.results size is greater than LOCALSTORAGE_MAX_QUERY_RESULTS_KB', () => { + const reasonableSizeQuery = { + ...queries[0], + startDttm: Date.now(), + results: { data: [{ a: 1 }] }, + }; + const largeQuery = { + ...queries[1], + startDttm: Date.now(), + results: { + data: [ + { + test: 1123123123123, + stringValue: + 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum', + jsonValue: + '{"a":1234234234234234,"b":21234123412341234,"c":31234123412341234,"str":"something long text goes here"}', + }, + ], + }, + }; + expect(Object.keys(largeQuery.results)).toContain('data'); + const emptiedQuery = emptyQueryResults({ + [reasonableSizeQuery.id]: reasonableSizeQuery, + [largeQuery.id]: largeQuery, + }); + expect(emptiedQuery[largeQuery.id].results).toEqual({}); + expect(emptiedQuery[reasonableSizeQuery.id].results).toEqual( + reasonableSizeQuery.results, + ); + }); + it('should only return selected keys for query editor', () => { const queryEditors = [defaultQueryEditor]; expect(Object.keys(queryEditors[0])).toContain('schemaOptions'); diff --git a/superset-frontend/src/SqlLab/utils/reduxStateToLocalStorageHelper.js b/superset-frontend/src/SqlLab/utils/reduxStateToLocalStorageHelper.js index 66e33b07c5f4c..d03354f1666a0 100644 --- a/superset-frontend/src/SqlLab/utils/reduxStateToLocalStorageHelper.js +++ b/superset-frontend/src/SqlLab/utils/reduxStateToLocalStorageHelper.js @@ -16,7 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -import { LOCALSTORAGE_MAX_QUERY_AGE_MS } from '../constants'; +import { + BYTES_PER_CHAR, + KB_STORAGE, + LOCALSTORAGE_MAX_QUERY_AGE_MS, + LOCALSTORAGE_MAX_QUERY_RESULTS_KB, +} from '../constants'; const PERSISTENT_QUERY_EDITOR_KEYS = new Set([ 'remoteId', @@ -36,13 +41,21 @@ const PERSISTENT_QUERY_EDITOR_KEYS = new Set([ 'hideLeftBar', ]); +function shouldEmptyQueryResults(query) { + const { startDttm, results } = query; + return ( + Date.now() - startDttm > LOCALSTORAGE_MAX_QUERY_AGE_MS || + ((JSON.stringify(results)?.length || 0) * BYTES_PER_CHAR) / KB_STORAGE > + LOCALSTORAGE_MAX_QUERY_RESULTS_KB + ); +} + export function emptyQueryResults(queries) { return Object.keys(queries).reduce((accu, key) => { - const { startDttm, results } = queries[key]; + const { results } = queries[key]; const query = { ...queries[key], - results: - Date.now() - startDttm > LOCALSTORAGE_MAX_QUERY_AGE_MS ? {} : results, + results: shouldEmptyQueryResults(queries[key]) ? {} : results, }; const updatedQueries = {