This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 362522299 [Bug] Error happened when releasing application if don't
need to be rebuilt (#3712)
362522299 is described below
commit 362522299c5ddc56f041a67a3cd94b7e2d0db99e
Author: yaolei <[email protected]>
AuthorDate: Fri May 17 08:25:09 2024 +0800
[Bug] Error happened when releasing application if don't need to be
rebuilt (#3712)
---
.../src/main/assembly/script/schema/mysql-schema.sql | 1 +
.../src/main/assembly/script/schema/pgsql-schema.sql | 3 ++-
.../streampark-console-webapp/src/locales/lang/en/flink/app.ts | 2 +-
.../src/locales/lang/en/flink/project.ts | 2 +-
.../streampark-console-webapp/src/locales/lang/en/routes/basic.ts | 4 ++--
.../apache/streampark/flink/core/FlinkStreamingInitializer.scala | 2 +-
.../org/apache/streampark/flink/core/FlinkTableInitializer.scala | 8 ++++----
7 files changed, 12 insertions(+), 10 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
index 94b8c3174..a7b2c020e 100644
---
a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
+++
b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
@@ -174,6 +174,7 @@ create table `t_flink_log` (
`exception` text collate utf8mb4_general_ci,
`option_time` datetime default null,
`option_name` tinyint default null,
+ `user_id` bigint default null,
primary key (`id`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4
collate=utf8mb4_general_ci;
diff --git
a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
index c3eb9dca3..cb310abe5 100644
---
a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
+++
b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
@@ -415,7 +415,8 @@ create table "public"."t_flink_log" (
"success" boolean,
"exception" text collate "pg_catalog"."default",
"option_time" timestamp(6),
- "option_name" int2
+ "option_name" int2,
+ "user_id" int8
)
;
alter table "public"."t_flink_log" add constraint "t_flink_log_pkey" primary
key ("id");
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
index 11d30669f..3126f4940 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
@@ -165,7 +165,7 @@ export default {
errorStack: 'Error Stack',
logTitle: 'Start Log : Job Name [ {0} ]',
refreshTime: 'last refresh time',
- refresh: 'refresh',
+ refresh: 'Refresh',
start: 'Start Job',
stop: 'Stop Job',
savepoint: 'Trigger Savepoint',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/project.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/project.ts
index 77c160978..14ce8ab7c 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/project.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/project.ts
@@ -25,7 +25,7 @@ export default {
successful: 'SUCCESSFUL',
failed: 'FAILED',
},
- searchPlaceholder: 'please enter a keyword search',
+ searchPlaceholder: 'Please enter a keyword to search',
form: {
projectName: 'Project Name',
projectNamePlaceholder: 'Please input project name',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/routes/basic.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/routes/basic.ts
index 65c8fb883..4d02af176 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/routes/basic.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/routes/basic.ts
@@ -18,7 +18,7 @@ export default {
login: 'Login',
errorLogList: 'Error Log',
notice: {
- message: 'notification message',
- exception: 'Abnormal alarm',
+ message: 'Notification Message',
+ exception: 'Abnormal Alarm',
},
};
diff --git
a/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/src/main/scala/org/apache/streampark/flink/core/FlinkStreamingInitializer.scala
b/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/src/main/scala/org/apache/streampark/flink/core/FlinkStreamingInitializer.scala
index bfb4be1cc..b974be017 100644
---
a/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/src/main/scala/org/apache/streampark/flink/core/FlinkStreamingInitializer.scala
+++
b/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/src/main/scala/org/apache/streampark/flink/core/FlinkStreamingInitializer.scala
@@ -83,7 +83,7 @@ private[flink] class FlinkStreamingInitializer(args:
Array[String], apiType: Api
val config = argsMap.get(KEY_APP_CONF(), null) match {
case null | "" =>
throw new ExceptionInInitializerError(
- "[StreamPark] Usage:can't fond config,please set \"--conf $path \"
in main arguments")
+ "[StreamPark] Usage:can't find config,please set \"--conf $path \"
in main arguments")
case file => file
}
val configMap = parseConfig(config)
diff --git
a/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/src/main/scala/org/apache/streampark/flink/core/FlinkTableInitializer.scala
b/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/src/main/scala/org/apache/streampark/flink/core/FlinkTableInitializer.scala
index ce8c93823..80f945c57 100644
---
a/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/src/main/scala/org/apache/streampark/flink/core/FlinkTableInitializer.scala
+++
b/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/src/main/scala/org/apache/streampark/flink/core/FlinkTableInitializer.scala
@@ -96,7 +96,7 @@ private[flink] class FlinkTableInitializer(args:
Array[String], apiType: ApiType
} else {
useBlinkPlanner.setAccessible(true)
useBlinkPlanner.invoke(builder)
- logInfo("blinkPlanner will be use.")
+ logInfo("blinkPlanner will be used.")
}
case PlannerType.OLD =>
val useOldPlanner =
Try(builder.getClass.getDeclaredMethod("useOldPlanner")).getOrElse(null)
@@ -105,14 +105,14 @@ private[flink] class FlinkTableInitializer(args:
Array[String], apiType: ApiType
} else {
useOldPlanner.setAccessible(true)
useOldPlanner.invoke(builder)
- logInfo("useOldPlanner will be use.")
+ logInfo("useOldPlanner will be used.")
}
case PlannerType.ANY =>
val useAnyPlanner =
Try(builder.getClass.getDeclaredMethod("useAnyPlanner")).getOrElse(null)
if (useAnyPlanner == null) {
logWarn("useAnyPlanner deprecated")
} else {
- logInfo("useAnyPlanner will be use.")
+ logInfo("useAnyPlanner will be used.")
useAnyPlanner.setAccessible(true)
useAnyPlanner.invoke(builder)
}
@@ -180,7 +180,7 @@ private[flink] class FlinkTableInitializer(args:
Array[String], apiType: ApiType
val argsMap = ParameterTool.fromArgs(args)
argsMap.get(KEY_APP_CONF(), null) match {
case null | "" =>
- logWarn("Usage:can't fond config,you can set \"--conf $path \" in
main arguments")
+ logWarn("Usage:can't find config,you can set \"--conf $path \" in
main arguments")
val parameter =
ParameterTool.fromSystemProperties().mergeWith(argsMap)
FlinkConfiguration(parameter, new Configuration(), new
Configuration())
case file =>
