reschke commented on code in PR #1526:
URL: https://github.com/apache/jackrabbit-oak/pull/1526#discussion_r1642564726
##########
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java:
##########
@@ -38,24 +45,64 @@
import org.apache.jackrabbit.oak.plugins.memory.StringPropertyState;
import org.apache.jackrabbit.oak.plugins.value.Conversions;
import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* PropertyState implementation with lazy parsing of the JSOP encoded value.
*/
final class DocumentPropertyState implements PropertyState {
+ private static final Logger LOG =
LoggerFactory.getLogger(DocumentPropertyState.class);
+
private final DocumentNodeStore store;
private final String name;
private final String value;
private PropertyState parsed;
+ private final byte[] compressedValue;
+ private final Compression compression;
+
+ private static final int DEFAULT_COMPRESSION_THRESHOLD =
Review Comment:
I'd set the logger here as well ("logTo()")
##########
oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyStateTest.java:
##########
@@ -81,4 +100,179 @@ public void multiValuedBinarySize() throws Exception {
assertEquals(0, reads.size());
}
-}
+ @Test
+ public void multiValuedAboveThresholdSize() throws Exception {
+ NodeBuilder builder = ns.getRoot().builder();
+ List<Blob> blobs = newArrayList();
+ for (int i = 0; i < 13; i++) {
+ blobs.add(builder.createBlob(new RandomStream(BLOB_SIZE, i)));
+ }
+ builder.child(TEST_NODE).setProperty("p", blobs, Type.BINARIES);
+ TestUtils.merge(ns, builder);
+
+ PropertyState p =
ns.getRoot().getChildNode(TEST_NODE).getProperty("p");
+ assertEquals(Type.BINARIES, Objects.requireNonNull(p).getType());
+ assertEquals(13, p.count());
+
+ reads.clear();
+ assertEquals(BLOB_SIZE, p.size(0));
+ // must not read the blob via stream
+ assertEquals(0, reads.size());
+ }
+
+ @Test
+ public void stringBelowThresholdSize() throws Exception {
+ NodeBuilder builder = ns.getRoot().builder();
+ builder.child(TEST_NODE).setProperty("p", "dummy", Type.STRING);
+ TestUtils.merge(ns, builder);
+
+ PropertyState p =
ns.getRoot().getChildNode(TEST_NODE).getProperty("p");
+ assertEquals(Type.STRING, Objects.requireNonNull(p).getType());
+ assertEquals(1, p.count());
+
+ reads.clear();
+ assertEquals(5, p.size(0));
+ // must not read the string via stream
+ assertEquals(0, reads.size());
+ }
+
+ @Test
+ public void stringAboveThresholdSize() throws Exception {
+ NodeBuilder builder = ns.getRoot().builder();
+ builder.child(TEST_NODE).setProperty("p", STRING_HUGEVALUE,
Type.STRING);
+ TestUtils.merge(ns, builder);
+
+ PropertyState p =
ns.getRoot().getChildNode(TEST_NODE).getProperty("p");
+ assertEquals(Type.STRING, Objects.requireNonNull(p).getType());
+ assertEquals(1, p.count());
+
+ reads.clear();
+ assertEquals(10050, p.size(0));
+ // must not read the string via streams
+ assertEquals(0, reads.size());
+ }
+
+ @Test
+ public void compressValueThrowsException() throws IOException,
NoSuchFieldException, IllegalAccessException {
+ DocumentNodeStore mockDocumentStore = mock(DocumentNodeStore.class);
+ Compression mockCompression = mock(Compression.class);
+
when(mockCompression.getOutputStream(any(OutputStream.class))).thenThrow(new
IOException("Compression failed"));
+
+ Field compressionThreshold =
DocumentPropertyState.class.getDeclaredField("DEFAULT_COMPRESSION_THRESHOLD");
+ compressionThreshold.setAccessible(true);
+ Field modifiersField = Field.class.getDeclaredField("modifiers");
+ modifiersField.setAccessible(true);
+ modifiersField.setInt(compressionThreshold,
compressionThreshold.getModifiers() & ~Modifier.FINAL);
+
+ compressionThreshold.set(null, DEFAULT_COMPRESSION_THRESHOLD);
+
+ DocumentPropertyState documentPropertyState = new
DocumentPropertyState(mockDocumentStore, "p", "\"" + STRING_HUGEVALUE + "\"",
mockCompression);
+
+ assertEquals(documentPropertyState.getValue(Type.STRING),
STRING_HUGEVALUE);
+
+ verify(mockCompression,
times(1)).getOutputStream(any(OutputStream.class));
+
+ compressionThreshold.set(null, -1);
+
+ }
+
+ @Test
+ public void uncompressValueThrowsException() throws IOException,
NoSuchFieldException, IllegalAccessException {
+
+ DocumentNodeStore mockDocumentStore = mock(DocumentNodeStore.class);
+ Compression mockCompression = mock(Compression.class);
+ OutputStream mockOutputStream= mock(OutputStream.class);
+
when(mockCompression.getOutputStream(any(OutputStream.class))).thenReturn(mockOutputStream);
+
when(mockCompression.getInputStream(any(InputStream.class))).thenThrow(new
IOException("Compression failed"));
+
+ Field compressionThreshold =
DocumentPropertyState.class.getDeclaredField("DEFAULT_COMPRESSION_THRESHOLD");
+ compressionThreshold.setAccessible(true);
+ Field modifiersField = Field.class.getDeclaredField("modifiers");
+ modifiersField.setAccessible(true);
+ modifiersField.setInt(compressionThreshold,
compressionThreshold.getModifiers() & ~Modifier.FINAL);
+
+ compressionThreshold.set(null, DEFAULT_COMPRESSION_THRESHOLD);
+
+ DocumentPropertyState documentPropertyState = new
DocumentPropertyState(mockDocumentStore, "p", STRING_HUGEVALUE,
mockCompression);
+
+ assertEquals(documentPropertyState.getValue(Type.STRING), "{}");
+
+ verify(mockCompression,
times(1)).getInputStream(any(InputStream.class));
+
+ compressionThreshold.set(null, -1);
+ }
+
+ @Test
+ public void adefaultValueSetToMinusOne() throws NoSuchMethodException,
InvocationTargetException, IllegalAccessException, NoSuchFieldException {
+ DocumentNodeStore store = mock(DocumentNodeStore.class);
+
+ DocumentPropertyState state = new DocumentPropertyState(store,
"propertyNameNew", "\"" + STRING_HUGEVALUE + "\"", Compression.GZIP);
+
+ // Get the private method
+ Method getCompressedValueMethod =
DocumentPropertyState.class.getDeclaredMethod("getCompressedValue");
+
+ // Make the method accessible
+ getCompressedValueMethod.setAccessible(true);
+ byte[] result = (byte[]) getCompressedValueMethod.invoke(state);
+
+ assertNull(result);
+ assertEquals(state.getValue(Type.STRING), STRING_HUGEVALUE);
+ }
+
+ @Test
+ public void stringAboveThresholdSizeNoCompression() throws
NoSuchMethodException, InvocationTargetException, IllegalAccessException,
NoSuchFieldException {
+ DocumentNodeStore store = mock(DocumentNodeStore.class);
+
+ // Get the private method
+ Method getCompressedValueMethod =
DocumentPropertyState.class.getDeclaredMethod("getCompressedValue");
+
+ // Make the method accessible
+ getCompressedValueMethod.setAccessible(true);
+
+ Field compressionThreshold =
DocumentPropertyState.class.getDeclaredField("DEFAULT_COMPRESSION_THRESHOLD");
+ compressionThreshold.setAccessible(true);
+ Field modifiersField = Field.class.getDeclaredField("modifiers");
+ modifiersField.setAccessible(true);
+ modifiersField.setInt(compressionThreshold,
compressionThreshold.getModifiers() & ~Modifier.FINAL);
+
+ compressionThreshold.set(null, DEFAULT_COMPRESSION_THRESHOLD);
+
+ DocumentPropertyState state = new DocumentPropertyState(store,
"propertyName", "\"" + STRING_HUGEVALUE + "\"", Compression.NONE);
+
+ byte[] result = (byte[]) getCompressedValueMethod.invoke(state);
+
+ assertEquals(result.length, STRING_HUGEVALUE.length() + 2 );
+
+ assertEquals(state.getValue(Type.STRING), STRING_HUGEVALUE);
+ assertEquals(STRING_HUGEVALUE, state.getValue(Type.STRING));
+
+ // Reset the value of the field
+ compressionThreshold.set(null, -1);
+ }
+
+ @Test
+ public void performanceTest() {
+ String testString = RandomStringUtils.random(10050, "dummytest");
+ DocumentNodeStore store = mock(DocumentNodeStore.class);
+ DocumentPropertyState state = new DocumentPropertyState(store,
"propertyName", "\"" + testString + "\"", Compression.GZIP);
+
+ Runtime runtime = Runtime.getRuntime();
+
+ long startMemory = runtime.totalMemory() - runtime.freeMemory(); //
Get initial memory usage
+ long startTime = System.nanoTime();
+
+ String compressedValue = state.getValue(Type.STRING);
+
+ long endTime = System.nanoTime();
+ long endMemory = runtime.totalMemory() - runtime.freeMemory(); // Get
final memory usage
+
+ long duration = (endTime - startTime); // divide by 1000000 to get
milliseconds.
+ long usedMemory = endMemory - startMemory; // Calculate the used
memory during the operation
+
+ System.out.println("Time taken for compression: " + duration + "
nanoseconds");
+ System.out.println("Memory used for compression: " + usedMemory + "
bytes");
+
+ // Assert that the compressed value is not null or empty
+ assertTrue(compressedValue != null && !compressedValue.isEmpty());
+ }
+}
Review Comment:
We absolutely need to test string values which would fail with a pedantic
UTF-8 encoder. See
https://issues.apache.org/jira/browse/OAK-10803?focusedCommentId=17855529&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-17855529.
##########
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java:
##########
@@ -128,7 +188,7 @@ public boolean equals(Object object) {
} else if (object instanceof DocumentPropertyState) {
DocumentPropertyState other = (DocumentPropertyState) object;
return this.name.equals(other.name)
- && this.value.equals(other.value);
+ && this.getValue().equals(other.getValue());
Review Comment:
Hm. That means the "equals()" method would need to uncompress. That seems
performance critical.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
