From 3d323ba10171da6e6416efca832b76da46ea010b Mon Sep 17 00:00:00 2001
From: kkloudas <kkloudas@gmail.com>
Date: Mon, 5 Feb 2018 14:36:53 +0100
Subject: [PATCH] [FLINK-8561] [cep] Fix SharedBuffer.removeEdges to use
 .equals().

This closes #5414.
---
 .../apache/flink/cep/nfa/SharedBuffer.java    | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/SharedBuffer.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/SharedBuffer.java
index f34eb5fbd687f..5f766e23dbb40 100644
--- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/SharedBuffer.java
+++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/SharedBuffer.java
@@ -175,7 +175,7 @@ public boolean isEmpty() {
 	 * @return {@code true} if pruning happened
 	 */
 	public boolean prune(long pruningTimestamp) {
-		final List<SharedBufferEntry<K, V>> prunedEntries = new ArrayList<>();
+		final Set<SharedBufferEntry<K, V>> prunedEntries = new HashSet<>();
 
 		final Iterator<Map.Entry<K, SharedBufferPage<K, V>>> it = pages.entrySet().iterator();
 		while (it.hasNext()) {
@@ -428,7 +428,7 @@ public SharedBufferEntry<K, V> get(final ValueTimeWrapper<V> valueTime) {
 		 * @param pruningTimestamp Timestamp for the pruning
 		 * @param prunedEntries a {@link Set} to put the removed {@link SharedBufferEntry SharedBufferEntries}.
 		 */
-		private void prune(final long pruningTimestamp, final List<SharedBufferEntry<K, V>> prunedEntries) {
+		private void prune(final long pruningTimestamp, final Set<SharedBufferEntry<K, V>> prunedEntries) {
 			Iterator<Map.Entry<ValueTimeWrapper<V>, SharedBufferEntry<K, V>>> it = entries.entrySet().iterator();
 			while (it.hasNext()) {
 				SharedBufferEntry<K, V> entry = it.next().getValue();
@@ -442,7 +442,7 @@ private void prune(final long pruningTimestamp, final List<SharedBufferEntry<K,
 		/**
 		 * Remove edges with the specified targets for the entries.
 		 */
-		private void removeEdges(final List<SharedBufferEntry<K, V>> prunedEntries) {
+		private void removeEdges(final Set<SharedBufferEntry<K, V>> prunedEntries) {
 			for (SharedBufferEntry<K, V> entry : entries.values()) {
 				entry.removeEdges(prunedEntries);
 			}
@@ -542,15 +542,12 @@ public void addEdge(SharedBufferEdge<K, V> edge) {
 		/**
 		 * Remove edges with the specified targets.
 		 */
-		private void removeEdges(final List<SharedBufferEntry<K, V>> prunedEntries) {
-			Iterator<SharedBufferEdge<K, V>> itor = edges.iterator();
-			while (itor.hasNext()) {
-				SharedBufferEdge<K, V> edge = itor.next();
-				for (SharedBufferEntry<K, V> prunedEntry : prunedEntries) {
-					if (prunedEntry == edge.getTarget()) {
-						itor.remove();
-						break;
-					}
+		private void removeEdges(final Set<SharedBufferEntry<K, V>> prunedEntries) {
+			Iterator<SharedBufferEdge<K, V>> it = edges.iterator();
+			while (it.hasNext()) {
+				SharedBufferEdge<K, V> edge = it.next();
+				if (prunedEntries.contains(edge.getTarget())) {
+					it.remove();
 				}
 			}
 		}