You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by we...@apache.org on 2022/01/09 03:36:20 UTC
[dolphinscheduler] branch dev updated: [FIX-7732][fix] fix column 'is_directory' of table `t_ds_resources` type error in PG database (#7898)
This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 361d68d [FIX-7732][fix] fix column 'is_directory' of table `t_ds_resources` type error in PG database (#7898)
361d68d is described below
commit 361d68db2609f37689b905c74a0a4f015c8d238e
Author: 天仇 <53...@qq.com>
AuthorDate: Sun Jan 9 11:36:14 2022 +0800
[FIX-7732][fix] fix column 'is_directory' of table `t_ds_resources` type error in PG database (#7898)
Fix column 'is_directory' of table t_ds_resources type error in PG database
This closes #7732
---
.../dolphinscheduler/dao/entity/Resource.java | 455 ++++++++++-----------
.../resources/sql/dolphinscheduler_postgresql.sql | 2 +-
2 files changed, 223 insertions(+), 234 deletions(-)
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java
index fa711ff..7475bf7 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java
@@ -28,219 +28,208 @@ import com.fasterxml.jackson.annotation.JsonFormat;
@TableName("t_ds_resources")
public class Resource {
- /**
- * id
- */
- @TableId(value="id", type=IdType.AUTO)
- private int id;
-
- /**
- * parent id
- */
- private int pid;
-
- /**
- * resource alias
- */
- private String alias;
-
- /**
- * full name
- */
- private String fullName;
-
- /**
- * is directory
- */
- private boolean isDirectory=false;
-
- /**
- * description
- */
- private String description;
-
- /**
- * file alias
- */
- private String fileName;
-
- /**
- * user id
- */
- private int userId;
-
- /**
- * resource type
- */
- private ResourceType type;
-
- /**
- * resource size
- */
- private long size;
-
- /**
- * create time
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
- private Date createTime;
-
- /**
- * update time
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
- private Date updateTime;
-
- public Resource() {
- }
-
- public Resource(int id, String alias, String fileName, String description, int userId,
- ResourceType type, long size,
- Date createTime, Date updateTime) {
- this.id = id;
- this.alias = alias;
- this.fileName = fileName;
- this.description = description;
- this.userId = userId;
- this.type = type;
- this.size = size;
- this.createTime = createTime;
- this.updateTime = updateTime;
- }
-
- public Resource(int id, int pid, String alias, String fullName, boolean isDirectory) {
- this.id = id;
- this.pid = pid;
- this.alias = alias;
- this.fullName = fullName;
- this.isDirectory = isDirectory;
- }
-
- /*public Resource(String alias, String fileName, String description, int userId, ResourceType type, long size, Date createTime, Date updateTime) {
- this.alias = alias;
- this.fileName = fileName;
- this.description = description;
- this.userId = userId;
- this.type = type;
- this.size = size;
- this.createTime = createTime;
- this.updateTime = updateTime;
- }*/
-
- public Resource(int pid, String alias, String fullName, boolean isDirectory, String description, String fileName, int userId, ResourceType type, long size, Date createTime, Date updateTime) {
- this.pid = pid;
- this.alias = alias;
- this.fullName = fullName;
- this.isDirectory = isDirectory;
- this.description = description;
- this.fileName = fileName;
- this.userId = userId;
- this.type = type;
- this.size = size;
- this.createTime = createTime;
- this.updateTime = updateTime;
- }
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getAlias() {
- return alias;
- }
-
- public void setAlias(String alias) {
- this.alias = alias;
- }
-
- public int getPid() {
- return pid;
- }
-
- public void setPid(int pid) {
- this.pid = pid;
- }
-
- public String getFullName() {
- return fullName;
- }
-
- public void setFullName(String fullName) {
- this.fullName = fullName;
- }
-
- public boolean isDirectory() {
- return isDirectory;
- }
-
- public void setDirectory(boolean directory) {
- isDirectory = directory;
- }
-
- public String getFileName() {
- return fileName;
- }
-
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public int getUserId() {
- return userId;
- }
-
- public void setUserId(int userId) {
- this.userId = userId;
- }
-
-
- public ResourceType getType() {
- return type;
- }
-
- public void setType(ResourceType type) {
- this.type = type;
- }
-
- public long getSize() {
- return size;
- }
-
- public void setSize(long size) {
- this.size = size;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
+ /**
+ * id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private int id;
+
+ /**
+ * parent id
+ */
+ private int pid;
+
+ /**
+ * resource alias
+ */
+ private String alias;
+
+ /**
+ * full name
+ */
+ private String fullName;
+
+ /**
+ * is directory
+ */
+ private boolean isDirectory = false;
+
+ /**
+ * description
+ */
+ private String description;
+
+ /**
+ * file alias
+ */
+ private String fileName;
+
+ /**
+ * user id
+ */
+ private int userId;
+
+ /**
+ * resource type
+ */
+ private ResourceType type;
+
+ /**
+ * resource size
+ */
+ private long size;
+
+ /**
+ * create time
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * update time
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ public Resource() {
+ }
+
+ public Resource(int id, String alias, String fileName, String description, int userId,
+ ResourceType type, long size,
+ Date createTime, Date updateTime) {
+ this.id = id;
+ this.alias = alias;
+ this.fileName = fileName;
+ this.description = description;
+ this.userId = userId;
+ this.type = type;
+ this.size = size;
+ this.createTime = createTime;
+ this.updateTime = updateTime;
+ }
+
+ public Resource(int id, int pid, String alias, String fullName, boolean isDirectory) {
+ this.id = id;
+ this.pid = pid;
+ this.alias = alias;
+ this.fullName = fullName;
+ this.isDirectory = isDirectory;
+ }
+
+ public Resource(int pid, String alias, String fullName, boolean isDirectory, String description, String fileName, int userId, ResourceType type, long size, Date createTime, Date updateTime) {
+ this.pid = pid;
+ this.alias = alias;
+ this.fullName = fullName;
+ this.isDirectory = isDirectory;
+ this.description = description;
+ this.fileName = fileName;
+ this.userId = userId;
+ this.type = type;
+ this.size = size;
+ this.createTime = createTime;
+ this.updateTime = updateTime;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getAlias() {
+ return alias;
+ }
+
+ public void setAlias(String alias) {
+ this.alias = alias;
+ }
+
+ public int getPid() {
+ return pid;
+ }
+
+ public void setPid(int pid) {
+ this.pid = pid;
+ }
+
+ public String getFullName() {
+ return fullName;
+ }
+
+ public void setFullName(String fullName) {
+ this.fullName = fullName;
+ }
+
+ public boolean isDirectory() {
+ return isDirectory;
+ }
+
+ public void setDirectory(boolean directory) {
+ isDirectory = directory;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
- @Override
- public String toString() {
- return "Resource{" +
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public int getUserId() {
+ return userId;
+ }
+
+ public void setUserId(int userId) {
+ this.userId = userId;
+ }
+
+
+ public ResourceType getType() {
+ return type;
+ }
+
+ public void setType(ResourceType type) {
+ this.type = type;
+ }
+
+ public long getSize() {
+ return size;
+ }
+
+ public void setSize(long size) {
+ this.size = size;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ @Override
+ public String toString() {
+ return "Resource{" +
"id=" + id +
", pid=" + pid +
", alias='" + alias + '\'' +
@@ -254,30 +243,30 @@ public class Resource {
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
}
- Resource resource = (Resource) o;
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
- if (id != resource.id) {
- return false;
- }
- return alias.equals(resource.alias);
+ Resource resource = (Resource) o;
- }
+ if (id != resource.id) {
+ return false;
+ }
+ return alias.equals(resource.alias);
- @Override
- public int hashCode() {
- int result = id;
- result = 31 * result + alias.hashCode();
- return result;
- }
+ }
+
+ @Override
+ public int hashCode() {
+ int result = id;
+ result = 31 * result + alias.hashCode();
+ return result;
+ }
}
diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
index 472b4ce..fedb2aa 100644
--- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
+++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
@@ -664,7 +664,7 @@ CREATE TABLE t_ds_resources (
update_time timestamp DEFAULT NULL ,
pid int,
full_name varchar(64),
- is_directory int,
+ is_directory boolean DEFAULT FALSE,
PRIMARY KEY (id),
CONSTRAINT t_ds_resources_un UNIQUE (full_name, type)
) ;