Merge pull request #3873 from andreitokar/at-misc

andreitokar · web-flow · commit 3f1be471750b · 2023-08-17T22:53:43.000-04:00
ToC cache is effectively not used after the first shutdown
diff --git a/h2/src/main/org/h2/engine/Database.java b/h2/src/main/org/h2/engine/Database.java
@@ -1761,6 +1761,10 @@ public boolean isReadOnly() {
         return readOnly;
     }
 
+    public int getWriteDelay() {
+        return store.getMvStore().getAutoCommitDelay();
+    }
+
     public void setWriteDelay(int value) {
         store.getMvStore().setAutoCommitDelay(value < 0 ? 0 : value);
     }
diff --git a/h2/src/main/org/h2/mvstore/FileStore.java b/h2/src/main/org/h2/mvstore/FileStore.java
@@ -1692,11 +1692,11 @@ public void setCacheSize(int mb) {
     }
 
     void cacheToC(C chunk, long[] toc) {
-        chunksToC.put(chunk.version, toc, toc.length * 8L + Constants.MEMORY_ARRAY);
+        chunksToC.put(chunk.id, toc, toc.length * 8L + Constants.MEMORY_ARRAY);
     }
 
     private long[] cleanToCCache(C chunk) {
-        return chunksToC.remove(chunk.version);
+        return chunksToC.remove(chunk.id);
     }
 
     public void populateInfo(BiConsumer<String, String> consumer) {
diff --git a/h2/src/main/org/h2/table/InformationSchemaTable.java b/h2/src/main/org/h2/table/InformationSchemaTable.java
@@ -2975,6 +2975,7 @@ private void settings(SessionLocal session, ArrayList<Row> rows) {
             add(session, rows, "NON_KEYWORDS", ParserBase.formatNonKeywords(nonKeywords));
         }
         add(session, rows, "RETENTION_TIME", Integer.toString(database.getRetentionTime()));
+        add(session, rows, "WRITE_DELAY", Integer.toString(database.getWriteDelay()));
         // database settings
         for (Map.Entry<String, String> entry : database.getSettings().getSortedSettings()) {
             add(session, rows, entry.getKey(), entry.getValue());

Original file line number	Diff line number	Diff line change
`@@ -1761,6 +1761,10 @@ public boolean isReadOnly() {`
`1761`	`1761`	`return readOnly;`
`1762`	`1762`	`}`
`1763`	`1763`
	`1764`	`+ public int getWriteDelay() {`
	`1765`	`+ return store.getMvStore().getAutoCommitDelay();`
	`1766`	`+ }`
	`1767`	`+`
`1764`	`1768`	`public void setWriteDelay(int value) {`
`1765`	`1769`	`store.getMvStore().setAutoCommitDelay(value < 0 ? 0 : value);`
`1766`	`1770`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1692,11 +1692,11 @@ public void setCacheSize(int mb) {`
`1692`	`1692`	`}`
`1693`	`1693`
`1694`	`1694`	`void cacheToC(C chunk, long[] toc) {`
`1695`		`- chunksToC.put(chunk.version, toc, toc.length * 8L + Constants.MEMORY_ARRAY);`
	`1695`	`+ chunksToC.put(chunk.id, toc, toc.length * 8L + Constants.MEMORY_ARRAY);`
`1696`	`1696`	`}`
`1697`	`1697`
`1698`	`1698`	`private long[] cleanToCCache(C chunk) {`
`1699`		`- return chunksToC.remove(chunk.version);`
	`1699`	`+ return chunksToC.remove(chunk.id);`
`1700`	`1700`	`}`
`1701`	`1701`
`1702`	`1702`	`public void populateInfo(BiConsumer<String, String> consumer) {`
Original file line number	Diff line number	Diff line change
`@@ -2975,6 +2975,7 @@ private void settings(SessionLocal session, ArrayList<Row> rows) {`
`2975`	`2975`	`add(session, rows, "NON_KEYWORDS", ParserBase.formatNonKeywords(nonKeywords));`
`2976`	`2976`	`}`
`2977`	`2977`	`add(session, rows, "RETENTION_TIME", Integer.toString(database.getRetentionTime()));`
	`2978`	`+ add(session, rows, "WRITE_DELAY", Integer.toString(database.getWriteDelay()));`
`2978`	`2979`	`// database settings`
`2979`	`2980`	`for (Map.Entry<String, String> entry : database.getSettings().getSortedSettings()) {`
`2980`	`2981`	`add(session, rows, entry.getKey(), entry.getValue());`