Revert back to TreeMap

siddhi-io · Dec 4, 2019 · 0c7f80d · 0c7f80d
1 parent 50d2d54
commit 0c7f80d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/CacheTableFIFO.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/CacheTableFIFO.java
@@ -25,7 +25,6 @@
 import io.siddhi.query.api.definition.TableDefinition;
 import org.apache.log4j.Logger;
 
-import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
@@ -70,15 +69,15 @@ public void deleteEntriesUsingCachePolicy(int numRowsToDelete) {
             indexEventHolder.deleteAll();
         } else {
             Set<Object> keys = indexEventHolder.getAllPrimaryKeyValues();
-            Map<Long, Object> toDelete = new TreeMap<>();
+            TreeMap<Long, Object> toDelete = new TreeMap<>();
             for (Object key : keys) {
                 if (toDelete.size() < numRowsToDelete) {
                     toDelete.put((Long) indexEventHolder.getEvent(key).getOutputData()[cachePolicyAttributePosition],
                             key);
                 } else {
                     Long timestamp = (Long) indexEventHolder.getEvent(key).
                             getOutputData()[cachePolicyAttributePosition];
-                    Long firstKey = (Long) ((TreeMap) toDelete).firstKey();
+                    Long firstKey = toDelete.firstKey();
                     if (timestamp < firstKey) {
                         toDelete.remove(firstKey);
                         toDelete.put(timestamp, key);

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/CacheTableLFU.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/CacheTableLFU.java
@@ -78,15 +78,15 @@ public void deleteEntriesUsingCachePolicy(int numRowsToDelete) {
             indexEventHolder.deleteAll();
         } else {
             Set<Object> keys = indexEventHolder.getAllPrimaryKeyValues();
-            Map<Integer, Object> toDelete = new TreeMap<>();
+            TreeMap<Integer, Object> toDelete = new TreeMap<>();
             for (Object key : keys) {
                 if (toDelete.size() < numRowsToDelete) {
                     toDelete.put((Integer) indexEventHolder.getEvent(key).getOutputData()[cachePolicyAttributePosition],
                             key);
                 } else {
                     Integer count = (Integer) indexEventHolder.getEvent(key).
                             getOutputData()[cachePolicyAttributePosition];
-                    Integer firstKey = (Integer) ((TreeMap) toDelete).firstKey();
+                    Integer firstKey = toDelete.firstKey();
                     if (count < firstKey) {
                         toDelete.remove(firstKey);
                         toDelete.put(count, key);

diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/table/CacheTableLRU.java b/modules/siddhi-core/src/main/java/io/siddhi/core/table/CacheTableLRU.java
@@ -78,15 +78,15 @@ public void deleteEntriesUsingCachePolicy(int numRowsToDelete) {
             indexEventHolder.deleteAll();
         } else {
             Set<Object> keys = indexEventHolder.getAllPrimaryKeyValues();
-            Map<Long, Object> toDelete = new TreeMap<>();
+            TreeMap<Long, Object> toDelete = new TreeMap<>();
             for (Object key : keys) {
                 if (toDelete.size() < numRowsToDelete) {
                     toDelete.put((Long) indexEventHolder.getEvent(key).getOutputData()[cachePolicyAttributePosition],
                             key);
                 } else {
                     Long timestamp = (Long) indexEventHolder.getEvent(key).
                             getOutputData()[cachePolicyAttributePosition];
-                    Long firstKey = (Long) ((TreeMap) toDelete).firstKey();
+                    Long firstKey = toDelete.firstKey();
                     if (timestamp < firstKey) {
                         toDelete.remove(firstKey);
                         toDelete.put(timestamp, key);