You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tz...@apache.org on 2018/02/06 19:02:48 UTC
[24/31] flink git commit: [hotfix] [test] Remove stale savepoint
files no longer used by migration tests
[hotfix] [test] Remove stale savepoint files no longer used by migration tests
This includes:
- Removing MigrationVersion.v1_1, since compatilbity for 1.1 is no
longer supported (and no migration tests still test that)
- Remove all 1.1 test savepoint files (which no migration tests still
use)
- Remove all 1.2 test savepoint files that are no longer in use (e.g.,
CEPMigrationTest does not test 1.2 restores anymore)
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/72f0eb1e
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/72f0eb1e
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/72f0eb1e
Branch: refs/heads/master
Commit: 72f0eb1e722089499c3e02284ee9113520d33a90
Parents: 130ca4e
Author: Tzu-Li (Gordon) Tai <tz...@apache.org>
Authored: Thu Jan 25 17:45:47 2018 +0100
Committer: Tzu-Li (Gordon) Tai <tz...@apache.org>
Committed: Tue Feb 6 19:58:59 2018 +0100
----------------------------------------------------------------------
.../rolling-sink-migration-test-flink1.1-snapshot | Bin 1471 -> 0 bytes
.../kafka/FlinkKafkaConsumerBaseMigrationTest.java | 6 +-----
...er-migration-test-flink1.1-empty-state-snapshot | Bin 468 -> 0 bytes
...kafka-consumer-migration-test-flink1.1-snapshot | Bin 738 -> 0 bytes
.../ContinuousFileProcessingMigrationTest.java | 15 ++++-----------
...-migration-test-1482144479339-flink1.1-snapshot | Bin 468 -> 0 bytes
.../reader-migration-test-flink1.1-snapshot | Bin 979 -> 0 bytes
.../streaming/util/migration/MigrationVersion.java | 1 -
...-migration-test-accum-aligned-flink1.1-snapshot | Bin 621 -> 0 bytes
...p-migration-test-aggr-aligned-flink1.1-snapshot | Bin 586 -> 0 bytes
...gration-test-apply-event-time-flink1.1-snapshot | Bin 2427 -> 0 bytes
...on-test-apply-processing-time-flink1.1-snapshot | Bin 2327 -> 0 bytes
...ration-test-reduce-event-time-flink1.1-snapshot | Bin 2457 -> 0 bytes
...n-test-reduce-processing-time-flink1.1-snapshot | Bin 2406 -> 0 bytes
...session-with-stateful-trigger-flink1.1-snapshot | Bin 2988 -> 0 bytes
...on-with-stateful-trigger-mint-flink1.1-snapshot | Bin 538 -> 0 bytes
...udf-migration-itcase-flink1.1-rocksdb-savepoint | Bin 22283 -> 0 bytes
...tateful-udf-migration-itcase-flink1.1-savepoint | Bin 27146 -> 0 bytes
18 files changed, 5 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-connectors/flink-connector-filesystem/src/test/resources/rolling-sink-migration-test-flink1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-filesystem/src/test/resources/rolling-sink-migration-test-flink1.1-snapshot b/flink-connectors/flink-connector-filesystem/src/test/resources/rolling-sink-migration-test-flink1.1-snapshot
deleted file mode 100644
index 2ebd70a..0000000
Binary files a/flink-connectors/flink-connector-filesystem/src/test/resources/rolling-sink-migration-test-flink1.1-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseMigrationTest.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseMigrationTest.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseMigrationTest.java
index 1980ccc..94097e9 100644
--- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseMigrationTest.java
+++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseMigrationTest.java
@@ -350,11 +350,7 @@ public class FlinkKafkaConsumerBaseMigrationTest {
fail("Restore from savepoints from version before Flink 1.3.x should have failed if discovery is enabled.");
} catch (Exception e) {
- if (testMigrateVersion == MigrationVersion.v1_1) {
- Assert.assertTrue(e.getCause() instanceof IllegalArgumentException);
- } else {
- Assert.assertTrue(e instanceof IllegalArgumentException);
- }
+ Assert.assertTrue(e instanceof IllegalArgumentException);
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-empty-state-snapshot
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-empty-state-snapshot b/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-empty-state-snapshot
deleted file mode 100644
index f4dd96d..0000000
Binary files a/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-empty-state-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-snapshot b/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-snapshot
deleted file mode 100644
index 01c9e03..0000000
Binary files a/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/ContinuousFileProcessingMigrationTest.java
----------------------------------------------------------------------
diff --git a/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/ContinuousFileProcessingMigrationTest.java b/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/ContinuousFileProcessingMigrationTest.java
index 1c2ea6f..30a6119 100644
--- a/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/ContinuousFileProcessingMigrationTest.java
+++ b/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/ContinuousFileProcessingMigrationTest.java
@@ -203,17 +203,10 @@ public class ContinuousFileProcessingMigrationTest {
// compare if the results contain what they should contain and also if
// they are the same, as they should.
- if (testMigrateVersion == MigrationVersion.v1_1) {
- Assert.assertTrue(testHarness.getOutput().contains(new StreamRecord<>(createSplitFromTimestampedSplit(split1))));
- Assert.assertTrue(testHarness.getOutput().contains(new StreamRecord<>(createSplitFromTimestampedSplit(split2))));
- Assert.assertTrue(testHarness.getOutput().contains(new StreamRecord<>(createSplitFromTimestampedSplit(split3))));
- Assert.assertTrue(testHarness.getOutput().contains(new StreamRecord<>(createSplitFromTimestampedSplit(split4))));
- } else {
- Assert.assertTrue(testHarness.getOutput().contains(new StreamRecord<>(split1)));
- Assert.assertTrue(testHarness.getOutput().contains(new StreamRecord<>(split2)));
- Assert.assertTrue(testHarness.getOutput().contains(new StreamRecord<>(split3)));
- Assert.assertTrue(testHarness.getOutput().contains(new StreamRecord<>(split4)));
- }
+ Assert.assertTrue(testHarness.getOutput().contains(new StreamRecord<>(split1)));
+ Assert.assertTrue(testHarness.getOutput().contains(new StreamRecord<>(split2)));
+ Assert.assertTrue(testHarness.getOutput().contains(new StreamRecord<>(split3)));
+ Assert.assertTrue(testHarness.getOutput().contains(new StreamRecord<>(split4)));
}
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-fs-tests/src/test/resources/monitoring-function-migration-test-1482144479339-flink1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-fs-tests/src/test/resources/monitoring-function-migration-test-1482144479339-flink1.1-snapshot b/flink-fs-tests/src/test/resources/monitoring-function-migration-test-1482144479339-flink1.1-snapshot
deleted file mode 100644
index 17eba99..0000000
Binary files a/flink-fs-tests/src/test/resources/monitoring-function-migration-test-1482144479339-flink1.1-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-fs-tests/src/test/resources/reader-migration-test-flink1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-fs-tests/src/test/resources/reader-migration-test-flink1.1-snapshot b/flink-fs-tests/src/test/resources/reader-migration-test-flink1.1-snapshot
deleted file mode 100644
index e47ebbd..0000000
Binary files a/flink-fs-tests/src/test/resources/reader-migration-test-flink1.1-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/migration/MigrationVersion.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/migration/MigrationVersion.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/migration/MigrationVersion.java
index 7b5a85e..eac669b 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/migration/MigrationVersion.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/migration/MigrationVersion.java
@@ -26,7 +26,6 @@ public enum MigrationVersion {
// NOTE: the version strings must not change,
// as they are used to locate snapshot file paths
- v1_1("1.1"),
v1_2("1.2"),
v1_3("1.3"),
v1_4("1.4"),
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-streaming-java/src/test/resources/win-op-migration-test-accum-aligned-flink1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-accum-aligned-flink1.1-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-accum-aligned-flink1.1-snapshot
deleted file mode 100644
index 08ee86c..0000000
Binary files a/flink-streaming-java/src/test/resources/win-op-migration-test-accum-aligned-flink1.1-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-streaming-java/src/test/resources/win-op-migration-test-aggr-aligned-flink1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-aggr-aligned-flink1.1-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-aggr-aligned-flink1.1-snapshot
deleted file mode 100644
index c086a91..0000000
Binary files a/flink-streaming-java/src/test/resources/win-op-migration-test-aggr-aligned-flink1.1-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-streaming-java/src/test/resources/win-op-migration-test-apply-event-time-flink1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-apply-event-time-flink1.1-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-apply-event-time-flink1.1-snapshot
deleted file mode 100644
index 02f0df2..0000000
Binary files a/flink-streaming-java/src/test/resources/win-op-migration-test-apply-event-time-flink1.1-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-streaming-java/src/test/resources/win-op-migration-test-apply-processing-time-flink1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-apply-processing-time-flink1.1-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-apply-processing-time-flink1.1-snapshot
deleted file mode 100644
index 78963d6..0000000
Binary files a/flink-streaming-java/src/test/resources/win-op-migration-test-apply-processing-time-flink1.1-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-event-time-flink1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-event-time-flink1.1-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-event-time-flink1.1-snapshot
deleted file mode 100644
index ed428be..0000000
Binary files a/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-event-time-flink1.1-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-processing-time-flink1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-processing-time-flink1.1-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-processing-time-flink1.1-snapshot
deleted file mode 100644
index 9945be6..0000000
Binary files a/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-processing-time-flink1.1-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-flink1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-flink1.1-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-flink1.1-snapshot
deleted file mode 100644
index 5f42359..0000000
Binary files a/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-flink1.1-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-mint-flink1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-mint-flink1.1-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-mint-flink1.1-snapshot
deleted file mode 100644
index 72e8d90..0000000
Binary files a/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-mint-flink1.1-snapshot and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-rocksdb-savepoint
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-rocksdb-savepoint b/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-rocksdb-savepoint
deleted file mode 100644
index e63038b..0000000
Binary files a/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-rocksdb-savepoint and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/72f0eb1e/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-savepoint
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-savepoint b/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-savepoint
deleted file mode 100644
index f2f6dcd..0000000
Binary files a/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-savepoint and /dev/null differ