Clear a backend now performs a real clear instead of creating a new map

henri-tremblay · henri-tremblay · commit db0a495286e4 · 2018-05-23T10:43:07.000-04:00
diff --git a/impl/src/main/java/org/ehcache/impl/internal/store/heap/Backend.java b/impl/src/main/java/org/ehcache/impl/internal/store/heap/Backend.java
@@ -38,7 +38,7 @@ interface Backend<K, V> {
 
   OnHeapValueHolder<V> compute(K key, BiFunction<K, OnHeapValueHolder<V>, OnHeapValueHolder<V>> biFunction);
 
-  Backend<K, V> clear();
+  void clear();
 
   Collection<Map.Entry<K, OnHeapValueHolder<V>>> removeAllWithHash(int hash);
 
diff --git a/impl/src/main/java/org/ehcache/impl/internal/store/heap/KeyCopyBackend.java b/impl/src/main/java/org/ehcache/impl/internal/store/heap/KeyCopyBackend.java
@@ -158,8 +158,8 @@ public OnHeapValueHolder<V> compute(final K key, final BiFunction<K, OnHeapValue
   }
 
   @Override
-  public Backend<K, V> clear() {
-    return new KeyCopyBackend<>(byteSized, keyCopier);
+  public void clear() {
+    keyCopyMap.clear();
   }
 
   @Override
diff --git a/impl/src/main/java/org/ehcache/impl/internal/store/heap/OnHeapStore.java b/impl/src/main/java/org/ehcache/impl/internal/store/heap/OnHeapStore.java
@@ -616,7 +616,7 @@ public ReplaceStatus replace(K key, V oldValue, V newValue) throws StoreAccessEx
 
   @Override
   public void clear() {
-    this.map = map.clear();
+    map.clear();
   }
 
   @Override
diff --git a/impl/src/main/java/org/ehcache/impl/internal/store/heap/SimpleBackend.java b/impl/src/main/java/org/ehcache/impl/internal/store/heap/SimpleBackend.java
@@ -103,8 +103,8 @@ public OnHeapValueHolder<V> compute(final K key, final BiFunction<K, OnHeapValue
   }
 
   @Override
-  public Backend<K, V> clear() {
-    return new SimpleBackend<>(byteSized);
+  public void clear() {
+    realMap.clear();
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,8 @@ public OnHeapValueHolder<V> compute(final K key, final BiFunction<K, OnHeapValue`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`@Override`
`161`		`- public Backend<K, V> clear() {`
`162`		`- return new KeyCopyBackend<>(byteSized, keyCopier);`
	`161`	`+ public void clear() {`
	`162`	`+ keyCopyMap.clear();`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -616,7 +616,7 @@ public ReplaceStatus replace(K key, V oldValue, V newValue) throws StoreAccessEx`
`616`	`616`
`617`	`617`	`@Override`
`618`	`618`	`public void clear() {`
`619`		`- this.map = map.clear();`
	`619`	`+ map.clear();`
`620`	`620`	`}`
`621`	`621`
`622`	`622`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@ public OnHeapValueHolder<V> compute(final K key, final BiFunction<K, OnHeapValue`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`@Override`
`106`		`- public Backend<K, V> clear() {`
`107`		`- return new SimpleBackend<>(byteSized);`
	`106`	`+ public void clear() {`
	`107`	`+ realMap.clear();`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`@Override`