refactor: use schema:multi for all query requests (#1399)

Author: astandrik

src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopQueries.tsx

@@ -46,7 +46,7 @@ export function TopQueries({tenantName}: TopQueriesProps) {
     );
 
     const loading = isFetching && currentData === undefined;
-    const {result: data} = currentData || {};
+    const data = currentData?.resultSets?.[0]?.result || [];
 
     const handleRowClick = React.useCallback(
         (row: any) => {

src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopShards.tsx

@@ -32,7 +32,7 @@ export const TopShards = ({tenantName, path}: TopShardsProps) => {
     );
 
     const loading = isFetching && currentData === undefined;
-    const {result: data} = currentData || {};
+    const data = currentData?.resultSets?.[0]?.result || [];
 
     const columns = getTopShardsColumns(tenantName, location);
 

src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopTables.tsx

@@ -32,7 +32,7 @@ export function TopTables({path}: TopTablesProps) {
     );
     const loading = isFetching && currentData === undefined;
 
-    const {result: data} = currentData || {};
+    const data = currentData?.resultSets?.[0]?.result || [];
 
     const formatSize = (value?: number) => {
         const size = getSizeWithSignificantDigits(data?.length ? Number(data[0].Size) : 0, 0);

src/containers/Tenant/Diagnostics/TopQueries/RunningQueriesData.tsx

@@ -21,18 +21,16 @@ interface Props {
 export const RunningQueriesData = ({database}: Props) => {
     const [autoRefreshInterval] = useAutoRefreshInterval();
     const filters = useTypedSelector((state) => state.executeTopQueries);
-    const {
-        currentData: data,
-        isFetching,
-        error,
-    } = topQueriesApi.useGetRunningQueriesQuery(
+    const {currentData, isFetching, error} = topQueriesApi.useGetRunningQueriesQuery(
         {
             database,
             filters,
         },
         {pollingInterval: autoRefreshInterval},
     );
 
+    const data = currentData?.resultSets?.[0].result || [];
+
     return (
         <React.Fragment>
             {error ? <ResponseError error={parseQueryErrorToString(error)} /> : null}
@@ -41,7 +39,7 @@ export const RunningQueriesData = ({database}: Props) => {
                     emptyDataMessage={i18n('no-data')}
                     columnsWidthLSKey={RUNNING_QUERIES_COLUMNS_WIDTH_LS_KEY}
                     columns={RUNNING_QUERIES_COLUMNS}
-                    data={data || []}
+                    data={data}
                     settings={QUERY_TABLE_SETTINGS}
                 />
             </TableWithControlsLayout.Table>

src/containers/Tenant/Diagnostics/TopQueries/TopQueriesData.tsx

@@ -31,7 +31,7 @@ export const TopQueriesData = ({database, onRowClick}: Props) => {
         },
         {pollingInterval: autoRefreshInterval},
     );
-    const {result: data} = currentData || {};
+    const data = currentData?.resultSets?.[0]?.result || [];
 
     const rawColumns = TOP_QUERIES_COLUMNS;
     const columns = rawColumns.map((column) => ({

src/containers/Tenant/Diagnostics/TopShards/TopShards.tsx

@@ -120,7 +120,7 @@ export const TopShards = ({tenantName, path, type}: TopShardsProps) => {
         {pollingInterval: autoRefreshInterval},
     );
     const loading = isFetching && result === undefined;
-    const {result: data} = result ?? {};
+    const data = result?.resultSets?.[0]?.result || [];
 
     const onSort = (newSortOrder?: SortOrder | SortOrder[]) => {
         // omit information about sort order to disable ASC order, only DESC makes sense for top shards

src/containers/Tenant/Query/ExecuteResult/ExecuteResult.tsx

@@ -72,9 +72,8 @@ export function ExecuteResult({
     const {error, isLoading, queryId, data} = result;
 
     const stats: TKqpStatsQuery | undefined = data?.stats;
-    const resultsSetsCount = data?.resultSets?.length;
-    const isMulti = resultsSetsCount && resultsSetsCount > 0;
-    const currentResult = isMulti ? data?.resultSets?.[selectedResultSet] : data;
+    const resultsSetsCount = data?.resultSets?.length || 0;
+    const currentResult = data?.resultSets?.[selectedResultSet];
     const {plan, simplifiedPlan} = React.useMemo(() => getPlan(data), [data]);
 
     const resultOptions: ControlGroupOption<SectionID>[] = [
@@ -106,7 +105,7 @@ export function ExecuteResult({
     const renderResult = () => {
         return (
             <div className={b('result-wrapper')}>
-                {isMulti && resultsSetsCount > 1 && (
+                {resultsSetsCount > 1 && (
                     <div>
                         <Tabs
                             className={b('result-tabs')}

src/containers/Tenant/Query/Preview/Preview.tsx

@@ -30,7 +30,7 @@ export const Preview = ({database, path, type}: PreviewProps) => {
 
     const [autoRefreshInterval] = useAutoRefreshInterval();
 
-    const query = `--!syntax_v1\nselect * from \`${path}\` limit 32`;
+    const query = `select * from \`${path}\` limit 32`;
     const {currentData, isFetching, error} = previewApi.useSendQueryQuery(
         {database, query, action: isExternalTableType(type) ? 'execute-query' : 'execute-scan'},
         {
@@ -40,7 +40,7 @@ export const Preview = ({database, path, type}: PreviewProps) => {
         },
     );
     const loading = isFetching && currentData === undefined;
-    const data = currentData ?? {};
+    const data = currentData?.resultSets?.[0] ?? {};
 
     const handleClosePreview = () => {
         dispatch(setShowPreview(false));

src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx

@@ -30,7 +30,6 @@ import {
     DEFAULT_IS_QUERY_RESULT_COLLAPSED,
     DEFAULT_SIZE_RESULT_PANE_KEY,
     LAST_USED_QUERY_ACTION_KEY,
-    QUERY_USE_MULTI_SCHEMA_KEY,
 } from '../../../../utils/constants';
 import {useEventHandler, useQueryExecutionSettings, useSetting} from '../../../../utils/hooks';
 import {useChangedQuerySettings} from '../../../../utils/hooks/useChangedQuerySettings';
@@ -105,7 +104,6 @@ function QueryEditor(props: QueryEditorProps) {
         useLastQueryExecutionSettings();
     const {resetBanner} = useChangedQuerySettings();
 
-    const [useMultiSchema] = useSetting(QUERY_USE_MULTI_SCHEMA_KEY);
     const [lastUsedQueryAction, setLastUsedQueryAction] = useSetting<QueryAction>(
         LAST_USED_QUERY_ACTION_KEY,
     );
@@ -148,8 +146,6 @@ function QueryEditor(props: QueryEditorProps) {
     const handleSendExecuteClick = useEventHandler((text?: string) => {
         const {input, history} = executeQuery;
 
-        const schema = useMultiSchema ? 'multi' : 'modern';
-
         const query = text ?? input;
 
         setLastUsedQueryAction(QUERY_ACTIONS.execute);
@@ -163,7 +159,6 @@ function QueryEditor(props: QueryEditorProps) {
             query,
             database: tenantName,
             querySettings,
-            schema,
             enableTracingLevel,
             queryId,
         });

src/containers/UserSettings/i18n/en.json

@@ -35,9 +35,6 @@
 
   "settings.showDomainDatabase.title": "Show domain database",
 
-  "settings.queryUseMultiSchema.title": "Allow queries with multiple result sets",
-  "settings.queryUseMultiSchema.description": "Use 'multi' schema for queries. It enables queries with multiple result sets. It returns nothing on versions 23-3 and older",
-
   "settings.useClusterBalancerAsBackend.title": "Use cluster balancer as backend",
   "settings.useClusterBalancerAsBackend.description": "By default random cluster node is used as backend. It causes saved links to become invalid after some time, when node is restarted. Using balancer as backend fixes it",