revert: temporary remove @Type(StringType) due to it will change the db colum type to varchar

This commit is contained in:
tjq 2020-12-20 21:28:37 +08:00
parent 12162f2955
commit 2d989d2b0b
9 changed files with 3 additions and 30 deletions

View File

@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
/** /**
* 执行服务器运行 * 需要在指定的服务器运行
* 注意该注解所在方法的参数必须为对象不可以是 long 等基本类型 * 注意该注解所在方法的参数必须为对象不可以是 long 等基本类型
* *
* @author tjq * @author tjq

View File

@ -62,7 +62,7 @@ public class DesignateServerAspect {
} }
if (appId == null) { if (appId == null) {
throw new PowerJobException("can't find appId in params!"); throw new PowerJobException("can't find appId in params for:" + signature.toString());
} }
// 获取执行机器 // 获取执行机器

View File

@ -5,7 +5,6 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Type;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@ -37,7 +36,6 @@ public class InstanceInfoDO {
// 任务实例参数 // 任务实例参数
@Lob @Lob
@Column @Column
@Type(type = TypeDefConstant.STRING_TYPE)
private String instanceParams; private String instanceParams;
// 该任务实例的类型普通/工作流InstanceType // 该任务实例的类型普通/工作流InstanceType
@ -51,7 +49,6 @@ public class InstanceInfoDO {
// 执行结果允许存储稍大的结果 // 执行结果允许存储稍大的结果
@Lob @Lob
@Column @Column
@Type(type = TypeDefConstant.STRING_TYPE)
private String result; private String result;
// 预计触发时间 // 预计触发时间
private Long expectedTriggerTime; private Long expectedTriggerTime;

View File

@ -5,7 +5,6 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Type;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@ -53,7 +52,6 @@ public class JobInfoDO {
// 执行器信息可能需要存储整个脚本文件 // 执行器信息可能需要存储整个脚本文件
@Lob @Lob
@Column @Column
@Type(type = TypeDefConstant.STRING_TYPE)
private String processorInfo; private String processorInfo;
/* ************************** 运行时配置 ************************** */ /* ************************** 运行时配置 ************************** */

View File

@ -1,9 +0,0 @@
package com.github.kfcfans.powerjob.server.persistence.core.model;
/**
* @see package-info.java
* @author user
*/
public final class TypeDefConstant {
public static final String STRING_TYPE = "string-type";
}

View File

@ -4,7 +4,6 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Type;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@ -36,7 +35,6 @@ public class WorkflowInfoDO {
// 工作流的DAG图信息点线式DAG的json // 工作流的DAG图信息点线式DAG的json
@Lob @Lob
@Column @Column
@Type(type = TypeDefConstant.STRING_TYPE)
private String peDAG; private String peDAG;
/* ************************** 定时参数 ************************** */ /* ************************** 定时参数 ************************** */

View File

@ -4,7 +4,6 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Type;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@ -40,16 +39,13 @@ public class WorkflowInstanceInfoDO {
// 工作流启动参数 // 工作流启动参数
@Lob @Lob
@Column @Column
@Type(type = TypeDefConstant.STRING_TYPE)
private String wfInitParams; private String wfInitParams;
@Lob @Lob
@Column @Column
@Type(type = TypeDefConstant.STRING_TYPE)
private String dag; private String dag;
@Lob @Lob
@Column @Column
@Type(type = TypeDefConstant.STRING_TYPE)
private String result; private String result;
// 预计触发时间 // 预计触发时间

View File

@ -1,7 +0,0 @@
@TypeDefs({
@TypeDef(name = TypeDefConstant.STRING_TYPE, typeClass = org.hibernate.type.StringType.class)
})
package com.github.kfcfans.powerjob.server.persistence.core.model;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;

View File

@ -81,7 +81,7 @@ public class DispatchService {
if (maxInstanceNum > 0) { if (maxInstanceNum > 0) {
// 这个 runningInstanceCount 已经包含了本 instance // 这个 runningInstanceCount 已经包含了本 instance
// 不统计 WAITING_DISPATCH 的状态使用 OpenAPI 触发的延迟任务显然不应该统计进去比如 delay 1 // 不统计 WAITING_DISPATCH 的状态使用 OpenAPI 触发的延迟任务不应该统计进去比如 delay 1
long runningInstanceCount = instanceInfoRepository.countByJobIdAndStatusIn(jobId, Lists.newArrayList(WAITING_WORKER_RECEIVE.getV(), RUNNING.getV())); long runningInstanceCount = instanceInfoRepository.countByJobIdAndStatusIn(jobId, Lists.newArrayList(WAITING_WORKER_RECEIVE.getV(), RUNNING.getV()));
// 超出最大同时运行限制不执行调度 // 超出最大同时运行限制不执行调度
if (runningInstanceCount > maxInstanceNum) { if (runningInstanceCount > maxInstanceNum) {