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/streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new ca1a3fd85 application log query page bug fixed. (#4218)
ca1a3fd85 is described below
commit ca1a3fd85c4d5a9a894ab93777cf5f8dcc8deb25
Author: Aalron <[email protected]>
AuthorDate: Sun Mar 30 23:08:10 2025 +0800
application log query page bug fixed. (#4218)
* application log query page bug fixed.
---
.../src/main/assembly/script/schema/mysql-schema.sql | 3 ++-
.../src/main/assembly/script/schema/pgsql-schema.sql | 3 ++-
.../src/main/assembly/script/upgrade/mysql/2.2.0.sql | 1 +
.../src/main/assembly/script/upgrade/pgsql/2.2.2.sql | 3 +++
.../org/apache/streampark/console/core/entity/ApplicationLog.java | 2 +-
.../core/service/application/impl/ApplicationLogServiceImpl.java | 2 +-
.../service/application/impl/FlinkApplicationActionServiceImpl.java | 4 ++--
.../application/impl/FlinkApplicationBuildPipelineServiceImpl.java | 2 +-
.../service/application/impl/FlinkApplicationManageServiceImpl.java | 3 ++-
.../service/application/impl/SparkApplicationActionServiceImpl.java | 4 ++--
.../application/impl/SparkApplicationBuildPipelineServiceImpl.java | 2 +-
.../console/core/service/impl/FlinkSavepointServiceImpl.java | 2 +-
.../streampark-console-service/src/main/resources/db/schema-h2.sql | 2 +-
13 files changed, 20 insertions(+), 13 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 76cdecc7d..05a134f60 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
@@ -180,11 +180,12 @@ drop table if exists `t_app_log`;
create table `t_app_log` (
`id` bigint not null auto_increment,
`app_id` bigint default null,
+ `job_type` tinyint default null,
`cluster_id` varchar(64) collate utf8mb4_general_ci default null,
`tracking_url` varchar(255) collate utf8mb4_general_ci default null,
`success` tinyint default null,
`exception` text collate utf8mb4_general_ci,
- `option_time` datetime default null,
+ `create_time` datetime default null,
`option_name` tinyint default null,
`user_id` bigint default null,
primary key (`id`) using btree
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 f002b8f70..8a5a88475 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
@@ -411,11 +411,12 @@ create sequence "public"."streampark_t_app_log_id_seq"
create table "public"."t_app_log" (
"id" int8 not null default nextval('streampark_t_app_log_id_seq'::regclass),
"app_id" int8,
+ "job_type" int2,
"cluster_id" varchar(64) collate "pg_catalog"."default",
"tracking_url" varchar(255) collate "pg_catalog"."default",
"success" boolean,
"exception" text collate "pg_catalog"."default",
- "option_time" timestamp(6),
+ "create_time" timestamp(6),
"option_name" int2,
"user_id" int8
)
diff --git
a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.0.sql
b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.0.sql
index 3d7b8ac03..755b7d731 100644
---
a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.0.sql
+++
b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.0.sql
@@ -46,6 +46,7 @@ alter table t_flink_log rename to t_app_log;
alter table `t_app_log`
change column `yarn_app_id` `cluster_id` varchar(64) default null,
change column `job_manager_url` `tracking_url` varchar(255) default null,
+ change column `option_time` `create_time` datetime default null,
add column `job_type` tinyint default null,
add column `user_id` bigint default null comment 'operator user id';
diff --git
a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.2.2.sql
b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.2.2.sql
index b48af8148..d97733b5a 100644
---
a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.2.2.sql
+++
b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.2.2.sql
@@ -36,3 +36,6 @@ ALTER TABLE "public"."t_flink_project"
ALTER TABLE "public"."t_flink_project"
rename column "branches" to "refs";
+
+ALTER TABLE "public"."t_app_log"
+ rename column "option_time" to "create_time";
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java
index fc217c257..fc051c6f3 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java
@@ -57,7 +57,7 @@ public class ApplicationLog {
private Integer optionName;
/** option time */
- private Date optionTime;
+ private Date createTime;
/** exception at the start */
private String exception;
/** The user who operates the application */
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationLogServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationLogServiceImpl.java
index 3034f87f0..d63079f77 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationLogServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationLogServiceImpl.java
@@ -43,7 +43,7 @@ public class ApplicationLogServiceImpl extends
ServiceImpl<ApplicationLogMapper,
Page<ApplicationLog> page = MybatisPager.getPage(request);
return this.lambdaQuery()
.eq(ApplicationLog::getAppId, applicationLog.getAppId())
- .orderByDesc(ApplicationLog::getOptionTime).page(page);
+ .page(page);
}
@Override
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java
index 3c6c43b6d..e40c75e2e 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java
@@ -279,7 +279,7 @@ public class FlinkApplicationActionServiceImpl
applicationLog.setOptionName(OperationEnum.CANCEL.getValue());
applicationLog.setAppId(application.getId());
applicationLog.setTrackingUrl(application.getJobManagerUrl());
- applicationLog.setOptionTime(new Date());
+ applicationLog.setCreateTime(new Date());
applicationLog.setClusterId(application.getClusterId());
applicationLog.setUserId(ServiceHelper.getUserId());
@@ -532,7 +532,7 @@ public class FlinkApplicationActionServiceImpl
applicationLog.setJobType(EngineTypeEnum.FLINK.getCode());
applicationLog.setOptionName(OperationEnum.START.getValue());
applicationLog.setAppId(application.getId());
- applicationLog.setOptionTime(new Date());
+ applicationLog.setCreateTime(new Date());
applicationLog.setUserId(ServiceHelper.getUserId());
return applicationLog;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java
index 066aea636..4fd369c51 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java
@@ -416,7 +416,7 @@ public class FlinkApplicationBuildPipelineServiceImpl
ApplicationLog applicationLog = new ApplicationLog();
applicationLog.setOptionName(RELEASE.getValue());
applicationLog.setAppId(app.getId());
- applicationLog.setOptionTime(new Date());
+ applicationLog.setCreateTime(new Date());
applicationLog.setUserId(ServiceHelper.getUserId());
return applicationLog;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java
index 359e64f2a..2c3129fbe 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java
@@ -724,7 +724,8 @@ public class FlinkApplicationManageServiceImpl extends
ServiceImpl<FlinkApplicat
.set(FlinkApplication::getRelease,
ReleaseStateEnum.DONE.get())
.set(FlinkApplication::getOptionState,
OptionStateEnum.NONE.getValue());
}
- this.update(update);
+
+ update.update();
// backup
if (appParam.isJobTypeFlinkSqlOrCDC()) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationActionServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationActionServiceImpl.java
index 4c5114abd..f116f9437 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationActionServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationActionServiceImpl.java
@@ -217,7 +217,7 @@ public class SparkApplicationActionServiceImpl
applicationLog.setJobType(EngineTypeEnum.SPARK.getCode());
applicationLog.setOptionName(SparkOperationEnum.CANCEL.getValue());
applicationLog.setAppId(application.getId());
- applicationLog.setOptionTime(new Date());
+ applicationLog.setCreateTime(new Date());
applicationLog.setClusterId(application.getClusterId());
applicationLog.setUserId(ServiceHelper.getUserId());
application.setOptionTime(new Date());
@@ -310,7 +310,7 @@ public class SparkApplicationActionServiceImpl
applicationLog.setJobType(EngineTypeEnum.SPARK.getCode());
applicationLog.setOptionName(SparkOperationEnum.START.getValue());
applicationLog.setAppId(application.getId());
- applicationLog.setOptionTime(new Date());
+ applicationLog.setCreateTime(new Date());
applicationLog.setUserId(ServiceHelper.getUserId());
// set the latest to Effective, (it will only become the current
effective at this time)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java
index 7764d08cb..2a690908a 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java
@@ -157,7 +157,7 @@ public class SparkApplicationBuildPipelineServiceImpl
applicationLog.setJobType(EngineTypeEnum.SPARK.getCode());
applicationLog.setOptionName(RELEASE.getValue());
applicationLog.setAppId(app.getId());
- applicationLog.setOptionTime(new Date());
+ applicationLog.setCreateTime(new Date());
applicationLog.setUserId(ServiceHelper.getUserId());
// check if you need to go through the build process (if the jar and
pom have changed,
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java
index 277f9dc87..523d862f4 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java
@@ -191,7 +191,7 @@ public class FlinkSavepointServiceImpl extends
ServiceImpl<FlinkSavepointMapper,
applicationLog.setOptionName(OperationEnum.SAVEPOINT.getValue());
applicationLog.setAppId(application.getId());
applicationLog.setTrackingUrl(application.getJobManagerUrl());
- applicationLog.setOptionTime(new Date());
+ applicationLog.setCreateTime(new Date());
applicationLog.setClusterId(application.getClusterId());
applicationLog.setUserId(ServiceHelper.getUserId());
return applicationLog;
diff --git
a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
index d857cad66..b415785b2 100644
---
a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
+++
b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
@@ -168,7 +168,7 @@ create table if not exists `t_app_log` (
`tracking_url` varchar(255) default null,
`success` tinyint default null,
`exception` text ,
- `option_time` datetime default null,
+ `create_time` datetime default null,
`option_name` tinyint default null,
`user_id` bigint default null comment 'operator user id',
primary key(`id`)
