[FLINK-22338][table-planner] Clear watermark output when test finishe…

…d for FromElementSourceFunctionWithWatermark This closes apache#15659
liuzidi · Apr 19, 2021 · 5fbf0d7 · 5fbf0d7
1 parent ef8803a
commit 5fbf0d7
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...nk/src/test/java/org/apache/flink/table/planner/factories/TestValuesRuntimeFunctions.java b/...nk/src/test/java/org/apache/flink/table/planner/factories/TestValuesRuntimeFunctions.java
@@ -95,7 +95,13 @@ static List<String> getRawResults(String tableName) {
     }
 
     static List<Watermark> getWatermarks(String tableName) {
-        return watermarkHistory.getOrDefault(tableName, new ArrayList<>());
+        synchronized (TestValuesTableFactory.class) {
+            if (watermarkHistory.containsKey(tableName)) {
+                return new ArrayList<>(watermarkHistory.get(tableName));
+            } else {
+                return Collections.emptyList();
+            }
+        }
     }
 
     static List<String> getResults(String tableName) {
@@ -122,6 +128,7 @@ static void clearResults() {
             globalRawResult.clear();
             globalUpsertResult.clear();
             globalRetractResult.clear();
+            watermarkHistory.clear();
         }
     }