Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@gravity-ui/paranoid": "^2.0.1",
"@gravity-ui/react-data-table": "^2.1.1",
"@gravity-ui/uikit": "^6.15.0",
"@gravity-ui/websql-autocomplete": "^8.1.0",
"@gravity-ui/websql-autocomplete": "^9.0.0",
"@reduxjs/toolkit": "^2.2.3",
"axios": "^1.6.8",
"colord": "^2.9.3",
Expand Down
36 changes: 36 additions & 0 deletions src/utils/monaco/yql/constants.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import type {YQLEntity} from '@gravity-ui/websql-autocomplete';

export const LANGUAGE_YQL_ID = 'yql';

export const SimpleTypes = [
Expand Down Expand Up @@ -714,3 +716,37 @@ export const WindowFunctions = [
export const TableFunction = [];

export const Pragmas = ['TablePathPrefix', 'Warning'];

export const EntitySettings: Record<YQLEntity, string[]> = {
table: [
'AUTO_PARTITIONING_BY_SIZE',
'AUTO_PARTITIONING_PARTITION_SIZE_MB',
'AUTO_PARTITIONING_BY_LOAD',
'AUTO_PARTITIONING_MIN_PARTITIONS_COUNT',
'AUTO_PARTITIONING_MAX_PARTITIONS_COUNT',
'UNIFORM_PARTITIONS',
'READ_REPLICAS_SETTINGS',
'TTL',
'KEY_BLOOM_FILTER',
'STORE',
],
view: ['security_invoker'],
topic: [
'min_active_partitions',
'partition_count_limit',
'retention_period',
'retention_storage_mb',
'partition_write_speed_bytes_per_second',
'partition_write_burst_bytes',
'metering_mode',
],
object: [],
user: [],
group: [],
externalDataSource: [],
externalTable: [],
tableStore: [],
replication: ['ENDPOINT', 'DATABASE', 'USER', 'PASSWORD'],
tableIndex: [],
topicConsumer: ['important', 'read_from'],
};
41 changes: 31 additions & 10 deletions src/utils/monaco/yql/generateSuggestions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import type {AutocompleteEntityType, TAutocompleteEntity} from '../../../types/a

import {
AggregateFunctions,
EntitySettings,
Pragmas,
SimpleFunctions,
SimpleTypes,
Expand Down Expand Up @@ -55,13 +56,13 @@ const re = /[\s'"-/@]/;

const suggestionEntityToAutocomplete: Partial<Record<YQLEntity, AutocompleteEntityType[]>> = {
externalDataSource: ['external_data_source'],
externalTable: ['external_table'],
replication: ['replication'],
table: ['table'],
table: ['table', 'column_table'],
tableStore: ['column_store'],
topic: ['pers_queue_group'],
view: ['view'],
//TODO: add after websql-autocomplete support indexex
// index: ['table_index', 'index'],
tableIndex: ['table_index', 'index'],
};

const commonSuggestionEntities: AutocompleteEntityType[] = ['dir', 'unknown'];
Expand Down Expand Up @@ -124,13 +125,16 @@ const SuggestionsWeight: Record<SuggestionType, number> = {
suggestEntity: 2,
suggestColumns: 3,
suggestColumnAliases: 4,
suggestKeywords: 5,
suggestAggregateFunctions: 6,
suggestTableFunctions: 7,
suggestWindowFunctions: 8,
suggestFunctions: 9,
suggestUdfs: 10,
suggestSimpleTypes: 11,
suggestTableIndexes: 5,
suggestTableHints: 6,
suggestEntitySettings: 7,
suggestSimpleTypes: 8,
suggestKeywords: 9,
suggestAggregateFunctions: 10,
suggestTableFunctions: 11,
suggestWindowFunctions: 12,
suggestFunctions: 13,
suggestUdfs: 14,
};

function getSuggestionIndex(suggestionType: SuggestionType) {
Expand All @@ -152,6 +156,9 @@ async function getAggregateFunctions() {
async function getPragmas() {
return Pragmas;
}
async function getEntitySettings(entityType: YQLEntity) {
return EntitySettings[entityType];
}
async function getUdfs() {
return Udfs;
}
Expand Down Expand Up @@ -406,6 +413,20 @@ export async function generatePragmasSuggestion(
sortText: suggestionIndexToWeight(getSuggestionIndex('suggestPragmas')),
}));
}
export async function generateEntitySettingsSuggestion(
rangeToInsertSuggestion: monaco.IRange,
entityType: YQLEntity,
): Promise<monaco.languages.CompletionItem[]> {
const entitySettings = await getEntitySettings(entityType);
return entitySettings.map((el) => ({
label: el,
insertText: el,
kind: CompletionItemKind.Property,
detail: 'Setting',
range: rangeToInsertSuggestion,
sortText: suggestionIndexToWeight(getSuggestionIndex('suggestEntitySettings')),
}));
}

const alphabet = 'abcdefghijklmnopqrstuvwxyz';

Expand Down
9 changes: 9 additions & 0 deletions src/utils/monaco/yql/yqlSuggestions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
generateColumnAliasesSuggestion,
generateColumnsSuggestion,
generateEntitiesSuggestion,
generateEntitySettingsSuggestion,
generateKeywordsSuggestion,
generatePragmasSuggestion,
generateSimpleFunctionsSuggestion,
Expand Down Expand Up @@ -69,6 +70,7 @@ async function getSuggestions(
let udfsSuggestions: Monaco.languages.CompletionItem[] = [];
let simpleTypesSuggestions: Monaco.languages.CompletionItem[] = [];
let pragmasSuggestions: Monaco.languages.CompletionItem[] = [];
let entitySettingsSuggestions: Monaco.languages.CompletionItem[] = [];

if (parseResult.suggestEntity) {
const entityNamePrefix = getEntityNameAtCursor(model, cursorPosition);
Expand Down Expand Up @@ -103,6 +105,12 @@ async function getSuggestions(
if (parseResult.suggestPragmas) {
pragmasSuggestions = await generatePragmasSuggestion(rangeToInsertSuggestion);
}
if (parseResult.suggestEntitySettings) {
entitySettingsSuggestions = await generateEntitySettingsSuggestion(
rangeToInsertSuggestion,
parseResult.suggestEntitySettings,
);
}

const columnAliasSuggestion = await generateColumnAliasesSuggestion(
rangeToInsertSuggestion,
Expand Down Expand Up @@ -132,6 +140,7 @@ async function getSuggestions(
...columnsSuggestions,
...keywordsSuggestions,
...aggregateFunctionsSuggestions,
...entitySettingsSuggestions,
];

return suggestions;
Expand Down