This is an automated email from the ASF dual-hosted git repository.
snuyanzin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new c48b1f1746d [hotfix][e2e] Submit all TPC-H queries in one SQL Client
session in test_tpch.sh
c48b1f1746d is described below
commit c48b1f1746dfd8d38858fd35468f5ab90797513d
Author: Sergey Nuyanzin <[email protected]>
AuthorDate: Tue Nov 3 00:07:38 2026 +0100
[hotfix][e2e] Submit all TPC-H queries in one SQL Client session in
test_tpch.sh
---
flink-end-to-end-tests/test-scripts/test_tpch.sh | 46 ++++++++++++------------
1 file changed, 23 insertions(+), 23 deletions(-)
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 43be38a8c49..479b425bb01 100755
--- a/flink-end-to-end-tests/test-scripts/test_tpch.sh
+++ b/flink-end-to-end-tests/test-scripts/test_tpch.sh
@@ -61,41 +61,41 @@ mkdir -p "$TEMP_DIR_FOR_SUBMITTING"
SOURCES_SQL=$(cat "$TPCH_DATA_DIR/source.sql")
SOURCES_SQL=${SOURCES_SQL//\$TABLE_DIR/"$TABLE_DIR"}
-for i in {1..22}
-do
- echo "Running query #$i..."
-
- SINK_SQL=$(cat "$TPCH_DATA_DIR/sink/q${i}.sql")
- SINK_SQL=${SINK_SQL//\$RESULT_DIR/"$RESULT_DIR"}
+# all queries are submitted in one SQL Client session to avoid a client
startup per query
+TEMP_FILE_FOR_SUBMITTING="$TEMP_DIR_FOR_SUBMITTING/tpch.sql"
+rm -f "$TEMP_FILE_FOR_SUBMITTING"
- # the file submitted to SQL Client
- TEMP_FILE_FOR_SUBMITTING="$TEMP_DIR_FOR_SUBMITTING/q$i.sql"
- # clear first
- rm -f $TEMP_FILE_FOR_SUBMITTING
-
-# cat > "$INIT_SQL" << EOF
- cat > "$TEMP_FILE_FOR_SUBMITTING" << EOF
+cat > "$TEMP_FILE_FOR_SUBMITTING" << EOF
${SOURCES_SQL}
-${SINK_SQL}
SET execution.runtime-mode=batch;
SET parallelism.default=2;
+SET table.dml-sync=true;
EOF
+for i in {1..22}
+do
+ SINK_SQL=$(cat "$TPCH_DATA_DIR/sink/q${i}.sql")
+ echo "${SINK_SQL//\$RESULT_DIR/"$RESULT_DIR"}" >>
"$TEMP_FILE_FOR_SUBMITTING"
+
if [[ -e "$MODIFIED_QUERY_DIR/q$i.sql" ]]
then
- SQL_STATEMENT="INSERT INTO q$i $(cat "$MODIFIED_QUERY_DIR/q$i.sql")"
+ QUERY_FILE="$MODIFIED_QUERY_DIR/q$i.sql"
else
- SQL_STATEMENT="INSERT INTO q$i $(cat "$ORIGIN_QUERY_DIR/q$i.sql")"
+ QUERY_FILE="$ORIGIN_QUERY_DIR/q$i.sql"
fi
- echo "$SQL_STATEMENT" >> "$TEMP_FILE_FOR_SUBMITTING"
-
- JOB_ID=$("$FLINK_DIR/bin/sql-client.sh" \
- -f "$TEMP_FILE_FOR_SUBMITTING" | grep "Job ID:" | sed 's/.* //g')
-
- echo "Job ID: $JOB_ID"
+ {
+ echo "INSERT INTO q$i"
+ sed -e 's/;[[:space:]]*$//' "$QUERY_FILE"
+ echo ";"
+ } >> "$TEMP_FILE_FOR_SUBMITTING"
+done
- wait_job_terminal_state "$JOB_ID" "FINISHED"
+echo "Running TPC-H queries..."
+"$FLINK_DIR/bin/sql-client.sh" -f "$TEMP_FILE_FOR_SUBMITTING"
+for i in {1..22}
+do
+ echo "Checking result of query #$i..."
java -cp "$TARGET_DIR/TpchTestProgram.jar"
org.apache.flink.table.tpch.TpchResultComparator "$EXPECTED_DIR/q$i.csv"
"$RESULT_DIR/q$i"
done
