Update java version and fix memory leak

.github/workflows/gradle.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '22'
       - uses: actions/cache@v3
         with:
           path: |
@@ -73,7 +73,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '22'
       - name: Gradle deploy
         run: ./gradlew travisReleaseSnapshot --info
       - name: Login to Docker Hub

README.md

@@ -441,7 +441,7 @@ git clone https://github.com/sirixdb/sirix.git
 
 or use the following dependencies in your Maven or Gradle project.
 
-**SirixDB uses Java 21, thus you need an up-to-date Gradle (if you want to work on SirixDB) and an IDE (for instance IntelliJ or Eclipse). Also make sure to use the provided Gradle wrapper.**
+**SirixDB uses Java 22, thus you need an up-to-date Gradle (if you want to work on SirixDB) or simply use the gradle wrapper and an IDE (for instance IntelliJ or Eclipse). Also make sure to use the provided Gradle wrapper.**
 
 ### Maven artifacts
 At this stage of development, you should use the latest SNAPSHOT artifacts from [the OSS snapshot repository](https://oss.sonatype.org/content/repositories/snapshots/io/sirix/) to get the most recent changes.

build.gradle

@@ -96,15 +96,15 @@ subprojects {
         withSourcesJar()
         withJavadocJar()
         toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
+            languageVersion = JavaLanguageVersion.of(22)
         }
     }
 
 
     javadoc {
         failOnError = false
         options {
-            addStringOption('-release', '21')
+            addStringOption('-release', '22')
             addBooleanOption('-enable-preview', true)
         }
     }
