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

Altibase: add tasks for Table, View, MView, Procedure, Function, Package #34213

Merged
merged 17 commits into from
Jul 9, 2024

Conversation

zennken
Copy link
Contributor

@zennken zennken commented May 31, 2024

Hello,

I am happy to ask a pull-request for #34040

  1. Truncate table
  2. Refresh materialized view
  3. Compile view, procedure, function, package
  4. Show status of view, mview, procedure, function, package

New code was checked with Check Style to ensure compliance.

Thanks,

@E1izabeth
Copy link
Member

This PR has unresolved comments and conflict with devel branch. Waiting for solving it.

@zennken
Copy link
Contributor Author

zennken commented Jun 13, 2024

This PR has unresolved comments and conflict with devel branch. Waiting for solving it.

@E1izabeth,

Thanks for letting me know. I didn't know a review was in progress. I'll handle it.

@zennken
Copy link
Contributor Author

zennken commented Jun 13, 2024

This PR has unresolved comments and conflict with devel branch. Waiting for solving it.

@E1izabeth,

Thanks for letting me know. I didn't know a review was in progress. I'll handle it.

This PR has unresolved comments and conflict with devel branch. Waiting for solving it.

@E1izabeth,

Thanks for letting me know. I didn't know a review was in progress. I'll handle it.

@E1izabeth,

The difference from the devel version of the MANIFEST.MF file is that org.jkiss.dbeaver.tasks.native has been added.

Can I manually overwrite it by clicking the "Resolve conflicts" button? It's strange that new content added is recognized as Conflicts, and since this is my first time experiencing this, I thought it would be better to ask and proceed :)

plugins/org.jkiss.dbeaver.ext.altibase/META-INF/MANIFEST.MF

12c12,13
<     com.google.gson
---
>     com.google.gson,
>     org.jkiss.dbeaver.tasks.native

@ShadelessFox
Copy link
Member

ShadelessFox commented Jun 14, 2024

@zennken resolved the conflict for you. Please ensure the PR compiles without any errors.

@zennken
Copy link
Contributor Author

zennken commented Jun 14, 2024

MANIFEST.MF

@ShadelessFox,

Thanks for your help :) Did you have any other compile problem except the MANIFEST.MF file?

@zennken
Copy link
Contributor Author

zennken commented Jun 14, 2024

MANIFEST.MF

@ShadelessFox,

Thanks for your help :) Did you have any other compile problem except the MANIFEST.MF file?

@zennken resolved the conflict for you. Please ensure the PR compiles without any errors.

@ShadelessFox,

"without any errors" includes merging with the latest devel branch? I'm asking because I really don't know.

I got it. It should be in case of conflict. :)

@zennken
Copy link
Contributor Author

zennken commented Jun 19, 2024

Hello,

I found two conflicts at org.jkiss.dbeaver.ext.altibase, then fixed them. If any issue found, please let me know.

Thanks,

@E1izabeth
Copy link
Member

We passed your PR to our QA team for testing.

@Matvey16
Copy link
Member

Matvey16 commented Jul 1, 2024

There is a problem with compile icon. Error is added to log every time this part of context menu is opened and incorrect icon is shown

image

