commit 0c83e8469c823eaebb2536521a896bf279a1ffb2
author Jordan Halterman <jordan.halterman@gmail.com> Sun Feb 05 22:21:19 2017 -0800
committer Thomas Vachuska <tom@onlab.us> Mon Feb 06 18:53:09 2017 +0000
tree cbf5d74f21e4aaf0581cbbf63d7930030e8a6bec
parent 260156ab66365eb28ef1e397ef1f78dff5795c59

Improve log compaction efficiency/correctness in AtomixConsistentTreeMap.

Change-Id: I977e60ce31eb8907f405760694b7f5b286fc3a2c

core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapCommands.java

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapCommands.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapCommands.java
index 2d560c4..231915d 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapCommands.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapCommands.java
@@ -243,7 +243,7 @@
 
         @Override
         public CompactionMode compaction() {
-            return value == null ? CompactionMode.FULL : CompactionMode.QUORUM;
+            return value == null ? CompactionMode.TOMBSTONE : CompactionMode.QUORUM;
         }
 
         @Override
@@ -335,7 +335,7 @@
             extends TreeCommand<MapEntryUpdateResult.Status> {
         @Override
         public CompactionMode compaction() {
-            return CompactionMode.FULL;
+            return CompactionMode.TOMBSTONE;
         }
     }
 
@@ -354,6 +354,11 @@
         }
 
         @Override
+        public CompactionMode compaction() {
+            return CompactionMode.QUORUM;
+        }
+
+        @Override
         public String toString() {
             return MoreObjects.toStringHelper(getClass())
                     .toString();
@@ -376,6 +381,11 @@
         }
 
         @Override
+        public CompactionMode compaction() {
+            return CompactionMode.TOMBSTONE;
+        }
+
+        @Override
         public String toString() {
             return MoreObjects.toStringHelper(getClass())
                     .toString();