fix: add implicit transaction_mode to query settings (#1240)

astandrik · web-flow · commit 75a0d892bd30 · 2024-09-02T10:53:51.000+03:00
diff --git a/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettings.test.ts b/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettings.test.ts
@@ -1,14 +1,14 @@
 import type {QuerySettings} from '../../../../../types/store/query';
 import {
-    ISOLATION_LEVELS,
     QUERY_MODES,
     STATISTICS_MODES,
     TRACING_LEVELS,
+    TRANSACTION_MODES,
 } from '../../../../../utils/query';
 
 const DEFAULT_QUERY_SETTINGS: QuerySettings = {
     queryMode: QUERY_MODES.query,
-    isolationLevel: ISOLATION_LEVELS.serializable,
+    transactionMode: TRANSACTION_MODES.implicit,
     timeout: '60',
     statisticsMode: STATISTICS_MODES.none,
     tracingLevel: TRACING_LEVELS.detailed,
@@ -36,15 +36,15 @@ describe('getChangedQueryExecutionSettings', () => {
     it('should return all keys if all settings have changed', () => {
         const currentSettings: QuerySettings = {
             queryMode: QUERY_MODES.data,
-            isolationLevel: ISOLATION_LEVELS.onlinero,
+            transactionMode: TRANSACTION_MODES.onlinero,
             timeout: '90',
             statisticsMode: STATISTICS_MODES.basic,
             tracingLevel: TRACING_LEVELS.basic,
         };
         const result = getChangedQueryExecutionSettings(currentSettings, DEFAULT_QUERY_SETTINGS);
         expect(result).toEqual([
             'queryMode',
-            'isolationLevel',
+            'transactionMode',
             'timeout',
             'statisticsMode',
             'tracingLevel',
diff --git a/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.test.ts b/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.test.ts
@@ -1,21 +1,21 @@
 import type {QuerySettings} from '../../../../../types/store/query';
 import {
-    ISOLATION_LEVELS,
-    ISOLATION_LEVELS_TITLES,
     QUERY_MODES,
     QUERY_MODES_TITLES,
     STATISTICS_MODES,
     STATISTICS_MODES_TITLES,
     TRACING_LEVELS,
     TRACING_LEVELS_TITLES,
+    TRANSACTION_MODES,
+    TRANSACTION_MODES_TITLES,
 } from '../../../../../utils/query';
 import {QUERY_SETTINGS_FIELD_SETTINGS} from '../../QuerySettingsDialog/constants';
 
 import getChangedQueryExecutionSettingsDescription from './getChangedQueryExecutionSettingsDescription';
 
 const DEFAULT_QUERY_SETTINGS: QuerySettings = {
     queryMode: QUERY_MODES.query,
-    isolationLevel: ISOLATION_LEVELS.serializable,
+    transactionMode: TRANSACTION_MODES.implicit,
     timeout: '60',
     statisticsMode: STATISTICS_MODES.none,
     tracingLevel: TRACING_LEVELS.detailed,
@@ -57,7 +57,7 @@ describe('getChangedQueryExecutionSettingsDescription', () => {
     it('should return the correct description for all changed settings', () => {
         const currentSettings: QuerySettings = {
             queryMode: QUERY_MODES.data,
-            isolationLevel: ISOLATION_LEVELS.snapshot,
+            transactionMode: TRANSACTION_MODES.snapshot,
             timeout: '120',
             statisticsMode: STATISTICS_MODES.profile,
             tracingLevel: TRACING_LEVELS.diagnostic,
@@ -70,8 +70,8 @@ describe('getChangedQueryExecutionSettingsDescription', () => {
 
         expect(result).toEqual({
             [QUERY_SETTINGS_FIELD_SETTINGS.queryMode.title]: QUERY_MODES_TITLES.data,
-            [QUERY_SETTINGS_FIELD_SETTINGS.isolationLevel.title]:
-                ISOLATION_LEVELS_TITLES['snapshot-read-only'],
+            [QUERY_SETTINGS_FIELD_SETTINGS.transactionMode.title]:
+                TRANSACTION_MODES_TITLES['snapshot-read-only'],
             [QUERY_SETTINGS_FIELD_SETTINGS.timeout.title]: '120',
             [QUERY_SETTINGS_FIELD_SETTINGS.statisticsMode.title]: STATISTICS_MODES_TITLES.profile,
             [QUERY_SETTINGS_FIELD_SETTINGS.tracingLevel.title]: TRACING_LEVELS_TITLES.diagnostic,
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -140,19 +140,19 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                     </Flex>
                 )}
                 <Flex direction="row" alignItems="flex-start" className={b('dialog-row')}>
-                    <label htmlFor="isolationLevel" className={b('field-title')}>
-                        {QUERY_SETTINGS_FIELD_SETTINGS.isolationLevel.title}
+                    <label htmlFor="transactionMode" className={b('field-title')}>
+                        {QUERY_SETTINGS_FIELD_SETTINGS.transactionMode.title}
                     </label>
-                    <div className={b('control-wrapper', {isolationLevel: true})}>
+                    <div className={b('control-wrapper', {transactionMode: true})}>
                         <Controller
-                            name="isolationLevel"
+                            name="transactionMode"
                             control={control}
                             render={({field}) => (
                                 <QuerySettingsSelect
                                     setting={field.value}
                                     onUpdateSetting={field.onChange}
                                     settingOptions={
-                                        QUERY_SETTINGS_FIELD_SETTINGS.isolationLevel.options
+                                        QUERY_SETTINGS_FIELD_SETTINGS.transactionMode.options
                                     }
                                 />
                             )}
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsSelect.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsSelect.tsx
@@ -2,10 +2,10 @@ import type {SelectOption} from '@gravity-ui/uikit';
 import {Select} from '@gravity-ui/uikit';
 
 import type {
-    IsolationLevel,
     QueryMode,
     StatisticsMode,
     TracingLevel,
+    TransactionMode,
 } from '../../../../types/store/query';
 import {cn} from '../../../../utils/cn';
 
@@ -19,7 +19,7 @@ export const getOptionHeight = () => -1;
 
 const b = cn('ydb-query-settings-select');
 
-type SelectType = QueryMode | IsolationLevel | StatisticsMode | TracingLevel;
+type SelectType = QueryMode | TransactionMode | StatisticsMode | TracingLevel;
 type QuerySettingSelectOption<T> = SelectOption<T> & {isDefault?: boolean};
 
 interface QuerySettingsSelectProps<T extends SelectType> {
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/constants.ts b/src/containers/Tenant/Query/QuerySettingsDialog/constants.ts
@@ -1,38 +1,43 @@
 import {
-    ISOLATION_LEVELS,
-    ISOLATION_LEVELS_TITLES,
     QUERY_MODES,
     QUERY_MODES_TITLES,
     STATISTICS_MODES,
     STATISTICS_MODES_TITLES,
     TRACING_LEVELS,
     TRACING_LEVELS_TITLES,
+    TRANSACTION_MODES,
+    TRANSACTION_MODES_TITLES,
 } from '../../../../utils/query';
 import i18n from '../i18n';
 
 import formI18n from './i18n';
 
-export const ISOLATION_LEVEL_SELECT_OPTIONS = [
+export const TRANSACTION_MODE_SELECT_OPTIONS = [
     {
-        value: ISOLATION_LEVELS.serializable,
-        content: ISOLATION_LEVELS_TITLES[ISOLATION_LEVELS.serializable],
-        text: i18n('isolation-level-description.serializable'),
+        value: TRANSACTION_MODES.implicit,
+        content: TRANSACTION_MODES_TITLES[TRANSACTION_MODES.implicit],
+        text: i18n('transaction-mode-description.implicit'),
         isDefault: true,
     },
     {
-        value: ISOLATION_LEVELS.onlinero,
-        content: ISOLATION_LEVELS_TITLES[ISOLATION_LEVELS.onlinero],
-        text: i18n('isolation-level-description.onlinero'),
+        value: TRANSACTION_MODES.serializable,
+        content: TRANSACTION_MODES_TITLES[TRANSACTION_MODES.serializable],
+        text: i18n('transaction-mode-description.serializable'),
     },
     {
-        value: ISOLATION_LEVELS.stalero,
-        content: ISOLATION_LEVELS_TITLES[ISOLATION_LEVELS.stalero],
-        text: i18n('isolation-level-description.stalero'),
+        value: TRANSACTION_MODES.onlinero,
+        content: TRANSACTION_MODES_TITLES[TRANSACTION_MODES.onlinero],
+        text: i18n('transaction-mode-description.onlinero'),
     },
     {
-        value: ISOLATION_LEVELS.snapshot,
-        content: ISOLATION_LEVELS_TITLES[ISOLATION_LEVELS.snapshot],
-        text: i18n('isolation-level-description.snapshot'),
+        value: TRANSACTION_MODES.stalero,
+        content: TRANSACTION_MODES_TITLES[TRANSACTION_MODES.stalero],
+        text: i18n('transaction-mode-description.stalero'),
+    },
+    {
+        value: TRANSACTION_MODES.snapshot,
+        content: TRANSACTION_MODES_TITLES[TRANSACTION_MODES.snapshot],
+        text: i18n('transaction-mode-description.snapshot'),
     },
 ];
 
@@ -124,9 +129,9 @@ export const TRACING_LEVEL_SELECT_OPTIONS = [
 ];
 
 export const QUERY_SETTINGS_FIELD_SETTINGS = {
-    isolationLevel: {
-        title: formI18n('form.isolation-level'),
-        options: ISOLATION_LEVEL_SELECT_OPTIONS,
+    transactionMode: {
+        title: formI18n('form.transaction-mode'),
+        options: TRANSACTION_MODE_SELECT_OPTIONS,
     },
     queryMode: {
         title: formI18n('form.query-mode'),
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json
@@ -2,7 +2,7 @@
   "action.settings": "Query settings",
   "form.query-mode": "Query type",
   "form.timeout": "Timeout",
-  "form.isolation-level": "Isolation level",
+  "form.transaction-mode": "Transaction mode",
   "form.statistics-mode": "Statistics collection mode",
   "form.tracing-level": "Tracing level",
   "button-done": "Save",
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json
@@ -2,7 +2,7 @@
   "action.settings": "Настройки запроса",
   "form.query-mode": "Тип запроса",
   "form.timeout": "Таймаут",
-  "form.isolation-level": "Уровень изоляции",
+  "form.transaction-mode": "Уровень изоляции",
   "form.statistics-mode": "Режим сбора статистики",
   "form.tracing-level": "Tracing level",
   "button-done": "Готово",
diff --git a/src/containers/Tenant/Query/i18n/en.json b/src/containers/Tenant/Query/i18n/en.json
@@ -24,10 +24,11 @@
   "method-description.query": "Any query. An experimental API call supposed to replace all existing methods.\nAPI Call: query.ExecuteScript",
   "method-description.pg": "Queries in postgresql syntax.\nAPI call: query.ExecuteScript",
 
-  "isolation-level-description.serializable": "Provides the strictest isolation level for custom transactions",
-  "isolation-level-description.onlinero": "Each read operation in the transaction is reading the data that is most recent at execution time",
-  "isolation-level-description.stalero": "Read operations within a transaction may return results that are slightly out-of-date (lagging by fractions of a second)",
-  "isolation-level-description.snapshot": "All the read operations within a transaction access the database snapshot. All the data reads are consistent",
+  "transaction-mode-description.serializable": "Provides the strictest isolation level for custom transactions",
+  "transaction-mode-description.onlinero": "Each read operation in the transaction is reading the data that is most recent at execution time",
+  "transaction-mode-description.stalero": "Read operations within a transaction may return results that are slightly out-of-date (lagging by fractions of a second)",
+  "transaction-mode-description.snapshot": "All the read operations within a transaction access the database snapshot. All the data reads are consistent",
+  "transaction-mode-description.implicit": "No transaction",
 
   "tracing-level-description.basic": "Spans of main component operations",
   "tracing-level-description.detailed": "Highest detail applicable for diagnosing problems in production",
diff --git a/src/services/api.ts b/src/services/api.ts
@@ -29,7 +29,6 @@ import type {
     Stats,
     Timeout,
     TracingLevel,
-    TransactionMode,
 } from '../types/api/query';
 import type {JsonRenderRequestParams, JsonRenderResponse} from '../types/api/render';
 import type {TEvDescribeSchemeResult} from '../types/api/schema';
@@ -45,7 +44,7 @@ import type {TTenantInfo, TTenants} from '../types/api/tenant';
 import type {DescribeTopicResult} from '../types/api/topic';
 import type {TEvVDiskStateResponse} from '../types/api/vdisk';
 import type {TUserToken} from '../types/api/whoami';
-import type {QuerySyntax} from '../types/store/query';
+import type {QuerySyntax, TransactionMode} from '../types/store/query';
 import {
     BINARY_DATA_IN_PLAIN_TEXT_DISPLAY,
     DEV_ENABLE_TRACING_FOR_ALL_REQUESTS,
diff --git a/src/store/reducers/executeQuery.ts b/src/store/reducers/executeQuery.ts
@@ -226,7 +226,10 @@ export const executeQueryApi = api.injectEndpoints({
                                 querySettings.tracingLevel && enableTracingLevel
                                     ? TracingLevelNumber[querySettings.tracingLevel]
                                     : undefined,
-                            transaction_mode: querySettings.isolationLevel,
+                            transaction_mode:
+                                querySettings.transactionMode === 'implicit'
+                                    ? undefined
+                                    : querySettings.transactionMode,
                             timeout: isNumeric(querySettings.timeout)
                                 ? Number(querySettings.timeout) * 1000
                                 : undefined,
diff --git a/src/store/reducers/explainQuery/explainQuery.ts b/src/store/reducers/explainQuery/explainQuery.ts
@@ -45,7 +45,10 @@ export const explainQueryApi = api.injectEndpoints({
                                 querySettings?.tracingLevel && enableTracingLevel
                                     ? TracingLevelNumber[querySettings?.tracingLevel]
                                     : undefined,
-                            transaction_mode: querySettings?.isolationLevel,
+                            transaction_mode:
+                                querySettings?.transactionMode === 'implicit'
+                                    ? undefined
+                                    : querySettings?.transactionMode,
                             timeout: isNumeric(querySettings?.timeout)
                                 ? Number(querySettings?.timeout) * 1000
                                 : undefined,
diff --git a/src/types/api/query.ts b/src/types/api/query.ts
@@ -1,5 +1,5 @@
 import {TRACING_LEVELS} from '../../utils/query';
-import type {IsolationLevel, StatisticsMode} from '../store/query';
+import type {StatisticsMode} from '../store/query';
 
 // ==== types from backend protos ====
 interface Position {
@@ -218,9 +218,6 @@ export type Stats = StatisticsMode;
 /** undefined = '60000' */
 export type Timeout = number;
 
-/** undefined = 'serializable-read-write' */
-export type TransactionMode = IsolationLevel;
-
 /** undefined = '15' */
 export type TracingLevel = number;
 
diff --git a/src/types/store/query.ts b/src/types/store/query.ts
@@ -1,10 +1,10 @@
 import type {
-    ISOLATION_LEVELS,
     QUERY_ACTIONS,
     QUERY_MODES,
     QUERY_SYNTAX,
     STATISTICS_MODES,
     TRACING_LEVELS,
+    TRANSACTION_MODES,
 } from '../../utils/query';
 import type {IResponseError, NetworkError} from '../api/error';
 import type {
@@ -38,7 +38,7 @@ export interface QueryRequestParams {
 
 export interface QuerySettings {
     queryMode: QueryMode;
-    isolationLevel: IsolationLevel;
+    transactionMode: TransactionMode;
     timeout?: string;
     statisticsMode?: StatisticsMode;
     tracingLevel?: TracingLevel;
@@ -51,7 +51,7 @@ export type QueryAction = ValueOf<typeof QUERY_ACTIONS>;
 export type QueryMode = ValueOf<typeof QUERY_MODES>;
 export type QuerySyntax = ValueOf<typeof QUERY_SYNTAX>;
 
-export type IsolationLevel = ValueOf<typeof ISOLATION_LEVELS>;
+export type TransactionMode = ValueOf<typeof TRANSACTION_MODES>;
 export type StatisticsMode = ValueOf<typeof STATISTICS_MODES>;
 export type TracingLevel = ValueOf<typeof TRACING_LEVELS>;
 
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
@@ -4,7 +4,7 @@ import type {Settings} from '@gravity-ui/react-data-table';
 import {EType} from '../types/api/tablet';
 import type {QuerySettings} from '../types/store/query';
 
-import {ISOLATION_LEVELS, QUERY_MODES, STATISTICS_MODES, TRACING_LEVELS} from './query';
+import {QUERY_MODES, STATISTICS_MODES, TRACING_LEVELS, TRANSACTION_MODES} from './query';
 
 const SECOND = 1000;
 
@@ -125,7 +125,7 @@ export const TENANT_OVERVIEW_TABLES_SETTINGS = {
 
 export const DEFAULT_QUERY_SETTINGS = {
     queryMode: QUERY_MODES.query,
-    isolationLevel: ISOLATION_LEVELS.serializable,
+    transactionMode: TRANSACTION_MODES.implicit,
     timeout: '60',
     statisticsMode: STATISTICS_MODES.none,
     tracingLevel: TRACING_LEVELS.detailed,
diff --git a/src/utils/hooks/useLastQueryExecutionSettings.ts b/src/utils/hooks/useLastQueryExecutionSettings.ts
@@ -4,5 +4,19 @@ import {LAST_QUERY_EXECUTION_SETTINGS_KEY} from '../constants';
 import {useSetting} from './useSetting';
 
 export const useLastQueryExecutionSettings = () => {
-    return useSetting<QuerySettings | undefined>(LAST_QUERY_EXECUTION_SETTINGS_KEY);
+    const [lastStorageSettings, setLastSettings] = useSetting<QuerySettings | undefined>(
+        LAST_QUERY_EXECUTION_SETTINGS_KEY,
+    );
+
+    const lastSettings: QuerySettings | undefined = lastStorageSettings
+        ? {
+              transactionMode: lastStorageSettings.transactionMode,
+              queryMode: lastStorageSettings.queryMode,
+              statisticsMode: lastStorageSettings.statisticsMode,
+              tracingLevel: lastStorageSettings.tracingLevel,
+              timeout: lastStorageSettings.timeout,
+          }
+        : undefined;
+
+    return [lastSettings, setLastSettings] as const;
 };
diff --git a/src/utils/hooks/useQueryExecutionSettings.ts b/src/utils/hooks/useQueryExecutionSettings.ts
@@ -6,15 +6,17 @@ import {useSetting} from './useSetting';
 
 export const useQueryExecutionSettings = () => {
     const enableTracingLevel = useTracingLevelOptionAvailable();
-    const [setting, setSetting] = useSetting<QuerySettings>(QUERY_EXECUTION_SETTINGS_KEY);
+    const [storageSettings, setSettings] = useSetting<QuerySettings>(QUERY_EXECUTION_SETTINGS_KEY);
 
-    return [
-        {
-            ...setting,
-            tracingLevel: enableTracingLevel
-                ? setting.tracingLevel
-                : DEFAULT_QUERY_SETTINGS.tracingLevel,
-        },
-        setSetting,
-    ] as const;
+    const settings: QuerySettings = {
+        queryMode: storageSettings.queryMode ?? DEFAULT_QUERY_SETTINGS.queryMode,
+        timeout: storageSettings.timeout ?? DEFAULT_QUERY_SETTINGS.timeout,
+        statisticsMode: storageSettings.statisticsMode ?? DEFAULT_QUERY_SETTINGS.statisticsMode,
+        transactionMode: storageSettings.transactionMode ?? DEFAULT_QUERY_SETTINGS.transactionMode,
+        tracingLevel: enableTracingLevel
+            ? storageSettings.tracingLevel
+            : DEFAULT_QUERY_SETTINGS.tracingLevel,
+    };
+
+    return [settings, setSettings] as const;
 };
diff --git a/src/utils/query.ts b/src/utils/query.ts
diff --git a/tests/suites/tenant/queryEditor/QueryEditor.ts b/tests/suites/tenant/queryEditor/QueryEditor.ts
diff --git a/tests/suites/tenant/queryEditor/queryEditor.test.ts b/tests/suites/tenant/queryEditor/queryEditor.test.ts