java.io.FileNotFoundException: /icons/compile.png
	at org.eclipse.osgi.storage.url.bundleentry.Handler.findBundleEntry(Handler.java:55)
	at org.eclipse.osgi.storage.url.BundleResourceHandler.openConnection(BundleResourceHandler.java:186)
	at java.base/java.net.URL.openConnection(Unknown Source)
	at org.eclipse.core.internal.boot.PlatformURLConnection.connect(PlatformURLConnection.java:114)
	at org.eclipse.core.internal.boot.PlatformURLConnection.getURLAsLocal(PlatformURLConnection.java:217)
	at org.eclipse.core.internal.runtime.PlatformURLConverter.toFileURL(PlatformURLConverter.java:37)
	at org.eclipse.core.runtime.FileLocator.toFileURL(FileLocator.java:277)
	at org.eclipse.jface.resource.URLImageDescriptor.getFilePath(URLImageDescriptor.java:271)
	at org.eclipse.jface.resource.URLImageDescriptor$URLImageFileNameProvider.getImagePath(URLImageDescriptor.java:64)
	at org.eclipse.swt.internal.DPIUtil.lambda$3(DPIUtil.java:570)
	at org.eclipse.swt.internal.DPIUtil.getElementAtZoom(DPIUtil.java:579)
	at org.eclipse.swt.internal.DPIUtil.validateAndGetImagePathAtZoom(DPIUtil.java:570)
	at org.eclipse.swt.graphics.Image.<init>(Image.java:684)
	at org.eclipse.jface.resource.URLImageDescriptor.createImage(URLImageDescriptor.java:306)
	at org.eclipse.jface.resource.ImageDescriptor.createImage(ImageDescriptor.java:289)
	at org.jkiss.dbeaver.ui.DBeaverIcons$IconDescriptor.<init>(DBeaverIcons.java:66)
	at org.jkiss.dbeaver.ui.DBeaverIcons.getIconByLocation(DBeaverIcons.java:205)
	at org.jkiss.dbeaver.ui.DBeaverIcons.getIconDescriptor(DBeaverIcons.java:124)
	at org.jkiss.dbeaver.ui.DBeaverIcons.getImageDescriptor(DBeaverIcons.java:108)
	at org.jkiss.dbeaver.tasks.ui.DataSourceToolsContributor.fillToolsMenu(DataSourceToolsContributor.java:180)
	at org.jkiss.dbeaver.tasks.ui.DataSourceToolsContributor.fillContributionItems(DataSourceToolsContributor.java:72)
	at org.jkiss.dbeaver.ui.actions.datasource.DataSourceMenuContributor.getContributionItems(DataSourceMenuContributor.java:34)
	at org.eclipse.ui.actions.CompoundContributionItem.getContributionItemsToFill(CompoundContributionItem.java:83)
	at org.eclipse.ui.actions.CompoundContributionItem.fill(CompoundContributionItem.java:57)
	at org.eclipse.ui.internal.menus.DynamicMenuContributionItem.fill(DynamicMenuContributionItem.java:188)
	at org.eclipse.jface.action.MenuManager.doItemFill(MenuManager.java:728)
	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:805)
	at org.eclipse.jface.action.MenuManager.handleAboutToShow(MenuManager.java:469)
	at org.eclipse.jface.action.MenuManager$2.menuShown(MenuManager.java:494)
	at org.eclipse.swt.widgets.TypedListener.handleEvent(TypedListener.java:272)
	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:91)
	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4285)
	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1160)
	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1184)
	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1165)
	at org.eclipse.swt.widgets.Control.WM_INITMENUPOPUP(Control.java:5121)
	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4741)
	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
	at org.eclipse.swt.widgets.Decorations.windowProc(Decorations.java:1482)
	at org.eclipse.swt.widgets.Shell.windowProc(Shell.java:2319)
	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5050)
	at org.eclipse.swt.internal.win32.OS.TrackPopupMenu(Native Method)
	at org.eclipse.swt.widgets.Menu._setVisible(Menu.java:241)
	at org.eclipse.swt.widgets.Display.runPopups(Display.java:4124)
	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3667)
	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1151)
	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:339)
	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1042)
	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:152)
	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:639)
	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:339)
	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:546)
	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:173)
	at org.jkiss.dbeaver.ui.app.standalone.DBeaverApplication.start(DBeaverApplication.java:292)
	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:208)
	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:143)
	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:109)
	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:439)
	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:271)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
	at java.base/java.lang.reflect.Method.invoke(Unknown Source)
	at org.jkiss.dbeaver.launcher.DBeaverLauncher.invokeFramework(DBeaverLauncher.java:648)
	at org.jkiss.dbeaver.launcher.DBeaverLauncher.basicRun(DBeaverLauncher.java:608)
	at org.jkiss.dbeaver.launcher.DBeaverLauncher.run(DBeaverLauncher.java:1459)

@Matvey16
Copy link
Member

Matvey16 commented Jul 1, 2024

Also. Are you sure about using the same icon as delete for the truncate function? THat can be confusing

image

@zennken
Copy link
Contributor Author

zennken commented Jul 1, 2024

There is a problem with compile icon. Error is added to log every time this part of context menu is opened and incorrect icon is shown

image

