Default implementation falls back to {@link #deleteDocumentTree} for implementations
+ * that do not differentiate; override in backends that support exact-document deletion.
+ *
+ * @param path path of the node whose document needs to be deleted
+ */
+ void deleteDocument(String path) throws IOException;
/**
* Closes the underlying resources.
diff --git a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexCommonTest.java b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexCommonTest.java
index 1d8d24e4788..bb96e14f16c 100644
--- a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexCommonTest.java
+++ b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexCommonTest.java
@@ -520,6 +520,82 @@ public void indexingBasedOnMixinWithInheritance() throws Exception {
});
}
+ @Test
+ public void nodeGainsMixinAppearsInMixinBasedIndex() throws Exception {
+ indexOptions.setIndex(
+ root,
+ "test1",
+ indexOptions.createIndex(indexOptions.createIndexDefinitionBuilder(), "mix:title", false, "jcr:title")
+ );
+ root.commit();
+
+ Tree test = root.getTree("/").addChild("test");
+ Tree a = test.addChild("a");
+ a.setProperty("jcr:title", "hello");
+ root.commit();
+
+ String query = "select [jcr:path] from [mix:title] where [jcr:title] = 'hello'";
+ assertEventually(() -> assertQuery(query, List.of()));
+
+ a = root.getTree("/test/a");
+ a.setProperty(JcrConstants.JCR_MIXINTYPES, List.of("mix:title"), Type.NAMES);
+ root.commit();
+
+ assertEventually(() -> assertQuery(query, List.of("/test/a")));
+ }
+
+ @Test
+ public void nodeLosesMixinDisappearsFromMixinBasedIndex() throws Exception {
+ indexOptions.setIndex(
+ root,
+ "test1",
+ indexOptions.createIndex(indexOptions.createIndexDefinitionBuilder(), "mix:title", false, "jcr:title")
+ );
+ root.commit();
+
+ Tree test = root.getTree("/").addChild("test");
+ Tree a = createNodeWithMixinType(test, "a", "mix:title");
+ a.setProperty("jcr:title", "hello");
+ root.commit();
+
+ String query = "select [jcr:path] from [mix:title] where [jcr:title] = 'hello'";
+ assertEventually(() -> assertQuery(query, List.of("/test/a")));
+
+ a = root.getTree("/test/a");
+ a.removeProperty(JcrConstants.JCR_MIXINTYPES);
+ root.commit();
+
+ assertEventually(() -> assertQuery(query, List.of()));
+ }
+
+ @Test
+ public void parentLosesMixinDoesNotCascadeDeleteChildWithSameMixin() throws Exception {
+ indexOptions.setIndex(
+ root,
+ "test1",
+ indexOptions.createIndex(indexOptions.createIndexDefinitionBuilder(), "mix:title", false, "jcr:title")
+ );
+ root.commit();
+
+ Tree test = root.getTree("/").addChild("test");
+ Tree a = createNodeWithMixinType(test, "a", "mix:title");
+ a.setProperty("jcr:title", "parent");
+ Tree child = createNodeWithMixinType(a, "child", "mix:title");
+ child.setProperty("jcr:title", "childTitle");
+ root.commit();
+
+ String childQuery = "select [jcr:path] from [mix:title] where [jcr:title] = 'childTitle'";
+ assertEventually(() -> assertQuery(childQuery, List.of("/test/a/child")));
+
+ // Remove mixin from parent only — child still has mix:title
+ a = root.getTree("/test/a");
+ a.removeProperty(JcrConstants.JCR_MIXINTYPES);
+ root.commit();
+
+ // Child must survive — deleteDocumentTree on the parent must not cascade to it
+ assertEventually(() -> assertQuery(childQuery, List.of("/test/a/child")));
+ }
+
@Test
public void indexingBasedOnMixinAndRelativeProps() throws Exception {
indexOptions.setIndex(
diff --git a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java
index 25687239380..239cc9148f9 100644
--- a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java
+++ b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java
@@ -111,7 +111,8 @@ public PersistentDiskCache(File directory, int cacheMaxSizeMB, DiskCacheIOMonito
() -> maxCacheSizeBytes,
() -> Long.valueOf(directory.listFiles().length),
() -> FileUtils.sizeOfDirectory(directory),
- () -> evictionCount.get());
+ () -> evictionCount.get(),
+ () -> discardCount.get());
}
@Override
diff --git a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCache.java b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCache.java
index 204484e23c1..754e657fc56 100644
--- a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCache.java
+++ b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCache.java
@@ -73,7 +73,7 @@ public PersistentRedisCache(String redisHost, int redisPort, int redisExpireSeco
this.redisPool = new JedisPool(jedisPoolConfig, redisHost, redisPort, redisConnectionTimeout,
redisSocketTimeout, null, redisDBIndex, null);
this.segmentCacheStats = new SegmentCacheStats(NAME, this::getRedisMaxMemory, this::getCacheElementCount,
- this::getCurrentWeight, this::getNumberOfEvictedKeys);
+ this::getCurrentWeight, this::getNumberOfEvictedKeys, () -> discardCount.get());
}
private long getCacheElementCount() {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java
index e60ae43867c..f1641ffb531 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java
@@ -22,6 +22,7 @@
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.commons.Buffer;
+import org.apache.jackrabbit.oak.commons.log.LogSilencer;
import org.apache.jackrabbit.oak.commons.time.Stopwatch;
import org.apache.jackrabbit.oak.segment.spi.RepositoryNotReachableException;
import org.jetbrains.annotations.NotNull;
@@ -31,27 +32,53 @@
import java.io.Closeable;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
public abstract class AbstractPersistentCache implements PersistentCache, Closeable {
private static final Logger logger = LoggerFactory.getLogger(AbstractPersistentCache.class);
public static final int THREADS = Integer.getInteger("oak.segment.cache.threads", 10);
+ public static final int WRITE_QUEUE_SIZE = Integer.getInteger("oak.segment.cache.writeQueueSize", 100);
protected ExecutorService executor;
protected AtomicLong cacheSize = new AtomicLong(0);
protected PersistentCache nextCache;
protected final Set