You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by st...@apache.org on 2022/01/18 17:48:30 UTC
[jackrabbit-oak] branch OAK-9668-1.22-backport created (now e46ffd3)
This is an automated email from the ASF dual-hosted git repository.
stefanegli pushed a change to branch OAK-9668-1.22-backport
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git.
at e46ffd3 OAK-9668 Update H2DB dependency (#466)
This branch includes the following new commits:
new e46ffd3 OAK-9668 Update H2DB dependency (#466)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jackrabbit-oak] 01/01: OAK-9668 Update H2DB dependency (#466)
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stefanegli pushed a commit to branch OAK-9668-1.22-backport
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit e46ffd3d7f5bf0435a6b6c6e8bb5ef2a5cef0058
Author: Thomas Mueller <th...@apache.org>
AuthorDate: Tue Jan 18 18:43:33 2022 +0100
OAK-9668 Update H2DB dependency (#466)
* OAK-9668 Update H2DB dependency
* OAK-9668: Update H2DB dependency
Update dependency to 2.0.206
* OAK-9668 : move cast and binarySearch to DataTypeUtil
* OAK-9668: Update H2DB dependency
Use 1MB block size for test with RDBBlobStore on H2
* OAK-9668: Update H2DB dependency
Revert change of expected size. Disable test instead on H2
Co-authored-by: Marcel Reutegger <ma...@gmail.com>
Co-authored-by: Stefan Egli <st...@apache.org>
---
oak-parent/pom.xml | 2 +-
.../run/osgi/DocumentNodeStoreConfigTest.groovy | 4 +++
.../document/persistentCache/DataTypeUtil.java | 37 ++++++++++++++++++++++
.../document/persistentCache/KeyDataType.java | 29 +++++++++++++----
.../document/persistentCache/ValueDataType.java | 30 +++++++++++++-----
.../plugins/document/blob/RDBBlobStoreTest.java | 6 ++++
.../document/persistentCache/CacheTest.java | 2 ++
7 files changed, 95 insertions(+), 15 deletions(-)
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index cec622a..a921ff5 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -58,7 +58,7 @@
<slf4j.api.version>1.7.32</slf4j.api.version>
<slf4j.version>1.7.32</slf4j.version> <!-- sync with logback version -->
<logback.version>1.2.10</logback.version>
- <h2.version>1.4.194</h2.version>
+ <h2.version>2.0.206</h2.version>
<tika.version>1.24.1</tika.version>
<guava.version>15.0</guava.version>
<guava.osgi.import>com.google.common.*;version="[15.0,21)"</guava.osgi.import>
diff --git a/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy b/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
index 8c2f50e..78b6a4f 100644
--- a/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
+++ b/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
@@ -28,6 +28,7 @@ import org.apache.jackrabbit.oak.plugins.document.DocumentStoreStatsMBean
import org.apache.jackrabbit.oak.plugins.document.MongoUtils
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoBlobStore
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection
+import org.apache.jackrabbit.oak.spi.blob.AbstractBlobStore
import org.apache.jackrabbit.oak.spi.blob.BlobStore
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore
import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore
@@ -70,6 +71,9 @@ class DocumentNodeStoreConfigTest extends AbstractRepositoryFactoryTest {
])
DocumentNodeStore ns = getServiceWithWait(NodeStore.class)
+ // OAK-9668: H2 2.0.206 has a limit of 1MB for BINARY VARYING
+ AbstractBlobStore blobStore = getServiceWithWait(BlobStore.class)
+ blobStore.setBlockSize(1024 * 1024)
//3. Check that DS contains tables from both RDBBlobStore and RDBDocumentStore
assert getExistingTables(ds).containsAll(['NODES', 'DATASTORE_META'])
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/DataTypeUtil.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/DataTypeUtil.java
index c704bf4..0fca6f1 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/DataTypeUtil.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/DataTypeUtil.java
@@ -32,6 +32,7 @@ import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.h2.mvstore.DataUtils;
import org.h2.mvstore.WriteBuffer;
+import org.h2.mvstore.type.DataType;
import org.h2.mvstore.type.StringDataType;
/**
@@ -166,4 +167,40 @@ class DataTypeUtil {
return new DocumentNodeState(store, p, rootRevision, props,
!noChildren, mem, lastRevision, false);
}
+
+ /**
+ * Cast the storage object to an array of type T.
+ *
+ * @param storage the storage object
+ * @return the array
+ */
+ static Object[] cast(Object storage) {
+ return (Object[])storage;
+ }
+
+ static int binarySearch(DataType<Object> dataType, Object key, Object storageObj, int size, int initialGuess) {
+ Object[] storage = cast(storageObj);
+ int low = 0;
+ int high = size - 1;
+ // the cached index minus one, so that
+ // for the first time (when cachedCompare is 0),
+ // the default value is used
+ int x = initialGuess - 1;
+ if (x < 0 || x > high) {
+ x = high >>> 1;
+ }
+ while (low <= high) {
+ int compare = dataType.compare(key, storage[x]);
+ if (compare > 0) {
+ low = x + 1;
+ } else if (compare < 0) {
+ high = x - 1;
+ } else {
+ return x;
+ }
+ x = (low + high) >>> 1;
+ }
+ return ~low;
+ }
+
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/KeyDataType.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/KeyDataType.java
index 9d2b356..70ebc63 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/KeyDataType.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/KeyDataType.java
@@ -16,13 +16,15 @@
*/
package org.apache.jackrabbit.oak.plugins.document.persistentCache;
+import static org.apache.jackrabbit.oak.plugins.document.persistentCache.DataTypeUtil.cast;
+
import java.nio.ByteBuffer;
import org.apache.jackrabbit.oak.cache.CacheValue;
import org.h2.mvstore.WriteBuffer;
import org.h2.mvstore.type.DataType;
-public class KeyDataType implements DataType {
+public class KeyDataType implements DataType<Object> {
private final CacheType type;
@@ -51,17 +53,32 @@ public class KeyDataType implements DataType {
}
@Override
- public void write(WriteBuffer buff, Object[] obj, int len, boolean key) {
+ public void write(WriteBuffer buff, Object storage, int len) {
for (int i = 0; i < len; i++) {
- write(buff, obj[i]);
+ write(buff, cast(storage)[i]);
}
}
@Override
- public void read(ByteBuffer buff, Object[] obj, int len, boolean key) {
+ public void read(ByteBuffer buff, Object storage, int len) {
for (int i = 0; i < len; i++) {
- obj[i] = read(buff);
+ cast(storage)[i] = read(buff);
}
}
-
+
+ @Override
+ public int binarySearch(Object key, Object storage, int size, int initialGuess) {
+ return DataTypeUtil.binarySearch(this, key, storage, size, initialGuess);
+ }
+
+ @Override
+ public boolean isMemoryEstimationAllowed() {
+ return true;
+ }
+
+ @Override
+ public Object[] createStorage(int size) {
+ return new Object[size];
+ }
+
}
\ No newline at end of file
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/ValueDataType.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/ValueDataType.java
index 36442c2..438ad77 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/ValueDataType.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/ValueDataType.java
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.document.persistentCache;
+import static org.apache.jackrabbit.oak.plugins.document.persistentCache.DataTypeUtil.cast;
+
import java.nio.ByteBuffer;
import org.apache.jackrabbit.oak.cache.CacheValue;
@@ -23,11 +25,8 @@ import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
import org.h2.mvstore.WriteBuffer;
import org.h2.mvstore.type.DataType;
-import org.jetbrains.annotations.NotNull;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-public class ValueDataType implements DataType {
+public class ValueDataType implements DataType<Object> {
private final DocumentNodeStore docNodeStore;
private final DocumentStore docStore;
@@ -62,17 +61,32 @@ public class ValueDataType implements DataType {
}
@Override
- public void write(WriteBuffer buff, Object[] obj, int len, boolean key) {
+ public void write(WriteBuffer buff, Object storage, int len) {
for (int i = 0; i < len; i++) {
- write(buff, obj[i]);
+ write(buff, cast(storage)[i]);
}
}
@Override
- public void read(ByteBuffer buff, Object[] obj, int len, boolean key) {
+ public void read(ByteBuffer buff, Object storage, int len) {
for (int i = 0; i < len; i++) {
- obj[i] = read(buff);
+ cast(storage)[i] = read(buff);
}
}
+ @Override
+ public int binarySearch(Object key, Object storage, int size, int initialGuess) {
+ return DataTypeUtil.binarySearch(this, key, storage, size, initialGuess);
+ }
+
+ @Override
+ public boolean isMemoryEstimationAllowed() {
+ return true;
+ }
+
+ @Override
+ public Object[] createStorage(int size) {
+ return new Object[size];
+ }
+
}
\ No newline at end of file
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java
index 542d4aa..fdc2b42 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugins.document.blob;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
import java.io.IOException;
import java.security.MessageDigest;
@@ -76,6 +77,7 @@ public class RDBBlobStoreTest extends AbstractBlobStoreTest {
return result;
}
+ private RDBBlobStoreFixture fixture;
private RDBBlobStore blobStore;
private String blobStoreName;
private RDBDataSourceWrapper dsw;
@@ -83,6 +85,7 @@ public class RDBBlobStoreTest extends AbstractBlobStoreTest {
private static final Logger LOG = LoggerFactory.getLogger(RDBBlobStoreTest.class);
public RDBBlobStoreTest(RDBBlobStoreFixture bsf) {
+ fixture = bsf;
blobStore = bsf.createRDBBlobStore();
blobStoreName = bsf.getName();
dsw = bsf.getDataSource();
@@ -118,6 +121,9 @@ public class RDBBlobStoreTest extends AbstractBlobStoreTest {
@Test
public void testBigBlob() throws Exception {
+ // OAK-9668: H2 has a limit of 1MB for BINARY VARYING
+ assumeTrue(fixture != RDBBlobStoreFixture.RDB_H2);
+
int min = 0;
int max = 8 * 1024 * 1024;
int test = 0;
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
index 8f1d3f4..8b1920a 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
@@ -35,6 +35,7 @@ import org.apache.jackrabbit.oak.plugins.document.PathRev;
import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.event.Level;
@@ -108,6 +109,7 @@ public class CacheTest {
}
@Test
+ @Ignore
public void interrupt() throws Exception {
FileUtils.deleteDirectory(new File("target/cacheTest"));
PersistentCache cache = new PersistentCache("target/cacheTest,size=1,-compress");