java.io.FileNotFoundException: /icons/compile.png
	at org.eclipse.osgi.storage.url.bundleentry.Handler.findBundleEntry(Handler.java:55)
	at org.eclipse.osgi.storage.url.BundleResourceHandler.openConnection(BundleResourceHandler.java:186)
	at java.base/java.net.URL.openConnection(Unknown Source)
	at org.eclipse.core.internal.boot.PlatformURLConnection.connect(PlatformURLConnection.java:114)
	at org.eclipse.core.internal.boot.PlatformURLConnection.getURLAsLocal(PlatformURLConnection.java:217)
	at org.eclipse.core.internal.runtime.PlatformURLConverter.toFileURL(PlatformURLConverter.java:37)
	at org.eclipse.core.runtime.FileLocator.toFileURL(FileLocator.java:277)
	at org.eclipse.jface.resource.URLImageDescriptor.getFilePath(URLImageDescriptor.java:271)
	at org.eclipse.jface.resource.URLImageDescriptor$URLImageFileNameProvider.getImagePath(URLImageDescriptor.java:64)
	at org.eclipse.swt.internal.DPIUtil.lambda$3(DPIUtil.java:570)
	at org.eclipse.swt.internal.DPIUtil.getElementAtZoom(DPIUtil.java:579)
	at org.eclipse.swt.internal.DPIUtil.validateAndGetImagePathAtZoom(DPIUtil.java:570)
	at org.eclipse.swt.graphics.Image.<init>(Image.java:684)
	at org.eclipse.jface.resource.URLImageDescriptor.createImage(URLImageDescriptor.java:306)
	at org.eclipse.jface.resource.ImageDescriptor.createImage(ImageDescriptor.java:289)
	at org.jkiss.dbeaver.ui.DBeaverIcons$IconDescriptor.<init>(DBeaverIcons.java:66)
	at org.jkiss.dbeaver.ui.DBeaverIcons.getIconByLocation(DBeaverIcons.java:205)
	at org.jkiss.dbeaver.ui.DBeaverIcons.getIconDescriptor(DBeaverIcons.java:124)
	at org.jkiss.dbeaver.ui.DBeaverIcons.getImageDescriptor(DBeaverIcons.java:108)
	at org.jkiss.dbeaver.tasks.ui.DataSourceToolsContributor.fillToolsMenu(DataSourceToolsContributor.java:180)
	at org.jkiss.dbeaver.tasks.ui.DataSourceToolsContributor.fillContributionItems(DataSourceToolsContributor.java:72)
	at org.jkiss.dbeaver.ui.actions.datasource.DataSourceMenuContributor.getContributionItems(DataSourceMenuContributor.java:34)
	at org.eclipse.ui.actions.CompoundContributionItem.getContributionItemsToFill(CompoundContributionItem.java:83)
	at org.eclipse.ui.actions.CompoundContributionItem.fill(CompoundContributionItem.java:57)
	at org.eclipse.ui.internal.menus.DynamicMenuContributionItem.fill(DynamicMenuContributionItem.java:188)
	at org.eclipse.jface.action.MenuManager.doItemFill(MenuManager.java:728)
	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:805)
	at org.eclipse.jface.action.MenuManager.handleAboutToShow(MenuManager.java:469)
	at org.eclipse.jface.action.MenuManager$2.menuShown(MenuManager.java:494)
	at org.eclipse.swt.widgets.TypedListener.handleEvent(TypedListener.java:272)
	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:91)
	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4285)
	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1160)
	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1184)
	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1165)
	at org.eclipse.swt.widgets.Control.WM_INITMENUPOPUP(Control.java:5121)
	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4741)
	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
	at org.eclipse.swt.widgets.Decorations.windowProc(Decorations.java:1482)
	at org.eclipse.swt.widgets.Shell.windowProc(Shell.java:2319)
	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5050)
	at org.eclipse.swt.internal.win32.OS.TrackPopupMenu(Native Method)
	at org.eclipse.swt.widgets.Menu._setVisible(Menu.java:241)
	at org.eclipse.swt.widgets.Display.runPopups(Display.java:4124)
	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3667)
	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1151)
	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:339)
	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1042)
	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:152)
	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:639)
	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:339)
	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:546)
	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:173)
	at org.jkiss.dbeaver.ui.app.standalone.DBeaverApplication.start(DBeaverApplication.java:292)
	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:208)
	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:143)
	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:109)
	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:439)
	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:271)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
	at java.base/java.lang.reflect.Method.invoke(Unknown Source)
	at org.jkiss.dbeaver.launcher.DBeaverLauncher.invokeFramework(DBeaverLauncher.java:648)
	at org.jkiss.dbeaver.launcher.DBeaverLauncher.basicRun(DBeaverLauncher.java:608)
	at org.jkiss.dbeaver.launcher.DBeaverLauncher.run(DBeaverLauncher.java:1459)

That's interesting issue because it works well to me.

The callstack says there is no such file like "icons/compile.png". Could you confirm dbeaver/plugins/org.jkiss.dbeaver.ext.altibase.ui/icnos/compile.png file has been checkout as 879 bytes.

If this problem persists, I will change the icon from icons/compile.png to platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/compile.png as recommended by ShadelessFox.

Thanks for your help.

image

@zennken
Copy link
Contributor Author

zennken commented Jul 2, 2024

Also. Are you sure about using the same icon as delete for the truncate function? THat can be confusing

image

Based on your opinion that it was confusing, I changed the icon from delete to clean.

Please leave your comment on this change, if it is still confusing.

Thanks for your comment :)

image

@Matvey16
Copy link
Member

Matvey16 commented Jul 2, 2024

For some reason there is no such file in this package at all

image

@E1izabeth
Copy link
Member

@zennken it's missing, because you haven't added icons folder to build.properties

@zennken
Copy link
Contributor Author

zennken commented Jul 2, 2024

@zennken it's missing, because you haven't added icons folder to build.properties

@E1izabeth, Thanks a lot for your tip :)

I added icon folder at the build.properties file for binary build.

@zennken
Copy link
Contributor Author

zennken commented Jul 2, 2024

For some reason there is no such file in this package at all

image

Hi, @Matvey16

Following E1izabeth's advice, I added the icons folder to the build.properties file. I'm sorry, but I'd like to ask you to check one more time.

Thanks for your help :)

@Matvey16
Copy link
Member

Matvey16 commented Jul 8, 2024

Verified

@serge-rider serge-rider merged commit 3833d3d into dbeaver:devel Jul 9, 2024
1 of 2 checks passed
@zennken zennken deleted the f34040 branch July 19, 2024 00:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Altibase: add tasks for Table, View, MView, Procedure, Function, Package
5 participants