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/05/25 09:52:11 UTC
[GitHub] [incubator-inlong] thexiay opened a new pull request, #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
thexiay opened a new pull request, #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379
### Title Name: [INLONG-4353][Sort] Optimize code structure and shading jar
Fixes #4353
### Motivation
Optimize code structure and shading jar
### Modifications
*Describe the modifications you've done.*
--
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] [incubator-inlong] dockerzhang merged pull request #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
Posted by GitBox <gi...@apache.org>.
dockerzhang merged PR #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379
--
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] [incubator-inlong] healchow commented on a diff in pull request #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
Posted by GitBox <gi...@apache.org>.
healchow commented on code in PR #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379#discussion_r882474490
##########
inlong-dashboard/tsconfig.json:
##########
@@ -1,34 +1,34 @@
-{
- "extends": "./tsconfig.paths.json",
- "compilerOptions": {
Review Comment:
Maybe you can revert this file, and commit it again.
--
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] [incubator-inlong] dockerzhang commented on a diff in pull request #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
Posted by GitBox <gi...@apache.org>.
dockerzhang commented on code in PR #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379#discussion_r882639523
##########
inlong-distribution/src/main/assemblies/sort-plugin.xml:
##########
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<assembly>
+ <id>sort-plugin</id>
Review Comment:
ditto
--
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] [incubator-inlong] gong commented on a diff in pull request #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
Posted by GitBox <gi...@apache.org>.
gong commented on code in PR #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379#discussion_r881498895
##########
inlong-sort/sort-connectors/pom.xml:
##########
@@ -73,125 +72,6 @@
<artifactId>flink-table-runtime-blink_${flink.scala.binary.version}</artifactId>
<scope>provided</scope>
</dependency>
- <!--for hadoop common-->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <!--for iceberg-->
- <dependency>
- <groupId>org.apache.iceberg</groupId>
- <artifactId>iceberg-flink-1.13</artifactId>
- </dependency>
- <!--for kafka-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka_${flink.scala.binary.version}</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- </dependency>
- <!--for hbase-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-hbase-2.2_${flink.scala.binary.version}</artifactId>
- </dependency>
- <!--for postgres cdc -->
- <dependency>
- <groupId>com.ververica</groupId>
- <artifactId>flink-connector-postgres-cdc</artifactId>
- </dependency>
- <!--for mongodb-->
- <dependency>
- <groupId>com.ververica</groupId>
- <artifactId>flink-connector-mongodb-cdc</artifactId>
- </dependency>
- <!--for debezium-->
- <dependency>
- <groupId>io.debezium</groupId>
- <artifactId>debezium-embedded</artifactId>
- </dependency>
- <dependency>
- <artifactId>debezium-core</artifactId>
- <groupId>io.debezium</groupId>
- </dependency>
- <!--for sort format-->
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-base</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-csv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-kv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-inlongmsg-base</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-inlongmsg-csv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-json</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- flink json -->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-json</artifactId>
- </dependency>
- <!--for csv-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-csv</artifactId>
- </dependency>
- <!--for avro-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro</artifactId>
- </dependency>
Review Comment:
kafka connector need add format dependency
--
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] [incubator-inlong] EMsnap commented on a diff in pull request #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
Posted by GitBox <gi...@apache.org>.
EMsnap commented on code in PR #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379#discussion_r881541366
##########
inlong-distribution/distribution.xml:
##########
@@ -70,6 +70,32 @@
<include>sort-dist-${project.version}.jar</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>../inlong-sort/sort-connectors/**/target/*</directory>
+ <outputDirectory>inlong-sort</outputDirectory>
+ <includes>
+ <include>sort-connector-hbase-${project.version}.jar</include>
+ <include>sort-connector-hive-${project.version}.jar</include>
+ <include>sort-connector-iceberg-${project.version}.jar</include>
+ <include>sort-connector-jdbc-${project.version}.jar</include>
+ <include>sort-connector-kafka-${project.version}.jar</include>
+ <include>sort-connector-mongodb-cdc-${project.version}.jar</include>
+ <include>sort-connector-mysql-cdc-${project.version}.jar</include>
+ <include>sort-connector-postgres-cdc-${project.version}.jar</include>
+ <include>sort-connector-pulsar-${project.version}.jar</include>
+ <include>sort-connector-sqlserver-cdc-${project.version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../inlong-sort/sort-formats/**/target/*</directory>
+ <outputDirectory>inlong-sort</outputDirectory>
Review Comment:
inlong-sort/plugin/format may be better
##########
inlong-distribution/distribution.xml:
##########
@@ -70,6 +70,32 @@
<include>sort-dist-${project.version}.jar</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>../inlong-sort/sort-connectors/**/target/*</directory>
+ <outputDirectory>inlong-sort</outputDirectory>
Review Comment:
inlong-sort/plugin/connectors may be better
--
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] [incubator-inlong] healchow commented on a diff in pull request #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
Posted by GitBox <gi...@apache.org>.
healchow commented on code in PR #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379#discussion_r881784078
##########
inlong-dashboard/tsconfig.json:
##########
@@ -1,34 +1,34 @@
-{
- "extends": "./tsconfig.paths.json",
- "compilerOptions": {
Review Comment:
Why change the dashboard config?
--
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] [incubator-inlong] thexiay commented on a diff in pull request #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
Posted by GitBox <gi...@apache.org>.
thexiay commented on code in PR #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379#discussion_r882469111
##########
inlong-sort/sort-connectors/pom.xml:
##########
@@ -73,125 +72,6 @@
<artifactId>flink-table-runtime-blink_${flink.scala.binary.version}</artifactId>
<scope>provided</scope>
</dependency>
- <!--for hadoop common-->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <!--for iceberg-->
- <dependency>
- <groupId>org.apache.iceberg</groupId>
- <artifactId>iceberg-flink-1.13</artifactId>
- </dependency>
- <!--for kafka-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka_${flink.scala.binary.version}</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- </dependency>
- <!--for hbase-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-hbase-2.2_${flink.scala.binary.version}</artifactId>
- </dependency>
- <!--for postgres cdc -->
- <dependency>
- <groupId>com.ververica</groupId>
- <artifactId>flink-connector-postgres-cdc</artifactId>
- </dependency>
- <!--for mongodb-->
- <dependency>
- <groupId>com.ververica</groupId>
- <artifactId>flink-connector-mongodb-cdc</artifactId>
- </dependency>
- <!--for debezium-->
- <dependency>
- <groupId>io.debezium</groupId>
- <artifactId>debezium-embedded</artifactId>
- </dependency>
- <dependency>
- <artifactId>debezium-core</artifactId>
- <groupId>io.debezium</groupId>
- </dependency>
- <!--for sort format-->
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-base</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-csv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-kv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-inlongmsg-base</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-inlongmsg-csv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-json</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- flink json -->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-json</artifactId>
- </dependency>
- <!--for csv-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-csv</artifactId>
- </dependency>
- <!--for avro-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro</artifactId>
- </dependency>
Review Comment:
All basic format now is in sort-dist.
--
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] [incubator-inlong] dockerzhang commented on a diff in pull request #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
Posted by GitBox <gi...@apache.org>.
dockerzhang commented on code in PR #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379#discussion_r882632328
##########
inlong-distribution/pom.xml:
##########
@@ -38,20 +38,35 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
+ <configuration>
+ <finalName>apache-${project.parent.artifactId}-${project.version}</finalName>
+ </configuration>
<executions>
<execution>
+ <id>release</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assemblies/release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>sort-plugin</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assemblies/sort-plugin.xml</descriptor>
Review Comment:
`plugin` change to `connector` may be better.
--
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] [incubator-inlong] GanfengTan commented on a diff in pull request #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
Posted by GitBox <gi...@apache.org>.
GanfengTan commented on code in PR #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379#discussion_r881470878
##########
inlong-sort/sort-connectors/pom.xml:
##########
@@ -39,15 +39,14 @@
<module>kafka</module>
<module>jdbc</module>
<module>pulsar</module>
Review Comment:
Does filesystem need to add？
--
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] [incubator-inlong] thexiay commented on a diff in pull request #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
Posted by GitBox <gi...@apache.org>.
thexiay commented on code in PR #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379#discussion_r882469111
##########
inlong-sort/sort-connectors/pom.xml:
##########
@@ -73,125 +72,6 @@
<artifactId>flink-table-runtime-blink_${flink.scala.binary.version}</artifactId>
<scope>provided</scope>
</dependency>
- <!--for hadoop common-->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <!--for iceberg-->
- <dependency>
- <groupId>org.apache.iceberg</groupId>
- <artifactId>iceberg-flink-1.13</artifactId>
- </dependency>
- <!--for kafka-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka_${flink.scala.binary.version}</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- </dependency>
- <!--for hbase-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-hbase-2.2_${flink.scala.binary.version}</artifactId>
- </dependency>
- <!--for postgres cdc -->
- <dependency>
- <groupId>com.ververica</groupId>
- <artifactId>flink-connector-postgres-cdc</artifactId>
- </dependency>
- <!--for mongodb-->
- <dependency>
- <groupId>com.ververica</groupId>
- <artifactId>flink-connector-mongodb-cdc</artifactId>
- </dependency>
- <!--for debezium-->
- <dependency>
- <groupId>io.debezium</groupId>
- <artifactId>debezium-embedded</artifactId>
- </dependency>
- <dependency>
- <artifactId>debezium-core</artifactId>
- <groupId>io.debezium</groupId>
- </dependency>
- <!--for sort format-->
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-base</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-csv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-kv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-inlongmsg-base</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-inlongmsg-csv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-json</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- flink json -->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-json</artifactId>
- </dependency>
- <!--for csv-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-csv</artifactId>
- </dependency>
- <!--for avro-->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro</artifactId>
- </dependency>
Review Comment:
All basic format now is in sort-dist.(csv、tbcsv、kv、canal-json、debizum-json、orc、avro、parquet)
--
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] [incubator-inlong] thexiay commented on a diff in pull request #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
Posted by GitBox <gi...@apache.org>.
thexiay commented on code in PR #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379#discussion_r882468750
##########
inlong-sort/sort-connectors/pom.xml:
##########
@@ -39,15 +39,14 @@
<module>kafka</module>
<module>jdbc</module>
<module>pulsar</module>
Review Comment:
no need.File System is in blink runtime.
--
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] [incubator-inlong] thexiay commented on a diff in pull request #4379: [INLONG-4353][Sort] Optimize code structure and shading jar
Posted by GitBox <gi...@apache.org>.
thexiay commented on code in PR #4379:
URL: https://github.com/apache/incubator-inlong/pull/4379#discussion_r882268647
##########
inlong-dashboard/tsconfig.json:
##########
@@ -1,34 +1,34 @@
-{
- "extends": "./tsconfig.paths.json",
- "compilerOptions": {
Review Comment:
i don't know.It delete it and add it but in fact nothing has changed. should i force push 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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org