-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* #16397 ability to disable metadata objects comment reading for performance increasing added * #16397 change setting description * #16397 move connection setting to the separate connection page; remove constraints comments reading Co-authored-by: Serge Rider <serge@jkiss.org>
- Loading branch information
1 parent
a687624
commit 5463637
Showing
17 changed files
with
297 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,4 +3,5 @@ output.. = target/classes/ | |
| bin.includes = .,\ | ||
| META-INF/,\ | ||
| OSGI-INF/,\ | ||
| icons/,\ | ||
| plugin.xml | ||
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
...eaver.ext.vertica.ui/src/org/jkiss/dbeaver/ext/vertica/ui/internal/VerticaUIMessages.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * DBeaver - Universal Database Manager | ||
| * Copyright (C) 2010-2023 DBeaver Corp and others | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.jkiss.dbeaver.ext.vertica.ui.internal; | ||
|
|
||
| import org.eclipse.osgi.util.NLS; | ||
|
|
||
| public class VerticaUIMessages extends NLS { | ||
|
|
||
| static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.vertica.ui.internal.VerticaUIMessages"; //$NON-NLS-1$ | ||
|
|
||
| static { | ||
| // initialize resource bundle | ||
| NLS.initializeMessages(BUNDLE_NAME, VerticaUIMessages.class); | ||
| } | ||
|
|
||
| private VerticaUIMessages() { | ||
| // prevents construction | ||
| } | ||
|
|
||
| public static String connection_page_group_performance; | ||
| public static String connection_page_group_checkbox_disable_comments; | ||
| public static String connection_page_group_checkbox_disable_comments_tip; | ||
| } |
3 changes: 3 additions & 0 deletions
3
...ext.vertica.ui/src/org/jkiss/dbeaver/ext/vertica/ui/internal/VerticaUIMessages.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| connection_page_group_performance = Performance | ||
| connection_page_group_checkbox_disable_comments = Disable objects comments reading | ||
| connection_page_group_checkbox_disable_comments_tip = Disable objects (tables/sequences/projections, etc.) comments reading.\nReading this type of information can dramatically reduce data loading speed. |
3 changes: 3 additions & 0 deletions
3
....vertica.ui/src/org/jkiss/dbeaver/ext/vertica/ui/internal/VerticaUIMessages_ru.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| connection_page_group_performance = \u041F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C | ||
| connection_page_group_checkbox_disable_comments = \u041E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0447\u0442\u0435\u043D\u0438\u0435 \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0435\u0432 \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 | ||
| connection_page_group_checkbox_disable_comments_tip = \u041E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0447\u0442\u0435\u043D\u0438\u0435 \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0435\u0432 \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 (\u0442\u0430\u0431\u043B\u0438\u0446/\u043F\u043E\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0435\u0439/\u043F\u0440\u043E\u0435\u043A\u0446\u0438\u0439, etc.).\n\u0427\u0442\u0435\u043D\u0438\u0435 \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0435\u0432 \u0438\u0437 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u044B\u0445 \u0442\u0430\u0431\u043B\u0438\u0446 \u043C\u043E\u0436\u0435\u0442 \u0437\u043D\u0430\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u0441\u043D\u0438\u0437\u0438\u0442\u044C \u0441\u043A\u043E\u0440\u043E\u0441\u0442\u044C \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 \u0434\u0430\u043D\u043D\u044B\u0445. |
51 changes: 51 additions & 0 deletions
51
...aver.ext.vertica.ui/src/org/jkiss/dbeaver/ext/vertica/ui/views/VerticaConnectionPage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * DBeaver - Universal Database Manager | ||
| * Copyright (C) 2010-2023 DBeaver Corp and others | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.jkiss.dbeaver.ext.vertica.ui.views; | ||
|
|
||
| import org.eclipse.jface.dialogs.IDialogPage; | ||
| import org.eclipse.swt.graphics.Image; | ||
| import org.jkiss.dbeaver.ext.generic.views.GenericConnectionPage; | ||
| import org.jkiss.dbeaver.ui.UIUtils; | ||
| import org.jkiss.dbeaver.ui.dialogs.connection.DriverPropertiesDialogPage; | ||
|
|
||
| public class VerticaConnectionPage extends GenericConnectionPage { | ||
|
|
||
| private final Image logoImage; | ||
|
|
||
| public VerticaConnectionPage() { | ||
| logoImage = createImage("icons/vertica_logo.png"); //$NON-NLS-1$ | ||
| } | ||
|
|
||
| @Override | ||
| public void dispose() { | ||
| super.dispose(); | ||
| UIUtils.dispose(logoImage); | ||
| } | ||
|
|
||
| @Override | ||
| public Image getImage() { | ||
| return logoImage; | ||
| } | ||
|
|
||
| @Override | ||
| public IDialogPage[] getDialogPages(boolean extrasOnly, boolean forceCreate) { | ||
| return new IDialogPage[] { | ||
| new VerticaConnectionPageAdvanced(), | ||
| new DriverPropertiesDialogPage(this) | ||
| }; | ||
| } | ||
| } |
91 changes: 91 additions & 0 deletions
91
....vertica.ui/src/org/jkiss/dbeaver/ext/vertica/ui/views/VerticaConnectionPageAdvanced.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * DBeaver - Universal Database Manager | ||
| * Copyright (C) 2010-2023 DBeaver Corp and others | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.jkiss.dbeaver.ext.vertica.ui.views; | ||
|
|
||
| import org.eclipse.swt.SWT; | ||
| import org.eclipse.swt.layout.GridData; | ||
| import org.eclipse.swt.layout.GridLayout; | ||
| import org.eclipse.swt.widgets.Button; | ||
| import org.eclipse.swt.widgets.Composite; | ||
| import org.eclipse.swt.widgets.Group; | ||
| import org.jkiss.dbeaver.ext.vertica.VerticaConstants; | ||
| import org.jkiss.dbeaver.ext.vertica.ui.internal.VerticaUIMessages; | ||
| import org.jkiss.dbeaver.model.DBPDataSourceContainer; | ||
| import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration; | ||
| import org.jkiss.dbeaver.ui.UIUtils; | ||
| import org.jkiss.dbeaver.ui.dialogs.connection.ConnectionPageAbstract; | ||
| import org.jkiss.utils.CommonUtils; | ||
|
|
||
| public class VerticaConnectionPageAdvanced extends ConnectionPageAbstract { | ||
|
|
||
| private Button disableCommentsReading; | ||
|
|
||
| public VerticaConnectionPageAdvanced() { | ||
| setTitle("Vertica"); | ||
| } | ||
|
|
||
| @Override | ||
| public void createControl(Composite parent) { | ||
| Composite group = new Composite(parent, SWT.NONE); | ||
| group.setLayout(new GridLayout(1, false)); | ||
| group.setLayoutData(new GridData(GridData.FILL_BOTH)); | ||
|
|
||
| { | ||
| Group advancedSettings = new Group(group, SWT.NONE); | ||
| advancedSettings.setText(VerticaUIMessages.connection_page_group_performance); | ||
| GridData gridData = new GridData(GridData.FILL_HORIZONTAL); | ||
| gridData.horizontalSpan = 4; | ||
| advancedSettings.setLayoutData(gridData); | ||
| advancedSettings.setLayout(new GridLayout(1, false)); | ||
|
|
||
| disableCommentsReading = UIUtils.createCheckbox( | ||
| advancedSettings, | ||
| VerticaUIMessages.connection_page_group_checkbox_disable_comments, | ||
| VerticaUIMessages.connection_page_group_checkbox_disable_comments_tip, | ||
| false, | ||
| 1); | ||
| } | ||
|
|
||
| setControl(group); | ||
| loadSettings(); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void loadSettings() { | ||
| DBPConnectionConfiguration connectionInfo = site.getActiveDataSource().getConnectionConfiguration(); | ||
| disableCommentsReading.setSelection(CommonUtils.toBoolean( | ||
| connectionInfo.getProviderProperty(VerticaConstants.PROP_DISABLE_COMMENTS_READING))); | ||
| super.loadSettings(); | ||
| } | ||
|
|
||
| @Override | ||
| public void saveSettings(DBPDataSourceContainer dataSource) { | ||
| DBPConnectionConfiguration connectionInfo = dataSource.getConnectionConfiguration(); | ||
| if (disableCommentsReading != null) { | ||
| connectionInfo.setProviderProperty( | ||
| VerticaConstants.PROP_DISABLE_COMMENTS_READING, | ||
| String.valueOf(disableCommentsReading.getSelection())); | ||
| } | ||
| super.saveSettings(dataSource); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isComplete() { | ||
| return true; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...aver.ext.vertica/src/org/jkiss/dbeaver/ext/vertica/internal/VerticaMessages_ru.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| vertica_password_will_expire_warn_name = \u041F\u0430\u0440\u043E\u043B\u044C \u0441\u043A\u043E\u0440\u043E \u0438\u0441\u0442\u0435\u0447\u0451\u0442 | ||
| vertica_password_will_expire_warn_description = \u0414\u0435\u0442\u0430\u043B\u0438: {0}\n\n\u0427\u0442\u043E\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0442\u0435\u043A\u0443\u0449\u0438\u0439 \u043F\u0430\u0440\u043E\u043B\u044C, \u043E\u0442\u043A\u0440\u043E\u0439\u0442\u0435 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u043D\u043E\u0435 \u043C\u0435\u043D\u044E \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043A \u0432\u0430\u0448\u0435\u0439 \u0431\u0430\u0437\u044B \u0432 \u0434\u0435\u0440\u0435\u0432\u0435 \u043D\u0430\u0432\u0438\u0433\u0430\u0442\u043E\u0440\u0430, \u0432\u044B\u0431\u0435\u0440\u0438\u0442\u0435 "\u0411\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u044C" -> "\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u0430\u0440\u043E\u043B\u044C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F".\n\u0415\u0441\u043B\u0438 \u0432\u044B \u043D\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u043F\u043E\u043C\u0435\u043D\u044F\u0442\u044C \u043F\u0430\u0440\u043E\u043B\u044C, \u0442\u043E \u043E\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044C \u043A \u0432\u0430\u0448\u0435\u043C\u0443 DBA. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.