From 7f273f9666f29e501aef4ed9a7b7f75fab8fcdd0 Mon Sep 17 00:00:00 2001
From: Aleksey Tomin <aleksey.tomin@cxense.com>
Date: Fri, 10 Jun 2016 10:07:36 +0400
Subject: [PATCH] Add new dependency tracking strategy

---
 .../maxifier/mxcache/DependencyTracking.java  |  6 +-
 .../mxcache/impl/AbstractCacheManager.java    | 12 ++-
 .../test/ResourceDependencyTrackingUTest.java | 90 +++++++++++++++++++
 3 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 mxcache-tests/src/test/java/com/maxifier/mxcache/test/ResourceDependencyTrackingUTest.java

diff --git a/mxcache-runtime/src/main/java/com/maxifier/mxcache/DependencyTracking.java b/mxcache-runtime/src/main/java/com/maxifier/mxcache/DependencyTracking.java
index 4b255bf4..929f0451 100644
--- a/mxcache-runtime/src/main/java/com/maxifier/mxcache/DependencyTracking.java
+++ b/mxcache-runtime/src/main/java/com/maxifier/mxcache/DependencyTracking.java
@@ -27,5 +27,9 @@ public enum DependencyTracking {
      * Each instance has it's own dependency tracking, if a single cache is marked as dirty only this cache
      * will be cleaned.
      */
-    INSTANCE
+    INSTANCE,
+    /**
+     * Cache NOT depending from any other caches. Only manual MxResource.writeEnd() clean.
+     */
+    RESOURCE
 }
diff --git a/mxcache-runtime/src/main/java/com/maxifier/mxcache/impl/AbstractCacheManager.java b/mxcache-runtime/src/main/java/com/maxifier/mxcache/impl/AbstractCacheManager.java
index ab4f405e..ba31d37c 100644
--- a/mxcache-runtime/src/main/java/com/maxifier/mxcache/impl/AbstractCacheManager.java
+++ b/mxcache-runtime/src/main/java/com/maxifier/mxcache/impl/AbstractCacheManager.java
@@ -63,8 +63,11 @@ public AbstractCacheManager(CacheContext context, Class<?> ownerClass, CacheDesc
         }
 
         trackDependency = convertStatic(convertDefault(descriptor.getTrackDependency()));
-        explicitDependencies = getExplicitDependencies(descriptor, ownerClass, convertDefault(descriptor.getTrackAnnotatedDependency()));
-
+        if (trackDependency == DependencyTracking.RESOURCE) {
+            explicitDependencies = null;
+        } else {
+            explicitDependencies = getExplicitDependencies(descriptor, ownerClass, convertDefault(descriptor.getTrackAnnotatedDependency()));
+        }
         switch (trackDependency) {
             case NONE:
                 if (explicitDependencies == null) {
@@ -76,6 +79,7 @@ public AbstractCacheManager(CacheContext context, Class<?> ownerClass, CacheDesc
             case STATIC:
                 staticNode = createStaticNode();
                 break;
+            case RESOURCE:
             case INSTANCE:
                 staticNode = null;
                 break;
@@ -149,6 +153,9 @@ protected DependencyNode createInstanceNode() {
 
     private DependencyTracking convertStatic(DependencyTracking tracking) {
         if (descriptor.isResourceView()) {
+            if (tracking == DependencyTracking.RESOURCE) {
+                return DependencyTracking.RESOURCE;
+            }
             return DependencyTracking.INSTANCE;
         }
         if (descriptor.isStatic() && tracking == DependencyTracking.INSTANCE) {
@@ -219,6 +226,7 @@ private DependencyNode getDependencyNode() {
             case STATIC:
                 return staticNode;
             case INSTANCE:
+            case RESOURCE:
                 return createInstanceNode();
             default:
                 throw new UnsupportedOperationException("Unknown value: " + trackDependency);
diff --git a/mxcache-tests/src/test/java/com/maxifier/mxcache/test/ResourceDependencyTrackingUTest.java b/mxcache-tests/src/test/java/com/maxifier/mxcache/test/ResourceDependencyTrackingUTest.java
new file mode 100644
index 00000000..9fd79d4c
--- /dev/null
+++ b/mxcache-tests/src/test/java/com/maxifier/mxcache/test/ResourceDependencyTrackingUTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2008-2016 Maxifier Ltd. All Rights Reserved.
+ */
+package com.maxifier.mxcache.test;
+
+import static org.testng.Assert.assertEquals;
+
+import com.maxifier.mxcache.Cached;
+import com.maxifier.mxcache.DependencyTracking;
+import com.maxifier.mxcache.ResourceView;
+import com.maxifier.mxcache.StatisticsMode;
+import com.maxifier.mxcache.StatisticsModeEnum;
+import com.maxifier.mxcache.impl.resource.MxResourceFactory;
+import com.maxifier.mxcache.resource.MxResource;
+import com.maxifier.mxcache.resource.TrackDependency;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author Created by Aleksey Tomin (aleksey.tomin@cxense.com) (2016-06-10)
+ */
+public class ResourceDependencyTrackingUTest {
+
+    @Test
+    public void testDependencyFromEntity() {
+        Entity e1 = new Entity("1", 11);
+        Entity e2 = new Entity("2", 21);
+        Service s = new Service();
+
+        assertEquals(s.getVal(e1), 11);
+        assertEquals(s.getVal(e2), 21);
+
+        e1.setValDirect(12);
+        assertEquals(s.getVal(e1), 11);
+        assertEquals(s.getVal(e2), 21);
+
+        e2.setVal(22);
+        assertEquals(s.getVal(e1), 11);
+        assertEquals(s.getVal(e2), 22);
+
+        e1.setVal(13);
+        assertEquals(s.getVal(e1), 13);
+        assertEquals(s.getVal(e2), 22);
+    }
+
+}
+
+class Entity {
+    private final MxResource res;
+
+    private int val;
+
+    Entity(String name, int val) {
+        this.res = MxResourceFactory.getResource("Entity#" + name);
+        this.val = val;
+    }
+
+    @Cached
+    @TrackDependency(DependencyTracking.RESOURCE)
+    @ResourceView
+    public int getVal() {
+        res.readStart();
+        try {
+            return val;
+        } finally {
+            res.readEnd();
+        }
+    }
+
+    public void setVal(int val) {
+        res.writeStart();
+        try {
+            this.val = val;
+        } finally {
+            res.writeEnd();
+        }
+    }
+
+    public void setValDirect(int val) {
+        this.val = val;
+    }
+}
+
+class Service {
+    @Cached
+    public int getVal(Entity entity) {
+        return entity.getVal();
+    }
+}
+