You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2022/03/25 20:15:03 UTC
[GitHub] [netbeans] matthiasblaesing opened a new pull request #3868: SQL History loss: Reimplement atomatic saving by writing to tempfile and moving to target
matthiasblaesing opened a new pull request #3868:
URL: https://github.com/apache/netbeans/pull/3868
It was observed, that sometimes the sql history was lost and it is
assumed, that writing the new history began (emptying the file as the
first step) and was not completed. By using a temporary file, the file
is either written completely or not. It is assumed, that a move
operation inside the same directory is atomic on all OSes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #3868: SQL History loss: Reimplement atomatic saving by writing to tempfile and moving to target
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #3868:
URL: https://github.com/apache/netbeans/pull/3868#discussion_r835746162
##########
File path: ide/db.core/src/org/netbeans/modules/db/sql/history/SQLHistoryManager.java
##########
@@ -205,40 +209,34 @@ void removePropertyChangeListener(PropertyChangeListener listener) {
@Override
public void run() {
try {
- final FileObject targetFile = getHistoryRoot(true);
- targetFile.getFileSystem().
- runAtomicAction(new FileSystem.AtomicAction() {
- @Override
- public void run() throws IOException {
- ;
- try (OutputStream os = targetFile.getOutputStream()) {
- XMLStreamWriter xsw = XMLOutputFactory
- .newInstance()
- .createXMLStreamWriter(os);
-
- xsw.writeStartDocument();
- xsw.writeCharacters(CONTENT_NEWLINE);
- xsw.writeStartElement(TAG_HISTORY);
- xsw.writeCharacters(CONTENT_NEWLINE);
- for(SQLHistoryEntry sqe: sqlHistory) {
- xsw.writeStartElement(TAG_SQL);
- xsw.writeAttribute(ATTR_DATE, sqe.getDateXMLVariant());
- xsw.writeAttribute(ATTR_URL, sqe.getUrl());
- xsw.writeCharacters(sqe.getSql());
- xsw.writeEndElement();
- xsw.writeCharacters(CONTENT_NEWLINE);
- }
- xsw.writeEndElement();
- xsw.flush();
- xsw.close();
- } catch (IOException | XMLStreamException ex) {
- LOGGER.log(Level.INFO, ex.getMessage(), ex);
- } finally {
- PROPERTY_CHANGE_SUPPORT.firePropertyChange(
- PROP_SAVED, null, null);
- }
+ final FileObject targetFileObject = getHistoryRoot(true);
+ final Path targetFile = FileUtil.toFile(targetFileObject).toPath();
+ final Path tempfile = Files.createTempFile(targetFile.getParent(), SQL_HISTORY_BASE, SQL_HISTORY_EXT);
+ try ( OutputStream os = Files.newOutputStream(tempfile)) {
+ XMLStreamWriter xsw = XMLOutputFactory
+ .newInstance()
+ .createXMLStreamWriter(os);
+
+ xsw.writeStartDocument();
+ xsw.writeCharacters(CONTENT_NEWLINE);
+ xsw.writeStartElement(TAG_HISTORY);
+ xsw.writeCharacters(CONTENT_NEWLINE);
+ for (SQLHistoryEntry sqe : sqlHistory) {
+ xsw.writeStartElement(TAG_SQL);
+ xsw.writeAttribute(ATTR_DATE, sqe.getDateXMLVariant());
+ xsw.writeAttribute(ATTR_URL, sqe.getUrl());
+ xsw.writeCharacters(sqe.getSql());
+ xsw.writeEndElement();
+ xsw.writeCharacters(CONTENT_NEWLINE);
}
- });
+ xsw.writeEndElement();
+ xsw.flush();
+ xsw.close();
+ } catch (IOException | XMLStreamException ex) {
+ LOGGER.log(Level.INFO, ex.getMessage(), ex);
Review comment:
Valid point - indeed this catch is invalid and should not be there. I pushed an update (new commit, I intent to squash before merge).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on pull request #3868: SQL History loss: Reimplement atomatic saving by writing to tempfile and moving to target
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on pull request #3868:
URL: https://github.com/apache/netbeans/pull/3868#issuecomment-1079654198
Based on the comments from @mbien and @vieiro I pushed an update. Thank you both.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #3868: SQL History loss: Reimplement atomatic saving by writing to tempfile and moving to target
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #3868:
URL: https://github.com/apache/netbeans/pull/3868#discussion_r835746392
##########
File path: ide/db.core/src/org/netbeans/modules/db/sql/history/SQLHistoryManager.java
##########
@@ -97,7 +101,7 @@ public int getListSize() {
return NbPreferences.forModule(SQLHistoryPanel.class).getInt("OPT_SQL_STATEMENTS_SAVED_FOR_HISTORY", DEFAULT_SQL_STATEMENTS_SAVED_FOR_HISTORY);
}
- protected FileObject getHistoryRoot(boolean create) throws IOException {
+ private FileObject getHistoryRoot(boolean create) throws IOException {
Review comment:
If I remember correctly there is exactly one platform, that does not use "/" as separator, that is windows and I know, that windows also accepts forward slashes. I have some hope that in the future people learn from past mistakes and don't try to reinvent the wheel and either use URIs or at least use these as base.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] vieiro commented on pull request #3868: SQL History loss: Reimplement atomatic saving by writing to tempfile and moving to target
Posted by GitBox <gi...@apache.org>.
vieiro commented on pull request #3868:
URL: https://github.com/apache/netbeans/pull/3868#issuecomment-1079663081
Mmm... there're some test errors you may want to check out, @matthiasblaesing . You may want to recover those `protected` methods.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] vieiro commented on a change in pull request #3868: SQL History loss: Reimplement atomatic saving by writing to tempfile and moving to target
Posted by GitBox <gi...@apache.org>.
vieiro commented on a change in pull request #3868:
URL: https://github.com/apache/netbeans/pull/3868#discussion_r835742869
##########
File path: ide/db.core/src/org/netbeans/modules/db/sql/history/SQLHistoryManager.java
##########
@@ -205,40 +209,34 @@ void removePropertyChangeListener(PropertyChangeListener listener) {
@Override
public void run() {
try {
- final FileObject targetFile = getHistoryRoot(true);
- targetFile.getFileSystem().
- runAtomicAction(new FileSystem.AtomicAction() {
- @Override
- public void run() throws IOException {
- ;
- try (OutputStream os = targetFile.getOutputStream()) {
- XMLStreamWriter xsw = XMLOutputFactory
- .newInstance()
- .createXMLStreamWriter(os);
-
- xsw.writeStartDocument();
- xsw.writeCharacters(CONTENT_NEWLINE);
- xsw.writeStartElement(TAG_HISTORY);
- xsw.writeCharacters(CONTENT_NEWLINE);
- for(SQLHistoryEntry sqe: sqlHistory) {
- xsw.writeStartElement(TAG_SQL);
- xsw.writeAttribute(ATTR_DATE, sqe.getDateXMLVariant());
- xsw.writeAttribute(ATTR_URL, sqe.getUrl());
- xsw.writeCharacters(sqe.getSql());
- xsw.writeEndElement();
- xsw.writeCharacters(CONTENT_NEWLINE);
- }
- xsw.writeEndElement();
- xsw.flush();
- xsw.close();
- } catch (IOException | XMLStreamException ex) {
- LOGGER.log(Level.INFO, ex.getMessage(), ex);
- } finally {
- PROPERTY_CHANGE_SUPPORT.firePropertyChange(
- PROP_SAVED, null, null);
- }
+ final FileObject targetFileObject = getHistoryRoot(true);
+ final Path targetFile = FileUtil.toFile(targetFileObject).toPath();
+ final Path tempfile = Files.createTempFile(targetFile.getParent(), SQL_HISTORY_BASE, SQL_HISTORY_EXT);
+ try ( OutputStream os = Files.newOutputStream(tempfile)) {
+ XMLStreamWriter xsw = XMLOutputFactory
+ .newInstance()
+ .createXMLStreamWriter(os);
+
+ xsw.writeStartDocument();
+ xsw.writeCharacters(CONTENT_NEWLINE);
+ xsw.writeStartElement(TAG_HISTORY);
+ xsw.writeCharacters(CONTENT_NEWLINE);
+ for (SQLHistoryEntry sqe : sqlHistory) {
+ xsw.writeStartElement(TAG_SQL);
+ xsw.writeAttribute(ATTR_DATE, sqe.getDateXMLVariant());
+ xsw.writeAttribute(ATTR_URL, sqe.getUrl());
+ xsw.writeCharacters(sqe.getSql());
+ xsw.writeEndElement();
+ xsw.writeCharacters(CONTENT_NEWLINE);
}
- });
+ xsw.writeEndElement();
+ xsw.flush();
+ xsw.close();
+ } catch (IOException | XMLStreamException ex) {
+ LOGGER.log(Level.INFO, ex.getMessage(), ex);
Review comment:
If we catch an exception here, are we sure we want to invoke `Files.move` (below) immediately after?
Or do we want to add a `return` statement after we log the exception so no files (with potential errors) are `Files.move`d?
##########
File path: ide/db.core/src/org/netbeans/modules/db/sql/history/SQLHistoryManager.java
##########
@@ -97,7 +101,7 @@ public int getListSize() {
return NbPreferences.forModule(SQLHistoryPanel.class).getInt("OPT_SQL_STATEMENTS_SAVED_FOR_HISTORY", DEFAULT_SQL_STATEMENTS_SAVED_FOR_HISTORY);
}
- protected FileObject getHistoryRoot(boolean create) throws IOException {
+ private FileObject getHistoryRoot(boolean create) throws IOException {
Review comment:
`FileUtil.createFolder` [accepts names with forward slashes](https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileUtil.html#createFolder-org.openide.filesystems.FileObject-java.lang.String-) so we're good with that `"Databases/SQLHISTORY"` string.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing merged pull request #3868: SQL History loss: Reimplement atomatic saving by writing to tempfile and moving to target
Posted by GitBox <gi...@apache.org>.
matthiasblaesing merged pull request #3868:
URL: https://github.com/apache/netbeans/pull/3868
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists