Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@adamretter
adamretter committed Dec 1, 2024
1 parent d3e0679 commit 9325a98
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 15 deletions.
40 changes: 30 additions & 10 deletions exist-core/src/main/java/org/exist/storage/btree/Paged.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.function.Supplier;

/**
* Paged is a paged file foundation that is used by the BTree class and
Expand Down Expand Up @@ -290,7 +291,7 @@ protected final Page getFreePage(final boolean reuseDeleted) throws IOException
long pageNum = fileHeader.firstFreePage;
if (reuseDeleted && pageNum != Page.NO_PAGE) {
// Steal a deleted page
page = new Page(pageNum);
page = new Page(file, raf, fileHeader, this::createPageHeader, pageNum, tempPageData, tempHeaderData);
page.read();
fileHeader.firstFreePage = page.header.nextPage;
if (fileHeader.firstFreePage == Page.NO_PAGE) {
Expand All @@ -303,7 +304,7 @@ protected final Page getFreePage(final boolean reuseDeleted) throws IOException
throw new IOException("page limit reached: " + pageNum);
}
fileHeader.setTotalCount(pageNum + 1);
page = new Page(pageNum);
page = new Page(file, raf, fileHeader, this::createPageHeader, pageNum, tempPageData, tempHeaderData);
page.read();
}
}
Expand All @@ -324,8 +325,8 @@ protected final Page getFreePage(final boolean reuseDeleted) throws IOException
* @return The requested Page
* @throws IOException if an exception occurs
*/
protected final Page getPage(final long pageNum) throws IOException {
return new Page(pageNum);
protected static final Page getPage(final long pageNum) throws IOException {
return new Page(file, raf, fileHeader, this::createPageHeader, pageNum, tempPageData, tempHeaderData);
}

/**
Expand Down Expand Up @@ -858,33 +859,52 @@ public final synchronized void write() throws IOException {
/**
* Page
*/
public final class Page implements Comparable<Page> {
public static final class Page implements Comparable<Page> {

public static final long NO_PAGE = -1;

private final Path file;
private final RandomAccessFile raf;

private final FileHeader fileHeader;

/** The Header for this Page */
private final PageHeader header;

private final byte[] tempPageData;
private final byte[] tempHeaderData;

/** The offset into the file that this page starts */
private long offset;
/** This page number */
private long pageNum;

private int refCount = 0;

public Page() {
this.header = createPageHeader();
public Page(final Path file, final RandomAccessFile raf, final FileHeader fileHeader, final Supplier<PageHeader> pageHeaderSupplier, final byte[] tempPageData, final byte[] tempHeaderData) {
this.file = file;
this.raf = raf;
this.fileHeader = fileHeader;
this.header = pageHeaderSupplier.get();
this.tempPageData = tempPageData;
this.tempHeaderData = tempHeaderData;
}

/**
* Constructor for the Page object
*
* @param file the file.
* @param raf random access to the file.
* @param fileHeader the file header.
* @param pageHeaderSupplier a function that supplies a page header.
* @param pageNum Description of the Parameter
* @param tempPageData an array of temporary storage for page data.
* @param tempHeaderData an array of temporary storage for header data.
*
* @throws IOException Description of the Exception
*/
public Page(final long pageNum) throws IOException {
this();
public Page(final Path file, final RandomAccessFile raf, final FileHeader fileHeader, final Supplier<PageHeader> pageHeaderSupplier, final long pageNum, final byte[] tempPageData, final byte[] tempHeaderData) throws IOException {
this(file, raf, fileHeader, pageHeaderSupplier, tempPageData, tempHeaderData);
if(pageNum == Page.NO_PAGE) {
throw new IOException("Illegal page num: " + pageNum);
}
Expand Down Expand Up @@ -920,7 +940,7 @@ public PageHeader getPageHeader() {
*/
public String getPageInfo() {
return "page: " + pageNum +
"; file = " + FileUtils.fileName(getFile()) +
"; file = " + FileUtils.fileName(file) +
"; address = " + Long.toHexString(offset) +
"; page header = " + fileHeader.getPageHeaderSize() +
"; data start = " + Long.toHexString(offset + fileHeader.getPageHeaderSize());
Expand Down
15 changes: 10 additions & 5 deletions exist-core/src/main/java/org/exist/storage/dom/DOMFile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3034,14 +3034,16 @@ void setRecordCount(final short recs) {
}
}

protected final class DOMPage implements Cacheable {
protected static final class DOMPage implements Cacheable {

// the raw working data (without page header) of this page
byte[] data;

// the current size of the used data
int len = 0;

private final FileHeader fileHeader;

// the low-level page
Page page;

Expand All @@ -3058,17 +3060,19 @@ protected final class DOMPage implements Cacheable {
// set to true if the page has been removed from the cache
boolean invalidated = false;

AtomicInteger lastFound = new AtomicInteger(0);
private static final ThreadLocal<Integer> LAST_FOUND = ThreadLocal.withInitial(() -> 0);

DOMPage() {
DOMPage(final FileHeader fileHeader) {
this.fileHeader = fileHeader;
this.page = createNewPage();
this.pageHeader = (DOMFilePageHeader) page.getPageHeader();
this.data = new byte[fileHeader.getWorkSize()];
this.len = 0;
}

DOMPage(final long pos) {
DOMPage(final FileHeader fileHeader, final long pos) {
try {
this.fileHeader = fileHeader;
this.page = getPage(pos);
load(page);
} catch (final IOException ioe) {
Expand All @@ -3078,7 +3082,8 @@ protected final class DOMPage implements Cacheable {
}
}

DOMPage(final Page page) {
DOMPage(final FileHeader fileHeader, final Page page) {
this.fileHeader = fileHeader;
this.page = page;
load(page);
}
Expand Down

0 comments on commit 9325a98

Please sign in to comment.