Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.11] Make checkpoint mandatory, add watermark delay, minor UI fixes #175

Merged
merged 1 commit into from
Oct 24, 2023
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
1 change: 1 addition & 0 deletions common/constants/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ export const ACCELERATION_INDEX_NAME_INFO = `All OpenSearch acceleration indices
- All user given index names must be in lowercase letters. Index name cannot begin with underscores. Spaces, commas, and characters -, :, ", *, +, /, \, |, ?, #, >, or < are not allowed.
`;

export const TIMESTAMP_DATATYPE = 'timestamp';
export const FETCH_OPENSEARCH_INDICES_PATH = '/api/sql_console/sqlquery';
export const POLL_INTERVAL_MS = 2000;
export const ASYNC_QUERY_ENDPOINT = '/api/spark_sql_console';
Expand Down
20 changes: 17 additions & 3 deletions common/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ export interface RefreshIntervalType {
refreshInterval: string;
}

export interface watermarkDelayType {
delayWindow: number;
delayInterval: string;
}

export type AccelerationIndexType = 'skipping' | 'covering' | 'materialized';

export interface GroupByTumbleType {
Expand All @@ -57,6 +62,7 @@ export interface FormErrorsType {
replicaShardsError: string[];
refreshIntervalError: string[];
checkpointLocationError: string[];
watermarkDelayError: string[];
}

export type AccelerationRefreshType = 'auto' | 'interval' | 'manual';
Expand All @@ -75,22 +81,30 @@ export interface CreateAccelerationForm {
replicaShardsCount: number;
refreshType: AccelerationRefreshType;
checkpointLocation: string | undefined;
watermarkDelay: watermarkDelayType;
refreshIntervalOptions: RefreshIntervalType;
formErrors: FormErrorsType;
}

export type AsyncQueryLoadingStatus = 'SUCCESS' | 'FAILED' | 'RUNNING' | 'SCHEDULED' | 'CANCELLED';
export type TreeItemType = 'covering_index' | 'skipping_index' | 'table' | 'database' | 'materialized_view' | 'Load Materialized View' | 'badge'
export type TreeItemType =
| 'covering_index'
| 'skipping_index'
| 'table'
| 'database'
| 'materialized_view'
| 'Load Materialized View'
| 'badge';

export interface TreeItem {
name: string;
type: TreeItemType;
isExpanded: boolean;
values?: TreeItem[];
isLoading?: boolean
isLoading?: boolean;
}

export interface isLoading {
export interface DatasourceTreeLoading {
flag: boolean;
status: string;
}
2 changes: 1 addition & 1 deletion common/utils/async_query_helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const pollQueryStatus = (id: string, http: CoreStart['http'], callback) =
status === 'scheduled' ||
status === 'waiting'
) {
callback({status: status})
callback({ status: status });
setTimeout(() => pollQueryStatus(id, http, callback), POLL_INTERVAL_MS);
} else if (status === 'failed') {
callback({ status: 'FAILED', results: [] });
Expand Down
28 changes: 14 additions & 14 deletions public/components/Main/__snapshots__/main.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ exports[`<Main /> spec click clear button 1`] = `
>
<a
class="euiButton euiButton--primary"
href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
href="https://opensearch.org/docs/latest/search-plugins/sql/sql/index/"
rel="noopener noreferrer"
target="_blank"
>
Expand Down Expand Up @@ -193,7 +193,7 @@ exports[`<Main /> spec click clear button 1`] = `
>
<div
class="euiPageSideBar"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto;"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto; overflow-x: hidden;"
>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
Expand Down Expand Up @@ -712,7 +712,7 @@ exports[`<Main /> spec click run button, and response causes an error 1`] = `
>
<a
class="euiButton euiButton--primary"
href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
href="https://opensearch.org/docs/latest/search-plugins/sql/sql/index/"
rel="noopener noreferrer"
target="_blank"
>
Expand Down Expand Up @@ -750,7 +750,7 @@ exports[`<Main /> spec click run button, and response causes an error 1`] = `
>
<div
class="euiPageSideBar"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto;"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto; overflow-x: hidden;"
>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
Expand Down Expand Up @@ -1269,7 +1269,7 @@ exports[`<Main /> spec click run button, and response is not ok 1`] = `
>
<a
class="euiButton euiButton--primary"
href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
href="https://opensearch.org/docs/latest/search-plugins/sql/sql/index/"
rel="noopener noreferrer"
target="_blank"
>
Expand Down Expand Up @@ -1307,7 +1307,7 @@ exports[`<Main /> spec click run button, and response is not ok 1`] = `
>
<div
class="euiPageSideBar"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto;"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto; overflow-x: hidden;"
>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
Expand Down Expand Up @@ -1826,7 +1826,7 @@ exports[`<Main /> spec click run button, and response is ok 1`] = `
>
<a
class="euiButton euiButton--primary"
href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
href="https://opensearch.org/docs/latest/search-plugins/sql/sql/index/"
rel="noopener noreferrer"
target="_blank"
>
Expand Down Expand Up @@ -1864,7 +1864,7 @@ exports[`<Main /> spec click run button, and response is ok 1`] = `
>
<div
class="euiPageSideBar"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto;"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto; overflow-x: hidden;"
>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
Expand Down Expand Up @@ -2467,7 +2467,7 @@ exports[`<Main /> spec click run button, response fills null and missing values
>
<a
class="euiButton euiButton--primary"
href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
href="https://opensearch.org/docs/latest/search-plugins/sql/sql/index/"
rel="noopener noreferrer"
target="_blank"
>
Expand Down Expand Up @@ -2505,7 +2505,7 @@ exports[`<Main /> spec click run button, response fills null and missing values
>
<div
class="euiPageSideBar"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto;"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto; overflow-x: hidden;"
>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
Expand Down Expand Up @@ -3107,7 +3107,7 @@ exports[`<Main /> spec click translation button, and response is ok 1`] = `
>
<a
class="euiButton euiButton--primary"
href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
href="https://opensearch.org/docs/latest/search-plugins/sql/sql/index/"
rel="noopener noreferrer"
target="_blank"
>
Expand Down Expand Up @@ -3145,7 +3145,7 @@ exports[`<Main /> spec click translation button, and response is ok 1`] = `
>
<div
class="euiPageSideBar"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto;"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto; overflow-x: hidden;"
>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
Expand Down Expand Up @@ -3659,7 +3659,7 @@ exports[`<Main /> spec renders the component 1`] = `
>
<a
class="euiButton euiButton--primary"
href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
href="https://opensearch.org/docs/latest/search-plugins/sql/sql/index/"
rel="noopener noreferrer"
target="_blank"
>
Expand Down Expand Up @@ -3693,7 +3693,7 @@ exports[`<Main /> spec renders the component 1`] = `
>
<div
class="euiPageSideBar"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto;"
style="max-width: 400px; width: 400px; max-height: 1200px; overflow-y: auto; overflow-x: hidden;"
>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
Expand Down
24 changes: 16 additions & 8 deletions public/components/Main/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ export class Main extends React.Component<MainProps, MainState> {
refreshTree: !this.state.refreshTree,
});
};

setIsAccelerationFlyoutOpened = (value: boolean) => {
this.setState({
isAccelerationFlyoutOpened: value,
Expand Down Expand Up @@ -863,7 +863,7 @@ export class Main extends React.Component<MainProps, MainState> {
setIsAccelerationFlyoutOpened={this.setIsAccelerationFlyoutOpened}
/>
);
link = 'https://opensearch.org/docs/latest/search-plugins/sql/index/';
link = 'https://opensearch.org/docs/latest/search-plugins/sql/sql/index/';
linkTitle = 'SQL documentation';
} else {
page = (
Expand All @@ -881,7 +881,7 @@ export class Main extends React.Component<MainProps, MainState> {
asyncLoading={this.state.asyncLoading}
/>
);
link = 'https://opensearch.org/docs/latest/observability-plugin/ppl/index/';
link = 'https://opensearch.org/docs/latest/search-plugins/sql/ppl/index/';
linkTitle = 'PPL documentation';
}

Expand Down Expand Up @@ -957,18 +957,26 @@ export class Main extends React.Component<MainProps, MainState> {
</EuiFlexGroup>
<EuiPage paddingSize="none">
{this.state.language === 'SQL' && (
<EuiPanel grow ={true}>
<EuiPageSideBar style={{ maxWidth: '400px', width: '400px', maxHeight: '1200px' ,overflowY:'auto'}}>
<EuiPanel grow={true}>
<EuiPageSideBar
style={{
maxWidth: '400px',
width: '400px',
maxHeight: '1200px',
overflowY: 'auto',
overflowX: 'hidden',
}}
>
<EuiFlexGroup direction="column">
<EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFlexGroup direction="row" gutterSize="s">
<EuiFlexItem grow={false}>
<EuiFlexItem grow={false}>
<EuiButtonIcon
display="base"
iconType="refresh"
size='m'
aria-label='refresh'
size="m"
aria-label="refresh"
onClick={this.handleReloadTree}
/>
</EuiFlexItem>
Expand Down
6 changes: 4 additions & 2 deletions public/components/SQLPage/DataSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,10 @@ export const DataSelect = ({ http, onSelect, urlDataSource, asyncLoading }: Cust
}, []);

const handleSelectionChange = (selectedItems: any[]) => {
setSelectedOptions(selectedItems);
onSelect(selectedItems);
if (selectedItems.length > 0) {
setSelectedOptions(selectedItems);
onSelect(selectedItems);
}
};

return (
Expand Down
Loading
Loading