This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 65b742658d [INLONG-8282][Manager] Increase the length of the partial
ID or name field (#8283)
65b742658d is described below
commit 65b742658dc2dcdbcba65b569c02c847e09466d1
Author: fuweng11 <[email protected]>
AuthorDate: Tue Jun 20 15:47:48 2023 +0800
[INLONG-8282][Manager] Increase the length of the partial ID or name field
(#8283)
---
.../apache/inlong/manager/pojo/group/InlongGroupRequest.java | 4 ++--
.../inlong/manager/pojo/group/InlongGroupResetRequest.java | 4 ++--
.../java/org/apache/inlong/manager/pojo/sink/SinkRequest.java | 10 +++++-----
.../org/apache/inlong/manager/pojo/source/SourceRequest.java | 10 +++++-----
.../apache/inlong/manager/pojo/stream/InlongStreamRequest.java | 10 +++++-----
.../apache/inlong/manager/pojo/transform/TransformRequest.java | 10 +++++-----
inlong-manager/manager-web/sql/apache_inlong_manager.sql | 2 +-
inlong-manager/manager-web/sql/changes-1.8.0.sql | 4 +++-
8 files changed, 28 insertions(+), 26 deletions(-)
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
index e7fd8e6d92..ae1f6677ef 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
@@ -49,8 +49,8 @@ public abstract class InlongGroupRequest extends
BaseInlongGroup {
@ApiModelProperty(value = "Inlong group id", required = true)
@NotBlank(message = "inlongGroupId cannot be blank")
- @Length(min = 4, max = 100, message = "length must be between 4 and 100")
- @Pattern(regexp = "^[a-z0-9_.-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
+ @Length(min = 4, max = 200, message = "length must be between 4 and 200")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{4,200}$", message = "only supports
letters, numbers, '.', '-', or '_'")
private String inlongGroupId;
@ApiModelProperty(value = "Inlong group name", required = true)
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupResetRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupResetRequest.java
index 5a577d6a44..f8cb2d3bfb 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupResetRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupResetRequest.java
@@ -38,8 +38,8 @@ import javax.validation.constraints.Pattern;
public class InlongGroupResetRequest {
@ApiModelProperty(value = "Inlong group id", required = true)
- @Length(min = 4, max = 100, message = "length must be between 4 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
+ @Length(min = 4, max = 200, message = "length must be between 4 and 200")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{4,200}$", message = "only supports
letters, numbers, '.', '-', or '_'")
private String inlongGroupId;
@ApiModelProperty(value = "If rerun process when group is in operating, 0:
false 1: true")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java
index fbcad35b18..6c59299a7d 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java
@@ -50,14 +50,14 @@ public abstract class SinkRequest {
@ApiModelProperty("Inlong group id")
@NotBlank(groups = {SaveValidation.class, UpdateByKeyValidation.class},
message = "inlongGroupId cannot be blank")
- @Length(min = 4, max = 100, message = "length must be between 4 and 100")
- @Pattern(regexp = "^[a-z0-9_.-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
+ @Length(min = 4, max = 256, message = "length must be between 4 and 200")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{4,200}$", message = "only supports
letters, numbers, '.', '-', or '_'")
private String inlongGroupId;
@ApiModelProperty("Inlong stream id")
@NotBlank(groups = {SaveValidation.class, UpdateByKeyValidation.class},
message = "inlongStreamId cannot be blank")
- @Length(min = 1, max = 100, message = "inlongStreamId length must be
between 1 and 100")
- @Pattern(regexp = "^[a-z0-9_.-]{1,100}$", message = "inlongStreamId only
supports lowercase letters, numbers, '-', or '_'")
+ @Length(min = 1, max = 256, message = "inlongStreamId length must be
between 1 and 200")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{1,200}$", message = "inlongStreamId
only supports letters, numbers, '.', '-', or '_'")
private String inlongStreamId;
@ApiModelProperty("Sink type, including: HIVE, ES, etc.")
@@ -68,7 +68,7 @@ public abstract class SinkRequest {
@ApiModelProperty("Sink name, unique in one stream")
@NotBlank(groups = {SaveValidation.class, UpdateByKeyValidation.class},
message = "sinkName cannot be blank")
@Length(min = 1, max = 100, message = "sinkName length must be between 1
and 100")
- @Pattern(regexp = "^[a-z0-9_-]{1,100}$", message = "sinkName only supports
lowercase letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-zA-Z0-9_-]{1,100}$", message = "sinkName only
supports letters, numbers, '-', or '_'")
private String sinkName;
@ApiModelProperty("Sink description")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourceRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourceRequest.java
index c06617491e..a9e60cd5a2 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourceRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourceRequest.java
@@ -50,14 +50,14 @@ public class SourceRequest {
@ApiModelProperty("Inlong group id")
@NotBlank(groups = SaveValidation.class, message = "inlongGroupId cannot
be blank")
- @Length(min = 4, max = 100, message = "length must be between 4 and 100")
- @Pattern(regexp = "^[a-z0-9_.-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
+ @Length(min = 4, max = 200, message = "length must be between 4 and 200")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{4,200}$", message = "only supports
letters, numbers, '.', '-', or '_'")
private String inlongGroupId;
@ApiModelProperty("Inlong stream id")
@NotBlank(groups = SaveValidation.class, message = "inlongStreamId cannot
be blank")
- @Length(min = 1, max = 100, message = "inlongStreamId length must be
between 1 and 100")
- @Pattern(regexp = "^[a-z0-9_.-]{1,100}$", message = "inlongStreamId only
supports lowercase letters, numbers, '-', or '_'")
+ @Length(min = 1, max = 200, message = "inlongStreamId length must be
between 1 and 200")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{1,200}$", message = "inlongStreamId
only supports letters, numbers, '.', '-', or '_'")
private String inlongStreamId;
@ApiModelProperty("Source type, including: FILE, KAFKA, etc.")
@@ -68,7 +68,7 @@ public class SourceRequest {
@ApiModelProperty("Source name, unique in one stream")
@NotBlank(groups = SaveValidation.class, message = "sourceName cannot be
blank")
@Length(min = 1, max = 100, message = "sourceName length must be between 1
and 100")
- @Pattern(regexp = "^[a-z0-9_.-]{1,100}$", message = "sourceName only
supports lowercase letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{1,100}$", message = "sourceName only
supports letters, numbers, '.', '-', or '_'")
private String sourceName;
@ApiModelProperty("Ip of the agent running the task")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java
index 3064002411..65de69d1db 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java
@@ -46,18 +46,18 @@ public class InlongStreamRequest extends BaseInlongStream {
@ApiModelProperty(value = "Inlong group id")
@NotBlank(message = "inlongGroupId cannot be blank")
- @Length(min = 4, max = 100, message = "length must be between 4 and 100")
- @Pattern(regexp = "^[a-z0-9_.-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
+ @Length(min = 4, max = 200, message = "length must be between 4 and 200")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{4,200}$", message = "only supports
letters, numbers, '.', '-', or '_'")
private String inlongGroupId;
@ApiModelProperty(value = "Inlong stream id")
@NotBlank(message = "inlongStreamId cannot be blank")
- @Length(min = 1, max = 100, message = "inlongStreamId length must be
between 1 and 100")
- @Pattern(regexp = "^[a-z0-9_.-]{1,100}$", message = "inlongStreamId only
supports lowercase letters, numbers, '-', or '_'")
+ @Length(min = 1, max = 200, message = "inlongStreamId length must be
between 1 and 200")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{1,200}$", message = "inlongStreamId
only supports letters, numbers, '.', '-', or '_'")
private String inlongStreamId;
@ApiModelProperty(value = "Inlong stream name", required = true)
- @Length(max = 64, message = "length must be less than or equal to 64")
+ @Length(max = 200, message = "length must be less than or equal to 200")
private String name;
@ApiModelProperty(value = "Inlong stream description")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/transform/TransformRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/transform/TransformRequest.java
index bdd2314fe8..a3edcf39c3 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/transform/TransformRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/transform/TransformRequest.java
@@ -45,20 +45,20 @@ public class TransformRequest {
@ApiModelProperty("Inlong group id")
@NotBlank(groups = SaveValidation.class, message = "inlongGroupId cannot
be blank")
- @Length(min = 4, max = 100, message = "length must be between 4 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
+ @Length(min = 4, max = 200, message = "length must be between 4 and 200")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{4,200}$", message = "only supports
letters, numbers, '.', '-', or '_'")
private String inlongGroupId;
@ApiModelProperty("Inlong stream id")
@NotBlank(groups = SaveValidation.class, message = "inlongStreamId cannot
be blank")
- @Length(min = 1, max = 100, message = "inlongStreamId length must be
between 1 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{1,100}$", message = "inlongStreamId only
supports lowercase letters, numbers, '-', or '_'")
+ @Length(min = 1, max = 200, message = "inlongStreamId length must be
between 1 and 200")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{1,200}$", message = "inlongStreamId
only supports letters, numbers, '.', '-', or '_'")
private String inlongStreamId;
@ApiModelProperty("Transform name, unique in one stream")
@NotBlank(groups = SaveValidation.class, message = "transformName cannot
be blank")
@Length(min = 1, max = 100, message = "transformName length must be
between 1 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{1,100}$", message = "transformName only
supports lowercase letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-zA-Z0-9_-]{1,100}$", message = "transformName only
supports letters, numbers, '-', or '_'")
private String transformName;
@ApiModelProperty("Transform type, including: splitter, filter, joiner,
etc.")
diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
index ce476cd7ae..5f4dad52d9 100644
--- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
@@ -238,7 +238,7 @@ CREATE TABLE IF NOT EXISTS `inlong_stream`
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT
'Incremental primary key',
`inlong_group_id` varchar(256) NOT NULL COMMENT 'Owning inlong group id',
`inlong_stream_id` varchar(256) NOT NULL COMMENT 'Inlong stream id,
non-deleted globally unique',
- `name` varchar(64) DEFAULT NULL COMMENT 'The name of
the inlong stream page display, can be Chinese',
+ `name` varchar(256) DEFAULT NULL COMMENT 'The name of
the inlong stream page display, can be Chinese',
`description` varchar(256) DEFAULT '' COMMENT 'Description
of inlong stream',
`mq_resource` varchar(128) DEFAULT NULL COMMENT 'MQ
resource, in one stream, corresponding to the filter ID of TubeMQ,
corresponding to the topic of Pulsar',
`data_type` varchar(20) DEFAULT NULL COMMENT 'Data type,
including: CSV, KEY-VALUE, JSON, AVRO, etc.',
diff --git a/inlong-manager/manager-web/sql/changes-1.8.0.sql
b/inlong-manager/manager-web/sql/changes-1.8.0.sql
index ac0dfdb594..83d080e14d 100644
--- a/inlong-manager/manager-web/sql/changes-1.8.0.sql
+++ b/inlong-manager/manager-web/sql/changes-1.8.0.sql
@@ -78,4 +78,6 @@ CREATE INDEX index_tenant
-- To avoid the ambiguity, rename "tenant" in PulsarGroup & PulsarCluster to
"pulsarTenant"
UPDATE inlong_group SET ext_params = replace(ext_params, '"tenant"',
'"pulsarTenant"');
-UPDATE inlong_cluster SET ext_params = replace(ext_params, '"tenant"',
'"pulsarTenant"');
\ No newline at end of file
+UPDATE inlong_cluster SET ext_params = replace(ext_params, '"tenant"',
'"pulsarTenant"');
+
+ALTER TABLE `inlong_stream` MODIFY COLUMN `name` varchar(256) DEFAULT NULL
COMMENT 'The name of the inlong stream page display, can be Chinese';
\ No newline at end of file
