Added Lck-File that is correctly deleted on JVM-Exit. #173
Conversation
|
I think adding the |
|
Ok, I've added some logic for automatic cleanup. The cleanup is made on exit of the Java-VM, so it has no impact of the startup-time. |
| @Override | ||
| public void run() | ||
| { | ||
| System.gc(); |
There was a problem hiding this comment.
Why do you need to call System.gc here?
There was a problem hiding this comment.
Sorry, this was from an earlier test.
|
Btw does it actually solve your problem? JVM has no guarantee to call the cleanup shutdown hook. |
|
My initial thought had been to automatically cleanup on startup. Not sure what is best but there have been several reports of massive disk usage because the libs are not properly deleted. |
|
@gitblit Agreed. The cleanup phase should be on startup, rather than relying on shutdown hook. |
…alization before extracting the nativ library
|
Now, it's called on startup, before extracting the native library. |
|
@DaKaLKa ok. Thanks. First, could you fix the indentation or remove unnecessary blank lines? |
| loadSQLiteNativeLibrary(); | ||
| return extracted; | ||
| // only cleanup before first extract | ||
| if(!extracted) { |
|
|
||
|
|
||
| /** | ||
| * Deleted old nativ libraries e.g. on Windows this are not removed on VM-Exit (bug #80) |
| * Deleted old nativ libraries e.g. on Windows this are not removed on VM-Exit (bug #80) | ||
| */ | ||
| static void cleanup(){ | ||
|
|
| */ | ||
| static void cleanup(){ | ||
|
|
||
| final String ver = org.sqlite.SQLiteJDBCLoader.getVersion(); |
There was a problem hiding this comment.
unnecessary final and remove org.sqlite.SQLiteJDBCLoder
| static void cleanup(){ | ||
|
|
||
| final String ver = org.sqlite.SQLiteJDBCLoader.getVersion(); | ||
| String tempFolder = new java.io.File(System.getProperty("java.io.tmpdir")).getAbsolutePath(); |
| java.io.File [] files = dir.listFiles(new java.io.FilenameFilter() { | ||
| @Override | ||
| public boolean accept(java.io.File dir, String name) { | ||
| return name.startsWith("sqlite-" + ver); |
There was a problem hiding this comment.
Use private variable e.g., private final String prefix ="sqlite-" + ver to minimize String generation cost.
| } | ||
| }); | ||
|
|
||
| for (java.io.File tempFile : files) { |
There was a problem hiding this comment.
listFiles can return null so this might throw NullPointerException
| tempFile.delete(); | ||
| } | ||
| catch(SecurityException ex){ | ||
|
|
There was a problem hiding this comment.
Swallowing exception is a bad habit. At least we should show the error message here.
|
Hi xerial, I modified the code with your review wishes. |
|
Thanks. Currently we are not enforcing any specific format. But it will worth a try so that you can find the expected coding style. I'll check the code later. |
|
Merged to master. Thanks |
I'm using sqlite-jdbc with windows and I have a big problem with #80.
As this is a bug in JVM (not able to delete On Exit dlls that were loaded) I added another file beside the extracted dll with the same name and the suffix ".lck".
The file is correctly deleted on JVM exit. So now I can very easy create a cleanup method looking for all sqlite dll with missing lck-file and delete them in custom code.
Other ways (like looking if file is locked) was not always solving the problem (with multiple JVM-processes (e.g. 20)).
(Maybe a cleanup method should also be added)
Maybe this would be useful for other people.
What do you think.