Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FLINK-32374][table-planner] Fix the issue that ExecNodeGraphInternalPlan#writeToFile should support TRUNCATE_EXISTING for overwriting #22826

Merged
merged 1 commit into from
Jun 20, 2023
Merged

[FLINK-32374][table-planner] Fix the issue that ExecNodeGraphInternalPlan#writeToFile should support TRUNCATE_EXISTING for overwriting #22826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ...-planner/src/main/java/org/apache/flink/table/planner/plan/ExecNodeGraphInternalPlan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public void writeToFile(File file, boolean ignoreIfExists, boolean failIfExists)
file.toPath(),
serializedPlan.getBytes(StandardCharsets.UTF_8),
StandardOpenOption.CREATE,
StandardOpenOption.TRUNCATE_EXISTING,
StandardOpenOption.WRITE);
} catch (IOException e) {
throw new TableException("Cannot write the compiled plan to file '" + file + "'.", e);
Expand Down
9 changes: 8 additions & 1 deletion ...able/flink-table-planner/src/test/java/org/apache/flink/table/api/CompiledPlanITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
Expand Down Expand Up @@ -258,7 +259,8 @@ public void testCompilePlanOverwrite() throws Exception {
TableResult tableResult =
tableEnv.executeSql(
String.format(
"COMPILE PLAN '%s' FOR INSERT INTO sink SELECT * FROM src",
"COMPILE PLAN '%s' FOR INSERT INTO sink "
+ "SELECT IF(a > b, a, b) AS a, b + 1 AS b, SUBSTR(c, 1, 4) AS c FROM src WHERE a > 10",
planPath));

assertThat(tableResult).isEqualTo(TableResultInternal.TABLE_RESULT_OK);
Expand All @@ -271,6 +273,11 @@ public void testCompilePlanOverwrite() throws Exception {
"COMPILE PLAN '%s' FOR INSERT INTO sink SELECT a + 1, b + 1, CONCAT(c, '-something') FROM src",
planPath)))
.isEqualTo(TableResultInternal.TABLE_RESULT_OK);
assertThat(
TableTestUtil.isValidJson(
FileUtils.readFileToString(
planPath.toFile(), StandardCharsets.UTF_8)))
.isTrue();

tableEnv.executeSql(String.format("EXECUTE PLAN '%s'", planPath)).await();

Expand Down
14 changes: 14 additions & 0 deletions ...ink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/TableTestBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import org.apache.flink.api.common.typeinfo.{AtomicType, TypeInformation}
import org.apache.flink.api.java.typeutils.{PojoTypeInfo, RowTypeInfo, TupleTypeInfo}
import org.apache.flink.api.scala.typeutils.CaseClassTypeInfo
import org.apache.flink.configuration.ExecutionOptions
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonParseException
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode
import org.apache.flink.streaming.api.{environment, TimeCharacteristic}
import org.apache.flink.streaming.api.datastream.DataStream
Expand Down Expand Up @@ -1732,6 +1733,19 @@ object TableTestUtil {
jsonNode.toPrettyString
}

@throws[IOException]
def isValidJson(json: String): Boolean = {
try {
val parser = objectMapper.getFactory.createParser(json)
while (parser.nextToken() != null) {
// Do nothing, just parse the JSON string
}
true
} catch {
case _: JsonParseException => false
}
}

/**
* Stage {id} is ignored, because id keeps incrementing in test class while
* StreamExecutionEnvironment is up
Expand Down