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 am...@apache.org on 2015/08/17 08:53:43 UTC
svn commit: r1696194 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java
Author: amitj
Date: Mon Aug 17 06:53:43 2015
New Revision: 1696194
URL: http://svn.apache.org/r1696194
Log:
OAK-3231: Change default maxCachedBinarySize to match lucene DEFAULT_BLOB_SIZE
Changed the default to 1 MB in DataStoreBlobStore
Added test to check if lucene blob cached with default
Added:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java (with props)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java?rev=1696194&r1=1696193&r2=1696194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java Mon Aug 17 06:53:43 2015
@@ -91,7 +91,7 @@ public class DataStoreBlobStore implemen
* Max size of binary whose content would be cached. We keep it greater than
* Lucene blob size OakDirectory#BLOB_SIZE such that Lucene index blobs are cached
*/
- private int maxCachedBinarySize = 17 * 1024;
+ private int maxCachedBinarySize = 1024 * 1024;
public DataStoreBlobStore(DataStore delegate) {
Added: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java?rev=1696194&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java (added)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java Mon Aug 17 06:53:43 2015
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.plugins.index.lucene;
+
+import org.apache.jackrabbit.core.data.DataIdentifier;
+import org.apache.jackrabbit.core.data.DataRecord;
+import org.apache.jackrabbit.core.data.DataStoreException;
+import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
+import org.apache.jackrabbit.oak.plugins.blob.datastore.OakFileDataStore;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.IOContext;
+import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.IndexOutput;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Random;
+
+import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class LuceneBlobCacheTest {
+ private Random rnd = new Random();
+
+ @Rule
+ public final TemporaryFolder tempFolder = new TemporaryFolder();
+
+ FileStore store;
+ ReadAccessCountingDataStore fileDataStore;
+
+ NodeBuilder builder;
+ NodeState root;
+
+ @Before
+ public void setUp() throws Exception {
+ fileDataStore = new ReadAccessCountingDataStore();
+ fileDataStore.init(tempFolder.newFolder().getAbsolutePath());
+ FileStore.Builder fileStoreBuilder = FileStore.newFileStore(tempFolder.newFolder())
+ .withBlobStore(new DataStoreBlobStore(fileDataStore)).withMaxFileSize(256)
+ .withCacheSize(64).withMemoryMapping(false);
+ store = fileStoreBuilder.create();
+ NodeStore nodeStore = new SegmentNodeStore(store);
+ root = nodeStore.getRoot();
+ builder = root.builder();
+ }
+
+ @Test
+ public void testLuceneBlobCached() throws Exception {
+ Directory dir = createDir(builder, false);
+ assertWrites(dir, IndexDefinition.DEFAULT_BLOB_SIZE);
+ }
+
+ @After
+ public void close() throws Exception {
+ if (store != null) {
+ store.close();
+ }
+ }
+
+ byte[] assertWrites(Directory dir, int blobSize) throws IOException {
+ byte[] data = randomBytes(blobSize);
+ IndexOutput o = dir.createOutput("test", IOContext.DEFAULT);
+ o.writeBytes(data, data.length);
+ o.close();
+
+ IndexInput i = dir.openInput("test", IOContext.DEFAULT);
+ assertEquals(blobSize, i.length());
+ byte[] result = new byte[blobSize];
+ i.readBytes(result, 0, result.length);
+ assertTrue(Arrays.equals(data, result));
+
+ // Load agagin to see if cached
+ i = dir.openInput("test", IOContext.DEFAULT);
+ assertEquals(blobSize, i.length());
+ result = new byte[blobSize];
+ i.readBytes(result, 0, result.length);
+ assertTrue(Arrays.equals(data, result));
+
+ assertEquals(1, fileDataStore.count);
+
+ return data;
+ }
+
+ private Directory createDir(NodeBuilder builder, boolean readOnly){
+ return new OakDirectory(builder.child(INDEX_DATA_CHILD_NAME),
+ new IndexDefinition(root, builder.getNodeState()), readOnly);
+ }
+
+ byte[] randomBytes(int size) {
+ byte[] data = new byte[size];
+ rnd.nextBytes(data);
+ return data;
+ }
+
+ class ReadAccessCountingDataStore extends OakFileDataStore {
+ int count;
+
+ @Override
+ public DataRecord getRecord(DataIdentifier identifier) throws DataStoreException {
+ count++;
+ return super.getRecord(identifier);
+ }
+ }
+}
Propchange: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneBlobCacheTest.java
------------------------------------------------------------------------------
svn:eol-style = native