@@ -260,11 +260,13 @@ subprojects {
                  "--add-opens=java.base/java.io=ALL-UNNAMED",
                  "--add-opens=java.base/java.util=ALL-UNNAMED",
                  "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",
+                "-XX:+UnlockDiagnosticVMOptions",
+                "-XX:+DebugNonSafepoints",
                  //"-XX:+UseShenandoahGC",
-                 "-Xlog:gc*=debug:file=g1.log",
-                 "-XX:+UseZGC",
-                 "-XX:+ZGenerational",
-                 "-verbose:gc",
+            //     "-Xlog:gc*=debug:file=g1.log",
+//                 "-XX:+UseZGC",
+//                 "-XX:+ZGenerational",
+             //    "-verbose:gc",
                  "-XX:+HeapDumpOnOutOfMemoryError",
                  //"-XX:HeapDumpPath=heapdump.hprof",
                  "-XX:+UseStringDeduplication",
@@ -274,7 +276,7 @@ subprojects {
                  "-XX:MaxDirectMemorySize=1g",
                  "-XX:+UnlockExperimentalVMOptions",
                  "-XX:+AlwaysPreTouch",
-                 //"-XX:+UseLargePages",
+                 "-XX:+UseLargePages",
                  "-XX:ReservedCodeCacheSize=1000m",
                  "-XX:+UnlockDiagnosticVMOptions",
                //  "-XX:+PrintInlining",

bundles/sirix-core/src/main/java/io/sirix/access/trx/page/NodePageReadOnlyTrx.java

@@ -197,15 +197,14 @@ private Page loadPage(final PageReference reference) {
     }
 
     if (page != null) {
+      putIntoPageCache(reference, page);
       reference.setPage(page);
-      putIntoPageCacheIfItIsNotAWriteTrx(reference, page);
     }
     return page;
   }
 
-  private void putIntoPageCacheIfItIsNotAWriteTrx(PageReference reference, Page page) {
-    assert reference.getLogKey() == Constants.NULL_ID_INT;
-    if (trxIntentLog == null && !(page instanceof UberPage)) {
+  private void putIntoPageCache(PageReference reference, Page page) {
+    if (!(page instanceof UberPage)) {
       // Put page into buffer manager.
       resourceBufferManager.getPageCache().put(reference, page);
     }
@@ -449,9 +448,11 @@ public Page getRecordPage(@NonNull IndexLogKey indexLogKey) {
     }
 
     // Fourth: Try to get from resource buffer manager.
-    Page recordPageFromBuffer = getFromBufferManager(indexLogKey, pageReferenceToRecordPage);
-    if (recordPageFromBuffer != null) {
-      return recordPageFromBuffer;
+    if (trxIntentLog == null || indexLogKey.getIndexType() != IndexType.PATH_SUMMARY) {
+      Page recordPageFromBuffer = getFromBufferManager(indexLogKey, pageReferenceToRecordPage);
+      if (recordPageFromBuffer != null) {
+        return recordPageFromBuffer;
+      }
     }
 
     if (pageReferenceToRecordPage.getKey() == Constants.NULL_ID_LONG) {
@@ -528,9 +529,7 @@ private Page loadDataPageFromDurableStorageAndCombinePageFragments(@NonNull Inde
     final VersioningType versioningApproach = resourceConfig.versioningType;
     final Page completePage = versioningApproach.combineRecordPages(pages, maxRevisionsToRestore, this);
 
-    if (trxIntentLog == null) {
-      resourceBufferManager.getRecordPageCache().put(pageReferenceToRecordPage, (KeyValueLeafPage) completePage);
-    }
+    resourceBufferManager.getRecordPageCache().put(pageReferenceToRecordPage, (KeyValueLeafPage) completePage);
 
     pageReferenceToRecordPage.setPage(completePage);
     setMostRecentlyReadRecordPage(indexLogKey, completePage);

bundles/sirix-core/src/main/java/io/sirix/access/trx/page/NodePageTrx.java

@@ -592,10 +592,14 @@ private PageContainer prepareRecordPage(final @NonNegative long recordPageKey, f
                                                                    indexType,
                                                                    getResourceSession().getResourceConfig(),
                                                                    pageRtx.getRevisionNumber());
-        final KeyValueLeafPage modifyPage = new KeyValueLeafPage(completePage);
+        final KeyValueLeafPage modifyPage = new KeyValueLeafPage(recordPageKey,
+                                                                   indexType,
+                                                                   getResourceSession().getResourceConfig(),
+                                                                   pageRtx.getRevisionNumber());
         pageContainer = PageContainer.getInstance(completePage, modifyPage);
       } else {
         pageContainer = dereferenceRecordPageForModification(reference);
+        return pageContainer;
       }
 
       assert pageContainer != null;

bundles/sirix-core/src/main/java/io/sirix/access/trx/page/PageTrxFactory.java

@@ -104,7 +104,7 @@ public PageTrx createPageTrx(
 
     final TreeModifierImpl treeModifier = new TreeModifierImpl();
     final TransactionIntentLogFactory logFactory = new TransactionIntentLogFactoryImpl();
-    final TransactionIntentLog log = logFactory.createTrxIntentLog(resourceConfig);
+    final TransactionIntentLog log = logFactory.createTrxIntentLog(bufferManager, resourceConfig);
 
     // Create revision tree if needed. Note: This must happen before the page read trx is created.
     if (uberPage.isBootstrap()) {
@@ -187,11 +187,6 @@ public PageTrx createPageTrx(
         log.put(newRevisionRootPage.getDeweyIdPageReference(), PageContainer.getInstance(deweyIDPage, deweyIDPage));
       }
 
-//      final Page indirectPage =
-//          pageRtx.dereferenceIndirectPageReference(newRevisionRootPage.getIndirectDocumentIndexPageReference());
-//      log.put(newRevisionRootPage.getIndirectDocumentIndexPageReference(),
-//              PageContainer.getInstance(indirectPage, indirectPage));
-
       final var revisionRootPageReference = new PageReference();
       log.put(revisionRootPageReference, PageContainer.getInstance(newRevisionRootPage, newRevisionRootPage));
       uberPage.setRevisionRootPageReference(revisionRootPageReference);

bundles/sirix-core/src/main/java/io/sirix/access/trx/page/TransactionIntentLogFactory.java

@@ -28,6 +28,7 @@
 package io.sirix.access.trx.page;
 
 import io.sirix.access.ResourceConfiguration;
+import io.sirix.cache.BufferManager;
 import io.sirix.cache.TransactionIntentLog;
 
 /**
@@ -37,11 +38,12 @@ public interface TransactionIntentLogFactory {
 
   /**
    * Create a new transaction intent log
-   * 
+   *
+   * @param bufferManager the buffer manager
    * @param resourceConfig the resource configuration to get the path for the log and a byte handler
    *        pipeline
    * @return the transaction intent log instance
    * @throws NullPointerException if the {@code resourceConfig} parameter is null
    */
-  TransactionIntentLog createTrxIntentLog(ResourceConfiguration resourceConfig);
+  TransactionIntentLog createTrxIntentLog(BufferManager bufferManager, ResourceConfiguration resourceConfig);
 }

bundles/sirix-core/src/main/java/io/sirix/access/trx/page/TransactionIntentLogFactoryImpl.java

@@ -28,6 +28,7 @@
 package io.sirix.access.trx.page;
 
 import io.sirix.access.ResourceConfiguration;
+import io.sirix.cache.BufferManager;
 import io.sirix.cache.TransactionIntentLog;
 
 /**
@@ -42,7 +43,7 @@ public TransactionIntentLogFactoryImpl() {
   }
 
   @Override
-  public TransactionIntentLog createTrxIntentLog(final ResourceConfiguration resourceConfig) {
-    return new TransactionIntentLog(1 << 12);
+  public TransactionIntentLog createTrxIntentLog(final BufferManager bufferManager, final ResourceConfiguration resourceConfig) {
+    return new TransactionIntentLog(bufferManager, 1 << 12);
   }
 }

bundles/sirix-core/src/main/java/io/sirix/cache/PageCache.java

@@ -3,9 +3,9 @@
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.RemovalCause;
 import com.github.benmanes.caffeine.cache.RemovalListener;
-import io.sirix.page.IndirectPage;
-import io.sirix.page.PageReference;
+import io.sirix.page.*;
 import io.sirix.page.interfaces.Page;
+import io.sirix.settings.Constants;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -35,17 +35,16 @@ public void clear() {
   @Override
   public Page get(PageReference key) {
     var page = pageCache.getIfPresent(key);
-
-//    if (page instanceof IndirectPage indirectPage) {
-//      page = new IndirectPage(indirectPage);
-//    }
-
     return page;
   }
 
   @Override
   public void put(PageReference key, Page value) {
-    pageCache.put(key, value);
+    if (!(value instanceof RevisionRootPage) && !(value instanceof PathSummaryPage) && !(value instanceof PathPage)
+        && !(value instanceof CASPage) && !(value instanceof NamePage)) {
+      assert key.getKey() != Constants.NULL_ID_LONG;
+      pageCache.put(key, value);
+    }
   }
 
   @Override

bundles/sirix-core/src/main/java/io/sirix/cache/TransactionIntentLog.java

@@ -18,6 +18,11 @@ public final class TransactionIntentLog implements AutoCloseable {
    */
   private final List<PageContainer> list;
 
+  /**
+   * The buffer manager.
+   */
+  private final BufferManager bufferManager;
+
   /**
    * The log key.
    */
@@ -28,7 +33,8 @@ public final class TransactionIntentLog implements AutoCloseable {
    *
    * @param maxInMemoryCapacity the maximum size of the in-memory map
    */
-  public TransactionIntentLog(final int maxInMemoryCapacity) {
+  public TransactionIntentLog(final BufferManager bufferManager, final int maxInMemoryCapacity) {
+    this.bufferManager = bufferManager;
     logKey = 0;
     list = new ArrayList<>(maxInMemoryCapacity);
   }
@@ -56,6 +62,9 @@ public PageContainer get(final PageReference key) {
    * @param value a value to be associated with the specified key
    */
   public void put(final PageReference key, final PageContainer value) {
+    bufferManager.getRecordPageCache().remove(key);
+    bufferManager.getPageCache().remove(key);
+
     key.setKey(Constants.NULL_ID_LONG);
     key.setPage(null);
     key.setLogKey(logKey);

bundles/sirix-core/src/main/java/io/sirix/index/path/summary/PathSummaryReader.java

@@ -127,7 +127,7 @@ private PathSummaryReader(final PageReadOnlyTrx pageReadTrx,
           moveTo(pathNode.getNodeKey());
           assert this.getNodeKey() == pathNode.getNodeKey();
           qnmMapping.computeIfAbsent(this.getName(), (unused) -> new HashSet<>()).add(pathNode);
-          assert Objects.equals(this.getName(), pathNode.getName());
+         // assert Objects.equals(this.getName(), pathNode.getName());
         }
 
         moveToDocumentRoot();

bundles/sirix-core/src/main/java/io/sirix/node/NodeKind.java

@@ -51,6 +51,7 @@
 import io.sirix.node.json.*;
 import io.sirix.node.xml.*;
 import io.sirix.page.KeyValueLeafPage;
+import io.sirix.service.xml.xpath.AtomicValue;
 import io.sirix.settings.Constants;
 import io.sirix.settings.Fixed;
 import it.unimi.dsi.fastutil.longs.LongArrayList;

bundles/sirix-core/src/main/java/io/sirix/page/KeyValueLeafPage.java

@@ -276,7 +276,7 @@ public byte[][] slots() {
   }
 
   @Override
-  public synchronized void setSlot(byte[] recordData, int offset) {
+  public void setSlot(byte[] recordData, int offset) {
     slots[offset] = recordData;
   }
 

bundles/sirix-core/src/main/java/io/sirix/settings/VersioningType.java

@@ -85,7 +85,9 @@ public <V extends DataRecord, T extends KeyValuePage<V>> PageContainer combineRe
         modifiedPage.setDeweyId(deweyIds[i], i);
       }
 
-      return PageContainer.getInstance(completePage, modifiedPage);
+      final var pageContainer = PageContainer.getInstance(completePage, modifiedPage);
+      log.put(reference, pageContainer);
+      return pageContainer;
     }
 
     @Override