andreacavalli
/
CavalliumDBEngine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfixes

This commit is contained in:
Andrea Cavalli 2022-04-11 12:42:01 +02:00
parent a7329925d0
commit 851f73481a
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -181,3 +181,5 @@ fabric.properties
dbengine.iml dbengine.iml
/.idea/ /.idea/
.ci-friendly-pom.xml

13
pom.xml
View File

@ -614,6 +614,19 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>com.outbrain.swinfra</groupId>
<artifactId>ci-friendly-flatten-maven-plugin</artifactId>
<version>1.0.14</version>
<executions>
<execution>
<goals>
<goal>clean</goal>
<goal>flatten</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

17
src/main/java/it/cavallium/dbengine/lucene/DirectNIOFSDirectory.java
View File

@ -4,6 +4,12 @@ import static it.cavallium.dbengine.lucene.LuceneUtils.alignUnsigned;
import static it.cavallium.dbengine.lucene.LuceneUtils.readInternalAligned; import static it.cavallium.dbengine.lucene.LuceneUtils.readInternalAligned;
import com.sun.nio.file.ExtendedOpenOption; import com.sun.nio.file.ExtendedOpenOption;
import java.nio.file.OpenOption;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.LockFactory;
import java.io.Closeable; import java.io.Closeable;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
@ -23,7 +29,8 @@ import org.apache.lucene.util.IOUtils;
@SuppressWarnings({"RedundantArrayCreation", "unused", "unused", "RedundantCast"}) @SuppressWarnings({"RedundantArrayCreation", "unused", "unused", "RedundantCast"})
public class DirectNIOFSDirectory extends FSDirectory { public class DirectNIOFSDirectory extends FSDirectory {
private final OpenOption[] openOptions = {StandardOpenOption.READ, ExtendedOpenOption.DIRECT}; @SuppressWarnings("sunapi")
private final OpenOption[] openOptions = {StandardOpenOption.READ, com.sun.nio.file.ExtendedOpenOption.DIRECT};
public DirectNIOFSDirectory(Path path, LockFactory lockFactory) throws IOException { public DirectNIOFSDirectory(Path path, LockFactory lockFactory) throws IOException {
super(path, lockFactory); super(path, lockFactory);
@ -58,10 +65,10 @@ public class DirectNIOFSDirectory extends FSDirectory {
static final class NIOFSIndexInput extends BufferedIndexInput { static final class NIOFSIndexInput extends BufferedIndexInput {
private static final int CHUNK_SIZE = 16384; private static final int CHUNK_SIZE = 16384;
protected final FileChannel channel; private final FileChannel channel;
boolean isClone = false; boolean isClone = false;
protected final long off; private final long off;
protected final long end; private final long end;
public NIOFSIndexInput(String resourceDesc, FileChannel fc, IOContext context) throws IOException { public NIOFSIndexInput(String resourceDesc, FileChannel fc, IOContext context) throws IOException {
super(resourceDesc, context); super(resourceDesc, context);
@ -99,7 +106,7 @@ public class DirectNIOFSDirectory extends FSDirectory {
} }
} }
public final long length() { public long length() {
return this.end - this.off; return this.end - this.off;
} }