ydb-embedded-ui 6.11.0 → 6.13.0

package/dist/store/reducers/executeQuery.js

@@ -1,10 +1,10 @@
 import { settingsManager } from '../../services/settings';
+import { TracingLevelNumber } from '../../types/api/query';
 import { QUERIES_HISTORY_KEY } from '../../utils/constants';
-import { QUERY_MODES, QUERY_SYNTAX, isQueryErrorResponse, parseQueryAPIExecuteResponse, } from '../../utils/query';
-import { createRequestActionTypes } from '../utils';
+import { QUERY_SYNTAX, isQueryErrorResponse, parseQueryAPIExecuteResponse } from '../../utils/query';
+import { isNumeric } from '../../utils/utils';
 import { api } from './api';
 const MAXIMUM_QUERIES_IN_HISTORY = 20;
-export const SEND_QUERY = createRequestActionTypes('query', 'SEND_QUERY');
 const CHANGE_USER_INPUT = 'query/CHANGE_USER_INPUT';
 const SAVE_QUERY_TO_HISTORY = 'query/SAVE_QUERY_TO_HISTORY';
 const GO_TO_PREVIOUS_QUERY = 'query/GO_TO_PREVIOUS_QUERY';
@@ -33,10 +33,8 @@ const executeQuery = (state = initialState, action) => {
             };
         }
         case SAVE_QUERY_TO_HISTORY: {
-            const queryText = action.data.queryText;
-            // Do not save explicit yql syntax value for easier further support (use yql by default)
-            const syntax = action.data.mode === QUERY_MODES.pg ? QUERY_SYNTAX.pg : undefined;
-            const newQueries = [...state.history.queries, { queryText, syntax }].slice(state.history.queries.length >= MAXIMUM_QUERIES_IN_HISTORY ? 1 : 0);
+            const queryText = action.data;
+            const newQueries = [...state.history.queries, { queryText }].slice(state.history.queries.length >= MAXIMUM_QUERIES_IN_HISTORY ? 1 : 0);
             settingsManager.setUserSettingsValue(QUERIES_HISTORY_KEY, newQueries);
             const currentIndex = newQueries.length - 1;
             return {
@@ -93,15 +91,15 @@ const executeQuery = (state = initialState, action) => {
 export const executeQueryApi = api.injectEndpoints({
     endpoints: (build) => ({
         executeQuery: build.mutation({
-            queryFn: async ({ query, database, mode, schema = 'modern' }) => {
+            queryFn: async ({ query, database, querySettings = {}, schema = 'modern', enableTracingLevel, }) => {
                 let action = 'execute';
                 let syntax = QUERY_SYNTAX.yql;
-                if (mode === 'pg') {
+                if (querySettings.queryMode === 'pg') {
                     action = 'execute-query';
                     syntax = QUERY_SYNTAX.pg;
                 }
-                else if (mode) {
-                    action = `execute-${mode}`;
+                else if (querySettings.queryMode) {
+                    action = `execute-${querySettings.queryMode}`;
                 }
                 try {
                     const response = await window.api.sendQuery({
@@ -110,7 +108,14 @@ export const executeQueryApi = api.injectEndpoints({
                         database,
                         action,
                         syntax,
-                        stats: 'full',
+                        stats: querySettings.statisticsMode,
+                        tracingLevel: querySettings.tracingLevel && enableTracingLevel
+                            ? TracingLevelNumber[querySettings.tracingLevel]
+                            : undefined,
+                        transaction_mode: querySettings.isolationLevel,
+                        timeout: isNumeric(querySettings.timeout)
+                            ? Number(querySettings.timeout) * 1000
+                            : undefined,
                     });
                     if (isQueryErrorResponse(response)) {
                         return { error: response };
@@ -126,10 +131,10 @@ export const executeQueryApi = api.injectEndpoints({
     }),
     overrideExisting: 'throw',
 });
-export const saveQueryToHistory = (queryText, mode) => {
+export const saveQueryToHistory = (queryText) => {
     return {
         type: SAVE_QUERY_TO_HISTORY,
-        data: { queryText, mode },
+        data: queryText,
     };
 };
 export const goToPreviousQuery = () => {

package/dist/store/reducers/executeTopQueries/executeTopQueries.d.ts

@@ -6,5 +6,5 @@ export declare const topQueriesApi: import("@reduxjs/toolkit/query").Api<import(
     getTopQueries: import("@reduxjs/toolkit/query").QueryDefinition<{
         database: string;
         filters?: TopQueriesFilters;
-    }, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All", import("../../../types/store/query").IQueryResult | undefined, "api">;
-}, "api", "All", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;
+    }, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All" | "PDiskData" | "UserData", import("../../../types/store/query").IQueryResult | undefined, "api">;
+}, "api", "All" | "PDiskData" | "UserData", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;

package/dist/store/reducers/executeTopQueries/executeTopQueries.js

@@ -1,5 +1,5 @@
+import { isLikeRelative } from '@gravity-ui/date-utils';
 import { createSlice } from '@reduxjs/toolkit';
-import { HOUR_IN_SECONDS } from '../../../utils/constants';
 import { isQueryErrorResponse, parseQueryAPIExecuteResponse } from '../../../utils/query';
 import { api } from '../api';
 import { getFiltersConditions } from './utils';
@@ -35,34 +35,39 @@ ORDER BY CPUTimeUs DESC
 export const topQueriesApi = api.injectEndpoints({
     endpoints: (build) => ({
         getTopQueries: build.query({
-            queryFn: async ({ database, filters }, { signal, dispatch }) => {
-                var _a, _b;
+            queryFn: async ({ database, filters }, { signal }) => {
+                const preparedFilters = {
+                    ...filters,
+                    from: (filters === null || filters === void 0 ? void 0 : filters.from) || 'now-1h',
+                    to: (filters === null || filters === void 0 ? void 0 : filters.to) || 'now',
+                };
                 try {
                     const response = await window.api.sendQuery({
                         schema: 'modern',
-                        query: getQueryText(database, filters),
+                        query: getQueryText(database, preparedFilters),
                         database,
                         action: 'execute-scan',
-                    }, { signal });
+                    }, { signal, withRetries: true });
                     if (isQueryErrorResponse(response)) {
                         return { error: response };
                     }
                     const data = parseQueryAPIExecuteResponse(response);
-                    // FIXME: do we really need this?
-                    if (!(filters === null || filters === void 0 ? void 0 : filters.from) && !(filters === null || filters === void 0 ? void 0 : filters.to)) {
-                        const intervalEnd = (_b = (_a = data === null || data === void 0 ? void 0 : data.result) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.IntervalEnd;
-                        if (intervalEnd) {
-                            const to = new Date(intervalEnd).getTime();
-                            const from = new Date(to - HOUR_IN_SECONDS * 1000).getTime();
-                            dispatch(setTopQueriesFilters({ from, to }));
-                        }
-                    }
                     return { data };
                 }
                 catch (error) {
                     return { error };
                 }
             },
+            forceRefetch: ({ currentArg }) => {
+                var _a, _b, _c, _d;
+                if (!((_a = currentArg === null || currentArg === void 0 ? void 0 : currentArg.filters) === null || _a === void 0 ? void 0 : _a.from) ||
+                    !((_b = currentArg === null || currentArg === void 0 ? void 0 : currentArg.filters) === null || _b === void 0 ? void 0 : _b.to) ||
+                    isLikeRelative((_c = currentArg === null || currentArg === void 0 ? void 0 : currentArg.filters) === null || _c === void 0 ? void 0 : _c.from) ||
+                    isLikeRelative((_d = currentArg === null || currentArg === void 0 ? void 0 : currentArg.filters) === null || _d === void 0 ? void 0 : _d.to)) {
+                    return true;
+                }
+                return false;
+            },
         }),
     }),
     overrideExisting: 'throw',

package/dist/store/reducers/executeTopQueries/types.d.ts

@@ -1,8 +1,8 @@
 export interface TopQueriesFilters {
     /** ms from epoch */
-    from?: number;
+    from?: string;
     /** ms from epoch */
-    to?: number;
+    to?: string;
     text?: string;
 }
 export interface TopQueriesRootStateSlice {

package/dist/store/reducers/executeTopQueries/utils.js

@@ -1,3 +1,4 @@
+import { dateTimeParse } from '@gravity-ui/date-utils';
 const endTimeColumn = 'EndTime';
 const intervalEndColumn = 'IntervalEnd';
 const getMaxIntervalSubquery = (path) => `(
@@ -6,21 +7,24 @@ const getMaxIntervalSubquery = (path) => `(
     FROM \`${path}/.sys/top_queries_by_cpu_time_one_hour\`
 )`;
 export function getFiltersConditions(path, filters) {
+    var _a, _b;
     const conditions = [];
-    if ((filters === null || filters === void 0 ? void 0 : filters.from) && (filters === null || filters === void 0 ? void 0 : filters.to) && filters.from > filters.to) {
+    const to = (_a = dateTimeParse(Number(filters === null || filters === void 0 ? void 0 : filters.to) || (filters === null || filters === void 0 ? void 0 : filters.to))) === null || _a === void 0 ? void 0 : _a.valueOf();
+    const from = (_b = dateTimeParse(Number(filters === null || filters === void 0 ? void 0 : filters.from) || (filters === null || filters === void 0 ? void 0 : filters.from))) === null || _b === void 0 ? void 0 : _b.valueOf();
+    if (from && to && from > to) {
         throw new Error('Invalid date range');
     }
-    if (filters === null || filters === void 0 ? void 0 : filters.from) {
+    if (from) {
         // matching `from` & `to` is an edge case
         // other cases should not include the starting point, since intervals are stored using the ending time
-        const gt = filters.to === filters.from ? '>=' : '>';
-        conditions.push(`${endTimeColumn} ${gt} Timestamp('${new Date(filters.from).toISOString()}')`);
+        const gt = to === from ? '>=' : '>';
+        conditions.push(`${endTimeColumn} ${gt} Timestamp('${new Date(from).toISOString()}')`);
     }
-    if (filters === null || filters === void 0 ? void 0 : filters.to) {
-        conditions.push(`${endTimeColumn} <= Timestamp('${new Date(filters.to).toISOString()}')`);
+    if (to) {
+        conditions.push(`${endTimeColumn} <= Timestamp('${new Date(to).toISOString()}')`);
     }
     // If there is no filters, return queries, that were executed in the last hour
-    if (!(filters === null || filters === void 0 ? void 0 : filters.from) && !(filters === null || filters === void 0 ? void 0 : filters.to)) {
+    if (!from && !to) {
         conditions.push(`${intervalEndColumn} IN ${getMaxIntervalSubquery(path)}`);
     }
     if (filters === null || filters === void 0 ? void 0 : filters.text) {

package/dist/store/reducers/explainQuery/explainQuery.d.ts

@@ -1,9 +1,10 @@
-import type { QueryMode, QueryRequestParams } from '../../../types/store/query';
+import type { QueryRequestParams, QuerySettings } from '../../../types/store/query';
 import type { PreparedExplainResponse } from './types';
 interface ExplainQueryParams extends QueryRequestParams {
-    mode?: QueryMode;
+    querySettings?: Partial<QuerySettings>;
+    enableTracingLevel?: boolean;
 }
 export declare const explainQueryApi: import("@reduxjs/toolkit/query").Api<import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, {
-    explainQuery: import("@reduxjs/toolkit/query").MutationDefinition<ExplainQueryParams, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All", PreparedExplainResponse, "api">;
-}, "api", "All", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;
+    explainQuery: import("@reduxjs/toolkit/query").MutationDefinition<ExplainQueryParams, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All" | "PDiskData" | "UserData", PreparedExplainResponse, "api">;
+}, "api", "All" | "PDiskData" | "UserData", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;
 export {};

package/dist/store/reducers/explainQuery/explainQuery.js

@@ -1,21 +1,36 @@
+import { TracingLevelNumber } from '../../../types/api/query';
 import { QUERY_SYNTAX, isQueryErrorResponse } from '../../../utils/query';
+import { isNumeric } from '../../../utils/utils';
 import { api } from '../api';
 import { prepareExplainResponse } from './utils';
 export const explainQueryApi = api.injectEndpoints({
     endpoints: (build) => ({
         explainQuery: build.mutation({
-            queryFn: async ({ query, database, mode }) => {
+            queryFn: async ({ query, database, querySettings, enableTracingLevel }) => {
                 let action = 'explain';
                 let syntax = QUERY_SYNTAX.yql;
-                if (mode === 'pg') {
+                if ((querySettings === null || querySettings === void 0 ? void 0 : querySettings.queryMode) === 'pg') {
                     action = 'explain-query';
                     syntax = QUERY_SYNTAX.pg;
                 }
-                else if (mode) {
-                    action = `explain-${mode}`;
+                else if (querySettings === null || querySettings === void 0 ? void 0 : querySettings.queryMode) {
+                    action = `explain-${querySettings === null || querySettings === void 0 ? void 0 : querySettings.queryMode}`;
                 }
                 try {
-                    const response = await window.api.getExplainQuery(query, database, action, syntax);
+                    const response = await window.api.sendQuery({
+                        query,
+                        database,
+                        action,
+                        syntax,
+                        stats: querySettings === null || querySettings === void 0 ? void 0 : querySettings.statisticsMode,
+                        tracingLevel: (querySettings === null || querySettings === void 0 ? void 0 : querySettings.tracingLevel) && enableTracingLevel
+                            ? TracingLevelNumber[querySettings === null || querySettings === void 0 ? void 0 : querySettings.tracingLevel]
+                            : undefined,
+                        transaction_mode: querySettings === null || querySettings === void 0 ? void 0 : querySettings.isolationLevel,
+                        timeout: isNumeric(querySettings === null || querySettings === void 0 ? void 0 : querySettings.timeout)
+                            ? Number(querySettings === null || querySettings === void 0 ? void 0 : querySettings.timeout) * 1000
+                            : undefined,
+                    });
                     if (isQueryErrorResponse(response)) {
                         return { error: response };
                     }

package/dist/store/reducers/explainQuery/types.d.ts

@@ -1,5 +1,5 @@
 import type { ExplainPlanNodeData, GraphNode, Link } from '@gravity-ui/paranoid';
-import type { PlanTable, QueryPlan, ScriptPlan } from '../../../types/api/query';
+import type { PlanTable, QueryPlan, ScriptPlan, SimlifiedPlanOperatorOtherParams } from '../../../types/api/query';
 export interface PreparedExplainResponse {
     plan?: {
         links?: Link[];
@@ -8,5 +8,17 @@ export interface PreparedExplainResponse {
         version?: string;
         pristine?: QueryPlan | ScriptPlan;
     };
+    simplifiedPlan?: SimplifiedPlanItem[];
     ast?: string;
 }
+export interface SimplifiedPlanItem {
+    parentId?: string;
+    name: string;
+    operationParams: SimlifiedPlanOperatorOtherParams;
+    aCpu?: number;
+    aRows?: number;
+    eCost?: string;
+    eRows?: string;
+    eSize?: string;
+    children?: SimplifiedPlanItem[];
+}

package/dist/store/reducers/explainQuery/utils.js

@@ -1,4 +1,4 @@
-import { preparePlan } from '../../../utils/prepareQueryExplain';
+import { preparePlan, prepareSimplifiedPlan } from '../../../utils/prepareQueryExplain';
 import { parseQueryAPIExplainResponse, parseQueryExplainPlan } from '../../../utils/query';
 export const explainVersions = {
     v2: '0.2',
@@ -9,7 +9,7 @@ export const prepareExplainResponse = (response) => {
     if (!rawPlan) {
         return { ast };
     }
-    const { tables, meta, Plan } = parseQueryExplainPlan(rawPlan);
+    const { tables, meta, Plan, SimplifiedPlan } = parseQueryExplainPlan(rawPlan);
     if (supportedExplainQueryVersions.indexOf(meta.version) === -1) {
         // Do not prepare plan for not supported versions
         return {
@@ -27,6 +27,10 @@ export const prepareExplainResponse = (response) => {
         links = preparedPlan.links;
         nodes = preparedPlan.nodes;
     }
+    let preparedSimplifiedPlan;
+    if (SimplifiedPlan) {
+        preparedSimplifiedPlan = prepareSimplifiedPlan([SimplifiedPlan]);
+    }
     return {
         plan: {
             links,
@@ -35,6 +39,7 @@ export const prepareExplainResponse = (response) => {
             version: meta.version,
             pristine: rawPlan,
         },
+        simplifiedPlan: preparedSimplifiedPlan,
         ast,
     };
 };