You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ku...@apache.org on 2019/08/06 14:03:08 UTC
[flink] branch master updated (6d05db7 -> 1e8202a)
This is an automated email from the ASF dual-hosted git repository.
kurt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.
from 6d05db7 [FLINK-9782][e2e] Harden bucketing sink e2e test.
new 648fc72 [FLINK-13592][e2e] Fix hardcoded flink version in tpch end-to-end test.
new 1e8202a [hotfix] Change the parallelism of tpch end-to-end test to 2.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
flink-end-to-end-tests/flink-tpch-test/pom.xml | 16 ++++++++++++++++
flink-end-to-end-tests/test-scripts/test_tpch.sh | 5 +++--
2 files changed, 19 insertions(+), 2 deletions(-)
[flink] 02/02: [hotfix] Change the parallelism of tpch end-to-end
test to 2.
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kurt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 1e8202aca88112cbdaa2588b4a47e8dae7bf94e2
Author: Kurt Young <ku...@apache.org>
AuthorDate: Tue Aug 6 20:57:12 2019 +0800
[hotfix] Change the parallelism of tpch end-to-end test to 2.
This can help to cover the situation that parallelism is higher than the slot number, since the testing cluster only have one task manager and contains only one slot.
---
flink-end-to-end-tests/test-scripts/test_tpch.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/flink-end-to-end-tests/test-scripts/test_tpch.sh b/flink-end-to-end-tests/test-scripts/test_tpch.sh
index ede1f0d..96b26a1 100755
--- a/flink-end-to-end-tests/test-scripts/test_tpch.sh
+++ b/flink-end-to-end-tests/test-scripts/test_tpch.sh
@@ -72,6 +72,7 @@ execution:
planner: blink
type: batch
result-mode: table
+ parallelism: 2
EOF
if [[ -e "$MODIFIED_QUERY_DIR/q$i.sql" ]]
[flink] 01/02: [FLINK-13592][e2e] Fix hardcoded flink version in
tpch end-to-end test.
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kurt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 648fc72253e73e22593eeab117105b59a2c3df90
Author: Kurt Young <ku...@apache.org>
AuthorDate: Tue Aug 6 14:52:55 2019 +0800
[FLINK-13592][e2e] Fix hardcoded flink version in tpch end-to-end test.
This closes #9368.
---
flink-end-to-end-tests/flink-tpch-test/pom.xml | 16 ++++++++++++++++
flink-end-to-end-tests/test-scripts/test_tpch.sh | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/flink-end-to-end-tests/flink-tpch-test/pom.xml b/flink-end-to-end-tests/flink-tpch-test/pom.xml
index e317f31..65e0d6f 100644
--- a/flink-end-to-end-tests/flink-tpch-test/pom.xml
+++ b/flink-end-to-end-tests/flink-tpch-test/pom.xml
@@ -54,6 +54,22 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>TpchTestProgram</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <finalName>TpchTestProgram</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/flink-end-to-end-tests/test-scripts/test_tpch.sh b/flink-end-to-end-tests/test-scripts/test_tpch.sh
index ab4c61c..ede1f0d 100755
--- a/flink-end-to-end-tests/test-scripts/test_tpch.sh
+++ b/flink-end-to-end-tests/test-scripts/test_tpch.sh
@@ -31,7 +31,7 @@ echo "Generating test data..."
TARGET_DIR="$END_TO_END_DIR/flink-tpch-test/target"
TPCH_DATA_DIR="$END_TO_END_DIR/test-scripts/test-data/tpch"
-java -cp "$TARGET_DIR/flink-tpch-test-1.10-SNAPSHOT.jar:$TARGET_DIR/lib/*" org.apache.flink.table.tpch.TpchDataGenerator "$SCALE" "$TARGET_DIR"
+java -cp "$TARGET_DIR/TpchTestProgram.jar:$TARGET_DIR/lib/*" org.apache.flink.table.tpch.TpchDataGenerator "$SCALE" "$TARGET_DIR"
################################################################################
# Prepare Flink
@@ -87,5 +87,5 @@ EOF
wait_job_terminal_state "$JOB_ID" "FINISHED"
- java -cp "$TARGET_DIR/flink-tpch-test-1.10-SNAPSHOT.jar" org.apache.flink.table.tpch.TpchResultComparator "$EXPECTED_DIR/q$i.csv" "$RESULT_DIR/q$i.csv"
+ java -cp "$TARGET_DIR/TpchTestProgram.jar" org.apache.flink.table.tpch.TpchResultComparator "$EXPECTED_DIR/q$i.csv" "$RESULT_DIR/q$i.csv"
done