You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2018/10/31 10:24:47 UTC
[flink] 21/25: [FLINK-7811] Make Scala savepoint migration tests
Scala-version-independent
This is an automated email from the ASF dual-hosted git repository.
aljoscha pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit c53c9c7044af185c89c43e228a67974423b22689
Author: Aljoscha Krettek <al...@gmail.com>
AuthorDate: Fri Oct 19 18:48:13 2018 +0200
[FLINK-7811] Make Scala savepoint migration tests Scala-version-independent
---
...cala-udf-migration-itcase-flink1.2-jobmanager-savepoint} | Bin
...l-scala-udf-migration-itcase-flink1.2-rocksdb-savepoint} | Bin
.../_metadata | Bin
.../_metadata | Bin
.../_metadata | Bin
.../_metadata | Bin
.../_metadata | Bin
.../_metadata | Bin
.../_metadata | Bin
.../_metadata | Bin
.../_metadata | Bin
.../_metadata | Bin
.../migration/StatefulJobSavepointMigrationITCase.scala | 11 ++---------
.../StatefulJobWBroadcastStateMigrationITCase.scala | 8 +-------
14 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.2-jobmanager-savepoint b/flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.2-jobmanager-savepoint
similarity index 100%
rename from flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.2-jobmanager-savepoint
rename to flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.2-jobmanager-savepoint
diff --git a/flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.2-rocksdb-savepoint b/flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.2-rocksdb-savepoint
similarity index 100%
rename from flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.2-rocksdb-savepoint
rename to flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.2-rocksdb-savepoint
diff --git a/flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.3-jobmanager-savepoint/_metadata b/flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.3-jobmanager-savepoint/_metadata
similarity index 100%
rename from flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.3-jobmanager-savepoint/_metadata
rename to flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.3-jobmanager-savepoint/_metadata
diff --git a/flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.3-rocksdb-savepoint/_metadata b/flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.3-rocksdb-savepoint/_metadata
similarity index 100%
rename from flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.3-rocksdb-savepoint/_metadata
rename to flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.3-rocksdb-savepoint/_metadata
diff --git a/flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.4-jobmanager-savepoint/_metadata b/flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.4-jobmanager-savepoint/_metadata
similarity index 100%
rename from flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.4-jobmanager-savepoint/_metadata
rename to flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.4-jobmanager-savepoint/_metadata
diff --git a/flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.4-rocksdb-savepoint/_metadata b/flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.4-rocksdb-savepoint/_metadata
similarity index 100%
rename from flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.4-rocksdb-savepoint/_metadata
rename to flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.4-rocksdb-savepoint/_metadata
diff --git a/flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.6-jobmanager-savepoint/_metadata b/flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.6-jobmanager-savepoint/_metadata
similarity index 100%
rename from flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.6-jobmanager-savepoint/_metadata
rename to flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.6-jobmanager-savepoint/_metadata
diff --git a/flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata b/flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata
similarity index 100%
rename from flink-tests/src/test/resources/stateful-scala2.11-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata
rename to flink-tests/src/test/resources/stateful-scala-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast2.11-udf-migration-itcase-flink1.5-jobmanager-savepoint/_metadata b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.5-jobmanager-savepoint/_metadata
similarity index 100%
rename from flink-tests/src/test/resources/stateful-scala-with-broadcast2.11-udf-migration-itcase-flink1.5-jobmanager-savepoint/_metadata
rename to flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.5-jobmanager-savepoint/_metadata
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast2.11-udf-migration-itcase-flink1.5-rocksdb-savepoint/_metadata b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.5-rocksdb-savepoint/_metadata
similarity index 100%
rename from flink-tests/src/test/resources/stateful-scala-with-broadcast2.11-udf-migration-itcase-flink1.5-rocksdb-savepoint/_metadata
rename to flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.5-rocksdb-savepoint/_metadata
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast2.11-udf-migration-itcase-flink1.6-jobmanager-savepoint/_metadata b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.6-jobmanager-savepoint/_metadata
similarity index 100%
rename from flink-tests/src/test/resources/stateful-scala-with-broadcast2.11-udf-migration-itcase-flink1.6-jobmanager-savepoint/_metadata
rename to flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.6-jobmanager-savepoint/_metadata
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast2.11-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata
similarity index 100%
rename from flink-tests/src/test/resources/stateful-scala-with-broadcast2.11-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata
rename to flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata
diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala
index 6395b05..db9d5b4 100644
--- a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala
+++ b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala
@@ -67,11 +67,6 @@ object StatefulJobSavepointMigrationITCase {
val GENERATE_SAVEPOINT_VER: MigrationVersion = MigrationVersion.v1_4
val GENERATE_SAVEPOINT_BACKEND_TYPE: String = StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME
- val SCALA_VERSION: String = {
- val versionString = Properties.versionString.split(" ")(1)
- versionString.substring(0, versionString.lastIndexOf("."))
- }
-
val NUM_ELEMENTS = 4
}
@@ -115,9 +110,7 @@ class StatefulJobSavepointMigrationITCase(
executeAndSavepoint(
env,
- s"src/test/resources/stateful-scala" +
- s"${StatefulJobSavepointMigrationITCase.SCALA_VERSION}" +
- s"-udf-migration-itcase-flink" +
+ s"src/test/resources/stateful-scala-udf-migration-itcase-flink" +
s"${StatefulJobSavepointMigrationITCase.GENERATE_SAVEPOINT_VER}" +
s"-${StatefulJobSavepointMigrationITCase.GENERATE_SAVEPOINT_BACKEND_TYPE}-savepoint",
new Tuple2(
@@ -159,7 +152,7 @@ class StatefulJobSavepointMigrationITCase(
restoreAndExecute(
env,
SavepointMigrationTestBase.getResourceFilename(
- s"stateful-scala${StatefulJobSavepointMigrationITCase.SCALA_VERSION}" +
+ s"stateful-scala" +
s"-udf-migration-itcase-flink${migrationVersionAndBackend._1}" +
s"-${migrationVersionAndBackend._2}-savepoint"),
new Tuple2(
diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala
index 665254e..4f236e7 100644
--- a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala
+++ b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala
@@ -65,11 +65,6 @@ object StatefulJobWBroadcastStateMigrationITCase {
val GENERATE_SAVEPOINT_VER: MigrationVersion = MigrationVersion.v1_6
val GENERATE_SAVEPOINT_BACKEND_TYPE: String = StateBackendLoader.MEMORY_STATE_BACKEND_NAME
- val SCALA_VERSION: String = {
- val versionString = Properties.versionString.split(" ")(1)
- versionString.substring(0, versionString.lastIndexOf("."))
- }
-
val NUM_ELEMENTS = 4
}
@@ -138,7 +133,6 @@ class StatefulJobWBroadcastStateMigrationITCase(
executeAndSavepoint(
env,
s"src/test/resources/stateful-scala-with-broadcast" +
- s"${StatefulJobWBroadcastStateMigrationITCase.SCALA_VERSION}" +
s"-udf-migration-itcase-flink" +
s"${StatefulJobWBroadcastStateMigrationITCase.GENERATE_SAVEPOINT_VER}" +
s"-${StatefulJobWBroadcastStateMigrationITCase.GENERATE_SAVEPOINT_BACKEND_TYPE}-savepoint",
@@ -211,7 +205,7 @@ class StatefulJobWBroadcastStateMigrationITCase(
restoreAndExecute(
env,
SavepointMigrationTestBase.getResourceFilename(
- s"stateful-scala-with-broadcast${StatefulJobWBroadcastStateMigrationITCase.SCALA_VERSION}" +
+ s"stateful-scala-with-broadcast" +
s"-udf-migration-itcase-flink${migrationVersionAndBackend._1}" +
s"-${migrationVersionAndBackend._2}-savepoint"),
new Tuple2(