You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by "liugddx (via GitHub)" <gi...@apache.org> on 2024/07/17 14:18:30 UTC

[PR] [Improve][Doris Connector] Unified serialization method,Use RowToJsonConverter and TextSerializationSchema [seatunnel]

liugddx opened a new pull request, #7229:
URL: https://github.com/apache/seatunnel/pull/7229

   <!--
   
   Thank you for contributing to SeaTunnel! Please make sure that your code changes
   are covered with tests. And in case of new features or big changes
   remember to adjust the documentation.
   
   Feel free to ping committers for the review!
   
   ## Contribution Checklist
   
     - Make sure that the pull request corresponds to a [GITHUB issue](https://github.com/apache/seatunnel/issues).
   
     - Name the pull request in the form "[Feature] [component] Title of the pull request", where *Feature* can be replaced by `Hotfix`, `Bug`, etc.
   
     - Minor fixes should be named following this pattern: `[hotfix] [docs] Fix typo in README.md doc`.
   
   -->
   
   ### Purpose of this pull request
   
   <!-- Describe the purpose of this pull request. For example: This pull request adds checkstyle plugin.-->
   
   
   ### Does this PR introduce _any_ user-facing change?
   <!--
   Note that it means *any* user-facing change including all aspects such as the documentation fix.
   If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
   If possible, please also clarify if this is a user-facing change compared to the released SeaTunnel versions or within the unreleased branches such as dev.
   If no, write 'No'.
   If you are adding/modifying connector documents, please follow our new specifications: https://github.com/apache/seatunnel/issues/4544.
   -->
   
   
   ### How was this patch tested?
   <!--
   If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
   If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
   If tests were not added, please describe why they were not added and/or why it was difficult to add.
   If you are adding E2E test cases, maybe refer to https://github.com/apache/seatunnel/blob/dev/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/src/test/resources/mysqlcdc_to_mysql.conf, here is a good example.
   -->
   
   
   ### Check list
   
   * [ ] If any new Jar binary package adding in your PR, please add License Notice according
     [New License Guide](https://github.com/apache/seatunnel/blob/dev/docs/en/contribution/new-license.md)
   * [ ] If necessary, please update the documentation to describe the new feature. https://github.com/apache/seatunnel/tree/dev/docs
   * [ ] If you are contributing the connector code, please check that the following files are updated:
     1. Update change log that in connector document. For more details you can refer to [connector-v2](https://github.com/apache/seatunnel/tree/dev/docs/en/connector-v2)
     2. Update [plugin-mapping.properties](https://github.com/apache/seatunnel/blob/dev/plugin-mapping.properties) and add new connector information in it
     3. Update the pom file of [seatunnel-dist](https://github.com/apache/seatunnel/blob/dev/seatunnel-dist/pom.xml)
   * [ ] Update the [`release-note`](https://github.com/apache/seatunnel/blob/dev/release-note.md).


-- 
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@seatunnel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] [Improve][Doris Connector] Unified serialization method,Use RowToJsonConverter and TextSerializationSchema [seatunnel]

Posted by "liugddx (via GitHub)" <gi...@apache.org>.
liugddx commented on PR #7229:
URL: https://github.com/apache/seatunnel/pull/7229#issuecomment-2241906321

   After https://github.com/apache/doris/issues/38174 is resolved, I will upgrade to the latest doris version as a image for test cases.
   
   


-- 
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@seatunnel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] [Improve][Doris Connector] Unified serialization method,Use RowToJsonConverter and TextSerializationSchema [seatunnel]

Posted by "Hisoka-X (via GitHub)" <gi...@apache.org>.
Hisoka-X commented on code in PR #7229:
URL: https://github.com/apache/seatunnel/pull/7229#discussion_r1685880044


##########
seatunnel-connectors-v2/connector-doris/src/test/java/org/apache/seatunnel/connectors/doris/serialize/SeaTunnelRowConverterTest.java:
##########
@@ -1,54 +0,0 @@
-/*
- * 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.seatunnel.connectors.doris.serialize;
-
-import org.apache.seatunnel.api.table.type.LocalTimeType;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.time.LocalDateTime;
-
-public class SeaTunnelRowConverterTest {
-
-    private static final SeaTunnelRowConverter seaTunnelRowConverter = new SeaTunnelRowConverter();
-
-    @Test
-    void testDateTimeWithNano() {
-        Assertions.assertEquals(
-                "2021-01-01 00:00:00.123456",
-                seaTunnelRowConverter.convert(
-                        LocalTimeType.LOCAL_DATE_TIME_TYPE,
-                        LocalDateTime.of(2021, 1, 1, 0, 0, 0, 123456789)));
-        Assertions.assertEquals(
-                "2021-01-01 00:00:00.000000",
-                seaTunnelRowConverter.convert(
-                        LocalTimeType.LOCAL_DATE_TIME_TYPE,
-                        LocalDateTime.of(2021, 1, 1, 0, 0, 0, 0)));
-        Assertions.assertEquals(
-                "2021-01-01 00:00:00.000001",
-                seaTunnelRowConverter.convert(
-                        LocalTimeType.LOCAL_DATE_TIME_TYPE,
-                        LocalDateTime.of(2021, 1, 1, 0, 0, 0, 1000)));
-        Assertions.assertEquals(
-                "2021-01-01 00:00:00.000123",
-                seaTunnelRowConverter.convert(
-                        LocalTimeType.LOCAL_DATE_TIME_TYPE,
-                        LocalDateTime.of(2021, 1, 1, 0, 0, 0, 123456)));
-    }

Review Comment:
   We need all datetime value written to doris to have the same precision.



-- 
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@seatunnel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] [Improve][Doris Connector] Unified serialization method,Use RowToJsonConverter and TextSerializationSchema [seatunnel]

Posted by "liugddx (via GitHub)" <gi...@apache.org>.
liugddx commented on code in PR #7229:
URL: https://github.com/apache/seatunnel/pull/7229#discussion_r1685720362


##########
seatunnel-connectors-v2/connector-doris/src/test/java/org/apache/seatunnel/connectors/doris/serialize/SeaTunnelRowConverterTest.java:
##########
@@ -1,54 +0,0 @@
-/*
- * 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.seatunnel.connectors.doris.serialize;
-
-import org.apache.seatunnel.api.table.type.LocalTimeType;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.time.LocalDateTime;
-
-public class SeaTunnelRowConverterTest {
-
-    private static final SeaTunnelRowConverter seaTunnelRowConverter = new SeaTunnelRowConverter();
-
-    @Test
-    void testDateTimeWithNano() {
-        Assertions.assertEquals(
-                "2021-01-01 00:00:00.123456",
-                seaTunnelRowConverter.convert(
-                        LocalTimeType.LOCAL_DATE_TIME_TYPE,
-                        LocalDateTime.of(2021, 1, 1, 0, 0, 0, 123456789)));
-        Assertions.assertEquals(
-                "2021-01-01 00:00:00.000000",
-                seaTunnelRowConverter.convert(
-                        LocalTimeType.LOCAL_DATE_TIME_TYPE,
-                        LocalDateTime.of(2021, 1, 1, 0, 0, 0, 0)));
-        Assertions.assertEquals(
-                "2021-01-01 00:00:00.000001",
-                seaTunnelRowConverter.convert(
-                        LocalTimeType.LOCAL_DATE_TIME_TYPE,
-                        LocalDateTime.of(2021, 1, 1, 0, 0, 0, 1000)));
-        Assertions.assertEquals(
-                "2021-01-01 00:00:00.000123",
-                seaTunnelRowConverter.convert(
-                        LocalTimeType.LOCAL_DATE_TIME_TYPE,
-                        LocalDateTime.of(2021, 1, 1, 0, 0, 0, 123456)));
-    }

Review Comment:
   > we should make sure the behavior not change. Please do not delete this test case. Instand of cover it by `SeaTunnelRowSerializer`.
   
   We use seatunnel's serialization tool, so `SeaTunnelRowConverter.java` was deleted. This test case will no longer be used.



-- 
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@seatunnel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] [Improve][Doris Connector] Unified serialization method,Use RowToJsonConverter and TextSerializationSchema [seatunnel]

Posted by "Hisoka-X (via GitHub)" <gi...@apache.org>.
Hisoka-X commented on PR #7229:
URL: https://github.com/apache/seatunnel/pull/7229#issuecomment-2241908342

   > After [apache/doris#38174](https://github.com/apache/doris/issues/38174) is resolved, I will upgrade to the latest doris version as a image for test cases.
   
   Please create an issue for this.


-- 
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@seatunnel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] [Improve][Doris Connector] Unified serialization method,Use RowToJsonConverter and TextSerializationSchema [seatunnel]

Posted by "liugddx (via GitHub)" <gi...@apache.org>.
liugddx merged PR #7229:
URL: https://github.com/apache/seatunnel/pull/7229


-- 
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@seatunnel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] [Improve][Doris Connector] Unified serialization method,Use RowToJsonConverter and TextSerializationSchema [seatunnel]

Posted by "Hisoka-X (via GitHub)" <gi...@apache.org>.
Hisoka-X commented on code in PR #7229:
URL: https://github.com/apache/seatunnel/pull/7229#discussion_r1682105371


##########
seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/serialize/SeaTunnelRowSerializer.java:
##########
@@ -105,46 +79,40 @@ public String parseDeleteSign(RowKind rowKind) {
         }
     }
 
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    /** Builder for RowDataSerializer. */
-    public static class Builder {
-        private SeaTunnelRowType seaTunnelRowType;
-        private String type;
-        private String fieldDelimiter;
-        private boolean deletable;
-
-        public Builder setType(String type) {
-            this.type = type;
-            return this;
-        }
+    @Override
+    public void open() throws IOException {}
 
-        public Builder setSeaTunnelRowType(SeaTunnelRowType seaTunnelRowType) {
-            this.seaTunnelRowType = seaTunnelRowType;
-            return this;
-        }
+    @Override
+    public byte[] serialize(SeaTunnelRow seaTunnelRow) throws IOException {
 
-        public Builder setFieldDelimiter(String fieldDelimiter) {
-            this.fieldDelimiter = fieldDelimiter;
-            return this;
-        }
+        List<String> fieldNames = Arrays.asList(seaTunnelRowType.getFieldNames());
+        List<SeaTunnelDataType<?>> fieldTypes = Arrays.asList(seaTunnelRowType.getFieldTypes());
 
-        public Builder enableDelete(boolean deletable) {
-            this.deletable = deletable;
-            return this;
+        if (enableDelete) {
+            SeaTunnelRow seaTunnelRowEnableDelete = seaTunnelRow.copy();

Review Comment:
   oh i missed it



-- 
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@seatunnel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] [Improve][Doris Connector] Unified serialization method,Use RowToJsonConverter and TextSerializationSchema [seatunnel]

Posted by "Hisoka-X (via GitHub)" <gi...@apache.org>.
Hisoka-X commented on code in PR #7229:
URL: https://github.com/apache/seatunnel/pull/7229#discussion_r1685900178


##########
seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/source/serialization/RowBatch.java:
##########
@@ -71,21 +75,22 @@
 
 @Slf4j
 public class RowBatch {
+    public static final String DECIMAL = "DECIMAL";

Review Comment:
   ```suggestion
   ```



-- 
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@seatunnel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] [Improve][Doris Connector] Unified serialization method,Use RowToJsonConverter and TextSerializationSchema [seatunnel]

Posted by "Hisoka-X (via GitHub)" <gi...@apache.org>.
Hisoka-X commented on code in PR #7229:
URL: https://github.com/apache/seatunnel/pull/7229#discussion_r1685708027


##########
seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/source/serialization/RowBatch.java:
##########
@@ -71,21 +75,22 @@
 
 @Slf4j
 public class RowBatch {

Review Comment:
   why change `RowBatch`? Any test case?



##########
seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/source/serialization/RowBatch.java:
##########
@@ -267,7 +272,7 @@ private void convertArrowValue(
                         rowIndex ->
                                 float8Vector.isNull(rowIndex) ? null : float8Vector.get(rowIndex));
                 break;
-            case "DECIMAL":
+            case DECIMAL:

Review Comment:
   why only `DECIMAL` is static field?



##########
seatunnel-connectors-v2/connector-doris/src/test/java/org/apache/seatunnel/connectors/doris/serialize/SeaTunnelRowConverterTest.java:
##########
@@ -1,54 +0,0 @@
-/*
- * 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.seatunnel.connectors.doris.serialize;
-
-import org.apache.seatunnel.api.table.type.LocalTimeType;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.time.LocalDateTime;
-
-public class SeaTunnelRowConverterTest {
-
-    private static final SeaTunnelRowConverter seaTunnelRowConverter = new SeaTunnelRowConverter();
-
-    @Test
-    void testDateTimeWithNano() {
-        Assertions.assertEquals(
-                "2021-01-01 00:00:00.123456",
-                seaTunnelRowConverter.convert(
-                        LocalTimeType.LOCAL_DATE_TIME_TYPE,
-                        LocalDateTime.of(2021, 1, 1, 0, 0, 0, 123456789)));
-        Assertions.assertEquals(
-                "2021-01-01 00:00:00.000000",
-                seaTunnelRowConverter.convert(
-                        LocalTimeType.LOCAL_DATE_TIME_TYPE,
-                        LocalDateTime.of(2021, 1, 1, 0, 0, 0, 0)));
-        Assertions.assertEquals(
-                "2021-01-01 00:00:00.000001",
-                seaTunnelRowConverter.convert(
-                        LocalTimeType.LOCAL_DATE_TIME_TYPE,
-                        LocalDateTime.of(2021, 1, 1, 0, 0, 0, 1000)));
-        Assertions.assertEquals(
-                "2021-01-01 00:00:00.000123",
-                seaTunnelRowConverter.convert(
-                        LocalTimeType.LOCAL_DATE_TIME_TYPE,
-                        LocalDateTime.of(2021, 1, 1, 0, 0, 0, 123456)));
-    }

Review Comment:
   we should make sure the behavior not change. Please do not delete this test case. Instand of cover it by `SeaTunnelRowSerializer`.



-- 
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@seatunnel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] [Improve][Doris Connector] Unified serialization method,Use RowToJsonConverter and TextSerializationSchema [seatunnel]

Posted by "liugddx (via GitHub)" <gi...@apache.org>.
liugddx commented on code in PR #7229:
URL: https://github.com/apache/seatunnel/pull/7229#discussion_r1685720530


##########
seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/source/serialization/RowBatch.java:
##########
@@ -71,21 +75,22 @@
 
 @Slf4j
 public class RowBatch {

Review Comment:
   > why change `RowBatch`? Any test case?
   
   I adapted the latest version of doris, and I found that many types were incompatible, so I added some type conversions.It is backwards compatible



-- 
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@seatunnel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] [Improve][Doris Connector] Unified serialization method,Use RowToJsonConverter and TextSerializationSchema [seatunnel]

Posted by "liugddx (via GitHub)" <gi...@apache.org>.
liugddx commented on code in PR #7229:
URL: https://github.com/apache/seatunnel/pull/7229#discussion_r1685720659


##########
seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/source/serialization/RowBatch.java:
##########
@@ -267,7 +272,7 @@ private void convertArrowValue(
                         rowIndex ->
                                 float8Vector.isNull(rowIndex) ? null : float8Vector.get(rowIndex));
                 break;
-            case "DECIMAL":
+            case DECIMAL:

Review Comment:
   > why only `DECIMAL` is static field?
   
   My bad, rolled back



-- 
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@seatunnel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] [Improve][Doris Connector] Unified serialization method,Use RowToJsonConverter and TextSerializationSchema [seatunnel]

Posted by "Hisoka-X (via GitHub)" <gi...@apache.org>.
Hisoka-X commented on code in PR #7229:
URL: https://github.com/apache/seatunnel/pull/7229#discussion_r1681204962


##########
seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/serialize/SeaTunnelRowSerializer.java:
##########
@@ -105,46 +79,40 @@ public String parseDeleteSign(RowKind rowKind) {
         }
     }
 
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    /** Builder for RowDataSerializer. */
-    public static class Builder {
-        private SeaTunnelRowType seaTunnelRowType;
-        private String type;
-        private String fieldDelimiter;
-        private boolean deletable;
-
-        public Builder setType(String type) {
-            this.type = type;
-            return this;
-        }
+    @Override
+    public void open() throws IOException {}
 
-        public Builder setSeaTunnelRowType(SeaTunnelRowType seaTunnelRowType) {
-            this.seaTunnelRowType = seaTunnelRowType;
-            return this;
-        }
+    @Override
+    public byte[] serialize(SeaTunnelRow seaTunnelRow) throws IOException {
 
-        public Builder setFieldDelimiter(String fieldDelimiter) {
-            this.fieldDelimiter = fieldDelimiter;
-            return this;
-        }
+        List<String> fieldNames = Arrays.asList(seaTunnelRowType.getFieldNames());
+        List<SeaTunnelDataType<?>> fieldTypes = Arrays.asList(seaTunnelRowType.getFieldTypes());
 
-        public Builder enableDelete(boolean deletable) {
-            this.deletable = deletable;
-            return this;
+        if (enableDelete) {
+            SeaTunnelRow seaTunnelRowEnableDelete = seaTunnelRow.copy();

Review Comment:
   reuse `parseDeleteSign`?



-- 
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@seatunnel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org