You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by GitBox <gi...@apache.org> on 2022/10/08 02:46:15 UTC
[GitHub] [inlong] vernedeng opened a new pull request, #6087: [INLONG-6086][Manager] support base stream sink operator
vernedeng opened a new pull request, #6087:
URL: https://github.com/apache/inlong/pull/6087
### Prepare a Pull Request
*(Change the title refer to the following example)*
- Title Example: [INLONG-XYZ][Component] Title of the pull request
*(The following *XYZ* should be replaced by the actual [GitHub Issue](https://github.com/apache/inlong/issues) number)*
- Fixes #6086
### Motivation
support base stream sink operator
support delete stream sink by related id
### Modifications
*Describe the modifications you've done.*
### Verifying this change
*(Please pick either of the following options)*
- [ ] This change is a trivial rework/code cleanup without any test coverage.
- [ ] This change is already covered by existing tests, such as:
*(please describe tests)*
- [ ] This change added tests and can be verified as follows:
*(example:)*
- *Added integration tests for end-to-end deployment with large payloads (10MB)*
- *Extended integration test for recovery after broker failure*
### Documentation
- Does this pull request introduce a new feature? (yes / no)
- If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)
- If a feature is not applicable for documentation, explain why?
- If a feature is not documented yet in this PR, please create a follow-up issue for adding the documentation
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] healchow commented on a diff in pull request #6087: [INLONG-6086][Manager] Support custom stream sink operator
Posted by GitBox <gi...@apache.org>.
healchow commented on code in PR #6087:
URL: https://github.com/apache/inlong/pull/6087#discussion_r990604181
##########
inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sink/CustomSinkServiceTest.java:
##########
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.inlong.manager.service.sink;
+
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.inlong.manager.common.consts.InlongConstants;
+import org.apache.inlong.manager.common.consts.SinkType;
+import org.apache.inlong.manager.pojo.sink.custom.CustomSink;
+import org.apache.inlong.manager.pojo.sink.custom.CustomSinkRequest;
+import org.apache.inlong.manager.pojo.sink.SinkRequest;
+import org.apache.inlong.manager.pojo.sink.StreamSink;
+import org.apache.inlong.manager.service.ServiceBaseTest;
+import org.apache.inlong.manager.service.core.impl.InlongStreamServiceTest;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Base sink service test
Review Comment:
Base -> Custom.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] healchow commented on a diff in pull request #6087: [INLONG-6086][Manager] Support custom stream sink operator
Posted by GitBox <gi...@apache.org>.
healchow commented on code in PR #6087:
URL: https://github.com/apache/inlong/pull/6087#discussion_r990604310
##########
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamSinkController.java:
##########
@@ -85,4 +87,20 @@ public Response<Boolean> delete(@PathVariable Integer id) {
return Response.success(result);
}
+ @DeleteMapping(value = "/sink/deleteByRelatedId/{groupId}/{streamId}/{sinkName}")
+ @OperationLog(operation = OperationType.DELETE)
+ @ApiOperation(value = "Delete stream sink by groupId, streamId and sinkName")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "groupId", dataTypeClass = String.class, readOnly = true),
Review Comment:
Why add `readOnly` for the API document here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] vernedeng commented on a diff in pull request #6087: [INLONG-6086][Manager] Support custom stream sink operator
Posted by GitBox <gi...@apache.org>.
vernedeng commented on code in PR #6087:
URL: https://github.com/apache/inlong/pull/6087#discussion_r990604525
##########
inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/custom/CustomSinkRequest.java:
##########
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.inlong.manager.pojo.sink.custom;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.apache.inlong.manager.common.consts.SinkType;
+import org.apache.inlong.manager.common.util.JsonTypeDefine;
+import org.apache.inlong.manager.pojo.sink.SinkRequest;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Base sink request
Review Comment:
fixed, thx
##########
inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sink/CustomSinkServiceTest.java:
##########
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.inlong.manager.service.sink;
+
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.inlong.manager.common.consts.InlongConstants;
+import org.apache.inlong.manager.common.consts.SinkType;
+import org.apache.inlong.manager.pojo.sink.custom.CustomSink;
+import org.apache.inlong.manager.pojo.sink.custom.CustomSinkRequest;
+import org.apache.inlong.manager.pojo.sink.SinkRequest;
+import org.apache.inlong.manager.pojo.sink.StreamSink;
+import org.apache.inlong.manager.service.ServiceBaseTest;
+import org.apache.inlong.manager.service.core.impl.InlongStreamServiceTest;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Base sink service test
Review Comment:
fixed, thx
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] vernedeng commented on a diff in pull request #6087: [INLONG-6086][Manager] support base stream sink operator
Posted by GitBox <gi...@apache.org>.
vernedeng commented on code in PR #6087:
URL: https://github.com/apache/inlong/pull/6087#discussion_r990588344
##########
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SinkType.java:
##########
@@ -36,5 +36,6 @@ public class SinkType {
public static final String ORACLE = "ORACLE";
public static final String TDSQLPOSTGRESQL = "TDSQLPOSTGRESQL";
public static final String DLCICEBERG = "DLCICEBERG";
+ public static final String BASE = "BASE";
Review Comment:
To differ from sink type in Sort-flink.
Base is just a prefix, the real type is base_kafka, base_pulsar, etc.
The Base_XXX type means all fields are directly inserted into the very table, instead of complex checking and multi-table operation
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] vernedeng commented on a diff in pull request #6087: [INLONG-6086][Manager] Support custom stream sink operator
Posted by GitBox <gi...@apache.org>.
vernedeng commented on code in PR #6087:
URL: https://github.com/apache/inlong/pull/6087#discussion_r990603887
##########
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SinkType.java:
##########
@@ -36,5 +36,6 @@ public class SinkType {
public static final String ORACLE = "ORACLE";
public static final String TDSQLPOSTGRESQL = "TDSQLPOSTGRESQL";
public static final String DLCICEBERG = "DLCICEBERG";
+ public static final String BASE = "BASE";
Review Comment:
has renamed to **custom**
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] healchow commented on a diff in pull request #6087: [INLONG-6086][Manager] Support custom stream sink operator
Posted by GitBox <gi...@apache.org>.
healchow commented on code in PR #6087:
URL: https://github.com/apache/inlong/pull/6087#discussion_r990604095
##########
inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/custom/CustomSinkRequest.java:
##########
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.inlong.manager.pojo.sink.custom;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.apache.inlong.manager.common.consts.SinkType;
+import org.apache.inlong.manager.common.util.JsonTypeDefine;
+import org.apache.inlong.manager.pojo.sink.SinkRequest;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Base sink request
+ */
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Custom sink request")
+@JsonTypeDefine(value = SinkType.CUSTOM)
+public class CustomSinkRequest extends SinkRequest {
+
+ @NotBlank(message = "sinkType cannot be blank")
+ @ApiModelProperty("Sink type, including: HIVE, ES, etc.")
+ private String sinkType;
Review Comment:
The parent class already has this field.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] vernedeng commented on a diff in pull request #6087: [INLONG-6086][Manager] Support custom stream sink operator
Posted by GitBox <gi...@apache.org>.
vernedeng commented on code in PR #6087:
URL: https://github.com/apache/inlong/pull/6087#discussion_r990604838
##########
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamSinkController.java:
##########
@@ -85,4 +87,20 @@ public Response<Boolean> delete(@PathVariable Integer id) {
return Response.success(result);
}
+ @DeleteMapping(value = "/sink/deleteByRelatedId/{groupId}/{streamId}/{sinkName}")
+ @OperationLog(operation = OperationType.DELETE)
+ @ApiOperation(value = "Delete stream sink by groupId, streamId and sinkName")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "groupId", dataTypeClass = String.class, readOnly = true),
Review Comment:
it should be **_required_**, just mistake
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] healchow merged pull request #6087: [INLONG-6086][Manager] Support updating and deleting stream sink by key
Posted by GitBox <gi...@apache.org>.
healchow merged PR #6087:
URL: https://github.com/apache/inlong/pull/6087
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] vernedeng commented on a diff in pull request #6087: [INLONG-6086][Manager] Support custom stream sink operator
Posted by GitBox <gi...@apache.org>.
vernedeng commented on code in PR #6087:
URL: https://github.com/apache/inlong/pull/6087#discussion_r990604497
##########
inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/custom/CustomSinkRequest.java:
##########
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.inlong.manager.pojo.sink.custom;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.apache.inlong.manager.common.consts.SinkType;
+import org.apache.inlong.manager.common.util.JsonTypeDefine;
+import org.apache.inlong.manager.pojo.sink.SinkRequest;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Base sink request
+ */
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Custom sink request")
+@JsonTypeDefine(value = SinkType.CUSTOM)
+public class CustomSinkRequest extends SinkRequest {
+
+ @NotBlank(message = "sinkType cannot be blank")
+ @ApiModelProperty("Sink type, including: HIVE, ES, etc.")
+ private String sinkType;
Review Comment:
fixed, thx
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] healchow commented on a diff in pull request #6087: [INLONG-6086][Manager] support base stream sink operator
Posted by GitBox <gi...@apache.org>.
healchow commented on code in PR #6087:
URL: https://github.com/apache/inlong/pull/6087#discussion_r990587931
##########
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SinkType.java:
##########
@@ -36,5 +36,6 @@ public class SinkType {
public static final String ORACLE = "ORACLE";
public static final String TDSQLPOSTGRESQL = "TDSQLPOSTGRESQL";
public static final String DLCICEBERG = "DLCICEBERG";
+ public static final String BASE = "BASE";
Review Comment:
Excuse me, what is the `BASE` type?
I know `MYSQL`, `ORACLE`, `HIVE`, etc., but I haven't heard of the `BASE` type.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] healchow commented on a diff in pull request #6087: [INLONG-6086][Manager] Support custom stream sink operator
Posted by GitBox <gi...@apache.org>.
healchow commented on code in PR #6087:
URL: https://github.com/apache/inlong/pull/6087#discussion_r990604141
##########
inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/custom/CustomSinkRequest.java:
##########
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.inlong.manager.pojo.sink.custom;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.apache.inlong.manager.common.consts.SinkType;
+import org.apache.inlong.manager.common.util.JsonTypeDefine;
+import org.apache.inlong.manager.pojo.sink.SinkRequest;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Base sink request
Review Comment:
Base -> Custom.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org