You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/05/19 22:30:19 UTC
[3/5] flink git commit: [hotfix][rat] Add exclusion for all test
snapshots/savepoints
[hotfix][rat] Add exclusion for all test snapshots/savepoints
This closes #3854.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/17a4bb14
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/17a4bb14
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/17a4bb14
Branch: refs/heads/release-1.3
Commit: 17a4bb14821fd107131e1051b57326e43d660195
Parents: c62553c
Author: zentol <ch...@apache.org>
Authored: Wed May 10 16:50:18 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Fri May 19 21:09:08 2017 +0200
----------------------------------------------------------------------
...inkKafkaConsumerBaseFrom11MigrationTest.java | 6 +++---
...inkKafkaConsumerBaseFrom12MigrationTest.java | 8 ++++----
...migration-test-flink1.1-empty-state-snapshot | Bin 0 -> 468 bytes
...migration-test-flink1.1-snapshot-empty-state | Bin 468 -> 0 bytes
...migration-test-flink1.2-empty-state-snapshot | Bin 0 -> 240 bytes
...migration-test-flink1.2-snapshot-empty-state | Bin 240 -> 0 bytes
.../FlinkKinesisConsumerMigrationTest.java | 2 +-
...sumer-migration-test-flink1.1-empty-snapshot | Bin 0 -> 468 bytes
...sumer-migration-test-flink1.1-snapshot-empty | Bin 468 -> 0 bytes
.../cep/operator/CEPMigration11to13Test.java | 10 +++++-----
.../test/resources/cep-branching-1_2-snapshot | Bin 0 -> 6736 bytes
.../test/resources/cep-branching-snapshot-1.2 | Bin 6736 -> 0 bytes
.../src/test/resources/cep-keyed-1_1-snapshot | Bin 0 -> 5612 bytes
.../src/test/resources/cep-keyed-snapshot-1.1 | Bin 5612 -> 0 bytes
.../test/resources/cep-non-keyed-1.1-snapshot | Bin 0 -> 3274 bytes
.../test/resources/cep-non-keyed-snapshot-1.1 | Bin 3274 -> 0 bytes
.../resources/cep-single-pattern-1.2-snapshot | Bin 0 -> 3311 bytes
.../resources/cep-single-pattern-snapshot-1.2 | Bin 3311 -> 0 bytes
.../test/resources/cep-starting-1.2-snapshot | Bin 0 -> 6526 bytes
.../test/resources/cep-starting-snapshot-1.2 | Bin 6526 -> 0 bytes
...atefulJobSavepointFrom11MigrationITCase.java | 4 ++--
...atefulJobSavepointFrom12MigrationITCase.java | 4 ++--
...-migration-itcase-flink1.1-rocksdb-savepoint | Bin 0 -> 22283 bytes
...-migration-itcase-flink1.1-savepoint-rocksdb | Bin 22283 -> 0 bytes
...-migration-itcase-flink1.2-rocksdb-savepoint | Bin 0 -> 25256 bytes
...-migration-itcase-flink1.2-savepoint-rocksdb | Bin 25256 -> 0 bytes
pom.xml | 19 ++-----------------
27 files changed, 19 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseFrom11MigrationTest.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseFrom11MigrationTest.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseFrom11MigrationTest.java
index 7cc1f9c..c07ebd5 100644
--- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseFrom11MigrationTest.java
+++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseFrom11MigrationTest.java
@@ -67,7 +67,7 @@ public class FlinkKafkaConsumerBaseFrom11MigrationTest {
testHarness.setup();
// restore state from binary snapshot file using legacy method
testHarness.initializeStateFromLegacyCheckpoint(
- getResourceFilename("kafka-consumer-migration-test-flink1.1-snapshot-empty-state"));
+ getResourceFilename("kafka-consumer-migration-test-flink1.1-empty-state-snapshot"));
testHarness.open();
// assert that no partitions were found and is empty
@@ -101,10 +101,10 @@ public class FlinkKafkaConsumerBaseFrom11MigrationTest {
testHarness.setup();
// restore state from binary snapshot file using legacy method
testHarness.initializeStateFromLegacyCheckpoint(
- getResourceFilename("kafka-consumer-migration-test-flink1.1-snapshot-empty-state"));
+ getResourceFilename("kafka-consumer-migration-test-flink1.1-empty-state-snapshot"));
testHarness.open();
- // the expected state in "kafka-consumer-migration-test-flink1.1-snapshot-empty-state";
+ // the expected state in "kafka-consumer-migration-test-flink1.1-empty-state-snapshot";
// since the state is empty, the consumer should reflect on the startup mode to determine start offsets.
final HashMap<KafkaTopicPartition, Long> expectedSubscribedPartitionsWithStartOffsets = new HashMap<>();
expectedSubscribedPartitionsWithStartOffsets.put(new KafkaTopicPartition("abc", 13), KafkaTopicPartitionStateSentinel.GROUP_OFFSET);
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseFrom12MigrationTest.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseFrom12MigrationTest.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseFrom12MigrationTest.java
index 6414a12..f11bf9f 100644
--- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseFrom12MigrationTest.java
+++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseFrom12MigrationTest.java
@@ -76,7 +76,7 @@ public class FlinkKafkaConsumerBaseFrom12MigrationTest {
writeSnapshot("src/test/resources/kafka-consumer-migration-test-flink1.2-snapshot", PARTITION_STATE);
final HashMap<KafkaTopicPartition, Long> emptyState = new HashMap<>();
- writeSnapshot("src/test/resources/kafka-consumer-migration-test-flink1.2-snapshot-empty-state", emptyState);
+ writeSnapshot("src/test/resources/kafka-consumer-migration-test-flink1.2-empty-state-snapshot", emptyState);
}
private void writeSnapshot(String path, HashMap<KafkaTopicPartition, Long> state) throws Exception {
@@ -166,7 +166,7 @@ public class FlinkKafkaConsumerBaseFrom12MigrationTest {
// restore state from binary snapshot file
testHarness.initializeState(
OperatorSnapshotUtil.readStateHandle(
- OperatorSnapshotUtil.getResourceFilename("kafka-consumer-migration-test-flink1.2-snapshot-empty-state")));
+ OperatorSnapshotUtil.getResourceFilename("kafka-consumer-migration-test-flink1.2-empty-state-snapshot")));
testHarness.open();
// assert that no partitions were found and is empty
@@ -202,10 +202,10 @@ public class FlinkKafkaConsumerBaseFrom12MigrationTest {
// restore state from binary snapshot file
testHarness.initializeState(
OperatorSnapshotUtil.readStateHandle(
- OperatorSnapshotUtil.getResourceFilename("kafka-consumer-migration-test-flink1.2-snapshot-empty-state")));
+ OperatorSnapshotUtil.getResourceFilename("kafka-consumer-migration-test-flink1.2-empty-state-snapshot")));
testHarness.open();
- // the expected state in "kafka-consumer-migration-test-flink1.2-snapshot-empty-state";
+ // the expected state in "kafka-consumer-migration-test-flink1.2-empty-state-snapshot";
// since the state is empty, the consumer should reflect on the startup mode to determine start offsets.
final HashMap<KafkaTopicPartition, Long> expectedSubscribedPartitionsWithStartOffsets = new HashMap<>();
for (KafkaTopicPartition partition : PARTITION_STATE.keySet()) {
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/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
new file mode 100644
index 0000000..f4dd96d
Binary files /dev/null and b/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-empty-state-snapshot differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-snapshot-empty-state
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-snapshot-empty-state b/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-snapshot-empty-state
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-snapshot-empty-state and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.2-empty-state-snapshot
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.2-empty-state-snapshot b/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.2-empty-state-snapshot
new file mode 100644
index 0000000..45047ee
Binary files /dev/null and b/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.2-empty-state-snapshot differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.2-snapshot-empty-state
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.2-snapshot-empty-state b/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.2-snapshot-empty-state
deleted file mode 100644
index 45047ee..0000000
Binary files a/flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.2-snapshot-empty-state and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisConsumerMigrationTest.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisConsumerMigrationTest.java b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisConsumerMigrationTest.java
index 7629f9d..ec9a9b5 100644
--- a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisConsumerMigrationTest.java
+++ b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisConsumerMigrationTest.java
@@ -66,7 +66,7 @@ public class FlinkKinesisConsumerMigrationTest {
testHarness.setup();
// restore state from binary snapshot file using legacy method
testHarness.initializeStateFromLegacyCheckpoint(
- getResourceFilename("kinesis-consumer-migration-test-flink1.1-snapshot-empty"));
+ getResourceFilename("kinesis-consumer-migration-test-flink1.1-empty-snapshot"));
testHarness.open();
// assert that no state was restored
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-connectors/flink-connector-kinesis/src/test/resources/kinesis-consumer-migration-test-flink1.1-empty-snapshot
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kinesis/src/test/resources/kinesis-consumer-migration-test-flink1.1-empty-snapshot b/flink-connectors/flink-connector-kinesis/src/test/resources/kinesis-consumer-migration-test-flink1.1-empty-snapshot
new file mode 100644
index 0000000..f4dd96d
Binary files /dev/null and b/flink-connectors/flink-connector-kinesis/src/test/resources/kinesis-consumer-migration-test-flink1.1-empty-snapshot differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-connectors/flink-connector-kinesis/src/test/resources/kinesis-consumer-migration-test-flink1.1-snapshot-empty
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kinesis/src/test/resources/kinesis-consumer-migration-test-flink1.1-snapshot-empty b/flink-connectors/flink-connector-kinesis/src/test/resources/kinesis-consumer-migration-test-flink1.1-snapshot-empty
deleted file mode 100644
index f4dd96d..0000000
Binary files a/flink-connectors/flink-connector-kinesis/src/test/resources/kinesis-consumer-migration-test-flink1.1-snapshot-empty and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPMigration11to13Test.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPMigration11to13Test.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPMigration11to13Test.java
index 824df2d..255b8c2 100644
--- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPMigration11to13Test.java
+++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPMigration11to13Test.java
@@ -90,7 +90,7 @@ public class CEPMigration11to13Test {
// simulate snapshot/restore with empty element queue but NFA state
StreamTaskState snapshot = harness.snapshot(1, 1);
FileOutputStream out = new FileOutputStream(
- "src/test/resources/cep-keyed-snapshot-1.1");
+ "src/test/resources/cep-keyed-1_1-snapshot");
ObjectOutputStream oos = new ObjectOutputStream(out);
oos.writeObject(snapshot);
out.close();
@@ -109,7 +109,7 @@ public class CEPMigration11to13Test {
BasicTypeInfo.INT_TYPE_INFO);
harness.setup();
- harness.initializeStateFromLegacyCheckpoint(getResourceFilename("cep-keyed-snapshot-1.1"));
+ harness.initializeStateFromLegacyCheckpoint(getResourceFilename("cep-keyed-1_1-snapshot"));
harness.open();
harness.processElement(new StreamRecord<Event>(middleEvent, 3));
@@ -209,7 +209,7 @@ public class CEPMigration11to13Test {
// simulate snapshot/restore with empty element queue but NFA state
StreamTaskState snapshot = harness.snapshot(1, 1);
FileOutputStream out = new FileOutputStream(
- "src/test/resources/cep-non-keyed-snapshot-1.1");
+ "src/test/resources/cep-non-keyed-1.1-snapshot");
ObjectOutputStream oos = new ObjectOutputStream(out);
oos.writeObject(snapshot);
out.close();
@@ -230,7 +230,7 @@ public class CEPMigration11to13Test {
BasicTypeInfo.BYTE_TYPE_INFO);
harness.setup();
- harness.initializeStateFromLegacyCheckpoint(getResourceFilename("cep-non-keyed-snapshot-1.1"));
+ harness.initializeStateFromLegacyCheckpoint(getResourceFilename("cep-non-keyed-1.1-snapshot"));
harness.open();
harness.processElement(new StreamRecord<Event>(middleEvent, 3));
@@ -361,4 +361,4 @@ public class CEPMigration11to13Test {
return value.getName().equals("end");
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-libraries/flink-cep/src/test/resources/cep-branching-1_2-snapshot
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-branching-1_2-snapshot b/flink-libraries/flink-cep/src/test/resources/cep-branching-1_2-snapshot
new file mode 100644
index 0000000..47f710e
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/cep-branching-1_2-snapshot differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-libraries/flink-cep/src/test/resources/cep-branching-snapshot-1.2
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-branching-snapshot-1.2 b/flink-libraries/flink-cep/src/test/resources/cep-branching-snapshot-1.2
deleted file mode 100644
index 47f710e..0000000
Binary files a/flink-libraries/flink-cep/src/test/resources/cep-branching-snapshot-1.2 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-libraries/flink-cep/src/test/resources/cep-keyed-1_1-snapshot
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-keyed-1_1-snapshot b/flink-libraries/flink-cep/src/test/resources/cep-keyed-1_1-snapshot
new file mode 100644
index 0000000..277de1d
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/cep-keyed-1_1-snapshot differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-libraries/flink-cep/src/test/resources/cep-keyed-snapshot-1.1
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-keyed-snapshot-1.1 b/flink-libraries/flink-cep/src/test/resources/cep-keyed-snapshot-1.1
deleted file mode 100644
index 277de1d..0000000
Binary files a/flink-libraries/flink-cep/src/test/resources/cep-keyed-snapshot-1.1 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-libraries/flink-cep/src/test/resources/cep-non-keyed-1.1-snapshot
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-non-keyed-1.1-snapshot b/flink-libraries/flink-cep/src/test/resources/cep-non-keyed-1.1-snapshot
new file mode 100644
index 0000000..b5ca51e
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/cep-non-keyed-1.1-snapshot differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-libraries/flink-cep/src/test/resources/cep-non-keyed-snapshot-1.1
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-non-keyed-snapshot-1.1 b/flink-libraries/flink-cep/src/test/resources/cep-non-keyed-snapshot-1.1
deleted file mode 100644
index b5ca51e..0000000
Binary files a/flink-libraries/flink-cep/src/test/resources/cep-non-keyed-snapshot-1.1 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-libraries/flink-cep/src/test/resources/cep-single-pattern-1.2-snapshot
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-single-pattern-1.2-snapshot b/flink-libraries/flink-cep/src/test/resources/cep-single-pattern-1.2-snapshot
new file mode 100644
index 0000000..255f46a
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/cep-single-pattern-1.2-snapshot differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-libraries/flink-cep/src/test/resources/cep-single-pattern-snapshot-1.2
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-single-pattern-snapshot-1.2 b/flink-libraries/flink-cep/src/test/resources/cep-single-pattern-snapshot-1.2
deleted file mode 100644
index 255f46a..0000000
Binary files a/flink-libraries/flink-cep/src/test/resources/cep-single-pattern-snapshot-1.2 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-libraries/flink-cep/src/test/resources/cep-starting-1.2-snapshot
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-starting-1.2-snapshot b/flink-libraries/flink-cep/src/test/resources/cep-starting-1.2-snapshot
new file mode 100644
index 0000000..c41f6c2
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/cep-starting-1.2-snapshot differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-libraries/flink-cep/src/test/resources/cep-starting-snapshot-1.2
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-starting-snapshot-1.2 b/flink-libraries/flink-cep/src/test/resources/cep-starting-snapshot-1.2
deleted file mode 100644
index c41f6c2..0000000
Binary files a/flink-libraries/flink-cep/src/test/resources/cep-starting-snapshot-1.2 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointFrom11MigrationITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointFrom11MigrationITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointFrom11MigrationITCase.java
index 4d94d25..4221670 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointFrom11MigrationITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointFrom11MigrationITCase.java
@@ -129,7 +129,7 @@ public class StatefulJobSavepointFrom11MigrationITCase extends SavepointMigratio
executeAndSavepoint(
env,
- "src/test/resources/stateful-udf-migration-itcase-flink1.1-savepoint-rocksdb",
+ "src/test/resources/stateful-udf-migration-itcase-flink1.1-rocksdb-savepoint",
new Tuple2<>(EXPECTED_ELEMENTS_ACCUMULATOR, NUM_SOURCE_ELEMENTS));
}
@@ -198,7 +198,7 @@ public class StatefulJobSavepointFrom11MigrationITCase extends SavepointMigratio
restoreAndExecute(
env,
- getResourceFilename("stateful-udf-migration-itcase-flink1.1-savepoint-rocksdb"),
+ getResourceFilename("stateful-udf-migration-itcase-flink1.1-rocksdb-savepoint"),
new Tuple2<>(SUCCESSFUL_CHECK_ACCUMULATOR, EXPECTED_SUCCESSFUL_CHECKS));
}
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointFrom12MigrationITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointFrom12MigrationITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointFrom12MigrationITCase.java
index e60cb5d..5f03195 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointFrom12MigrationITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointFrom12MigrationITCase.java
@@ -144,7 +144,7 @@ public class StatefulJobSavepointFrom12MigrationITCase extends SavepointMigratio
executeAndSavepoint(
env,
- "src/test/resources/stateful-udf-migration-itcase-flink1.2-savepoint-rocksdb",
+ "src/test/resources/stateful-udf-migration-itcase-flink1.2-rocksdb-savepoint",
new Tuple2<>(AccumulatorCountingSink.NUM_ELEMENTS_ACCUMULATOR, NUM_SOURCE_ELEMENTS));
}
@@ -228,7 +228,7 @@ public class StatefulJobSavepointFrom12MigrationITCase extends SavepointMigratio
restoreAndExecute(
env,
- getResourceFilename("stateful-udf-migration-itcase-flink1.2-savepoint-rocksdb"),
+ getResourceFilename("stateful-udf-migration-itcase-flink1.2-rocksdb-savepoint"),
new Tuple2<>(CheckingRestoringSource.SUCCESSFUL_RESTORE_CHECK_ACCUMULATOR, 1),
new Tuple2<>(CheckingRestoringFlatMap.SUCCESSFUL_RESTORE_CHECK_ACCUMULATOR, NUM_SOURCE_ELEMENTS),
new Tuple2<>(CheckingRestoringFlatMapWithKeyedState.SUCCESSFUL_RESTORE_CHECK_ACCUMULATOR, NUM_SOURCE_ELEMENTS),
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/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
new file mode 100644
index 0000000..e63038b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-rocksdb-savepoint differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-savepoint-rocksdb
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-savepoint-rocksdb b/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-savepoint-rocksdb
deleted file mode 100644
index e63038b..0000000
Binary files a/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-savepoint-rocksdb and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.2-rocksdb-savepoint
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.2-rocksdb-savepoint b/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.2-rocksdb-savepoint
new file mode 100644
index 0000000..548993f
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.2-rocksdb-savepoint differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.2-savepoint-rocksdb
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.2-savepoint-rocksdb b/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.2-savepoint-rocksdb
deleted file mode 100644
index 548993f..0000000
Binary files a/flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.2-savepoint-rocksdb and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink/blob/17a4bb14/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e37bbfe..cda1b9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -951,23 +951,8 @@ under the License.
<exclude>flink-libraries/flink-table/src/test/scala/resources/*.out</exclude>
<!-- snapshots -->
- <exclude>flink-connectors/flink-connector-filesystem/src/test/resources/rolling-sink-migration-test-flink1.1-snapshot</exclude>
- <exclude>flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-snapshot</exclude>
- <exclude>flink-connectors/flink-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.1-snapshot-empty-state</exclude>
- <exclude>flink-fs-tests/src/test/resources/monitoring-function-migration-test-1482144479339-flink1.1-snapshot</exclude>
- <exclude>flink-fs-tests/src/test/resources/reader-migration-test-flink1.1-snapshot</exclude>
- <exclude>flink-streaming-java/src/test/resources/win-op-migration-test-accum-aligned-flink1.1-snapshot</exclude>
- <exclude>flink-streaming-java/src/test/resources/win-op-migration-test-aggr-aligned-flink1.1-snapshot</exclude>
- <exclude>flink-streaming-java/src/test/resources/win-op-migration-test-apply-event-time-flink1.1-snapshot</exclude>
- <exclude>flink-streaming-java/src/test/resources/win-op-migration-test-apply-processing-time-flink1.1-snapshot</exclude>
- <exclude>flink-streaming-java/src/test/resources/win-op-migration-test-reduce-event-time-flink1.1-snapshot</exclude>
- <exclude>flink-streaming-java/src/test/resources/win-op-migration-test-reduce-processing-time-flink1.1-snapshot</exclude>
- <exclude>flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-flink1.1-snapshot</exclude>
- <exclude>flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-mint-flink1.1-snapshot</exclude>
- <exclude>flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-savepoint</exclude>
- <exclude>flink-tests/src/test/resources/stateful-udf-migration-itcase-flink1.1-savepoint-rocksdb</exclude>
- <exclude>flink-libraries/flink-cep/src/test/resources/cep-keyed-snapshot-1.1</exclude>
- <exclude>flink-libraries/flink-cep/src/test/resources/cep-non-keyed-snapshot-1.1</exclude>
+ <exclude>**/src/test/resources/*-snapshot</exclude>
+ <exclude>**/src/test/resources/*-savepoint</exclude>
<!-- TweetInputFormat Test Data-->
<exclude>flink-contrib/flink-tweet-inputformat/src/main/resources/HashTagTweetSample.json</exclude>