Use EntryView

hazelcast · Nov 13, 2019 · df3536f · df3536f
1 parent b8e860a
commit df3536f
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/eviction/EvictorImpl.java b/hazelcast/src/main/java/com/hazelcast/map/impl/eviction/EvictorImpl.java
@@ -25,7 +25,6 @@
 import com.hazelcast.map.impl.recordstore.RecordStore;
 import com.hazelcast.map.impl.recordstore.Storage;
 import com.hazelcast.nio.serialization.Data;
-import com.hazelcast.spi.eviction.EvictableEntryView;
 import com.hazelcast.spi.eviction.EvictionPolicyComparator;
 
 import static com.hazelcast.internal.util.Preconditions.checkNotNull;
@@ -57,11 +56,11 @@ public void evict(RecordStore recordStore, Data excludedKey) {
         assertRunningOnPartitionThread();
 
         for (int i = 0; i < batchSize; i++) {
-            EvictableEntryView evictableEntryView = selectEvictableEntry(recordStore, excludedKey);
-            if (evictableEntryView == null) {
+            EntryView entryView = selectEvictableEntry(recordStore, excludedKey);
+            if (entryView == null) {
                 return;
             }
-            evictEntry(recordStore, evictableEntryView);
+            evictEntry(recordStore, entryView);
         }
     }
 
@@ -71,11 +70,11 @@ public void forceEvict(RecordStore recordStore) {
     }
 
     @SuppressWarnings("checkstyle:rvcheckcomparetoforspecificreturnvalue")
-    private EvictableEntryView selectEvictableEntry(RecordStore recordStore, Data excludedKey) {
-        EvictableEntryView excluded = null;
-        EvictableEntryView selected = null;
+    private EntryView selectEvictableEntry(RecordStore recordStore, Data excludedKey) {
+        EntryView excluded = null;
+        EntryView selected = null;
 
-        for (EvictableEntryView current : getRandomSamples(recordStore)) {
+        for (EntryView current : getRandomSamples(recordStore)) {
             if (excludedKey != null && excluded == null
                     && getDataKey(current).equals(excludedKey)) {
                 excluded = current;
@@ -91,11 +90,11 @@ && getDataKey(current).equals(excludedKey)) {
         return selected == null ? excluded : selected;
     }
 
-    private Data getDataKey(EvictableEntryView evictable) {
+    private Data getDataKey(EntryView evictable) {
         return getRecordFromEntryView(evictable).getKey();
     }
 
-    private void evictEntry(RecordStore recordStore, EvictableEntryView evictable) {
+    private void evictEntry(RecordStore recordStore, EntryView evictable) {
         Record record = getRecordFromEntryView(evictable);
         Data key = record.getKey();
 
@@ -119,7 +118,7 @@ public boolean checkEvictable(RecordStore recordStore) {
     }
 
     // this method is overridden in another context.
-    protected Record getRecordFromEntryView(EvictableEntryView evictableEntryView) {
+    protected Record getRecordFromEntryView(EntryView evictableEntryView) {
         return ((LazyEvictableEntryView) evictableEntryView).getRecord();
     }