This is an automated email from the ASF dual-hosted git repository. dockerzhang pushed a commit to branch branch-1.5 in repository https://gitbox.apache.org/repos/asf/inlong.git
commit 43da7e2aa1df193cb140a5ef3af217eef1cd4958 Author: Schnapps <[email protected]> AuthorDate: Tue Jan 10 18:40:13 2023 +0800 [INLONG-7202][Sort] Fix unit tests ( including PostgreSql \ Hbase \ Elasticsearch ) in sort-core (#7203) --- inlong-sort/sort-connectors/elasticsearch-6/pom.xml | 4 ++++ inlong-sort/sort-connectors/elasticsearch-7/pom.xml | 4 ++++ .../META-INF/services/org.apache.flink.table.factories.Factory | 2 +- inlong-sort/sort-connectors/mysql-cdc/pom.xml | 4 ++++ inlong-sort/sort-connectors/oracle-cdc/pom.xml | 4 ++++ inlong-sort/sort-connectors/postgres-cdc/pom.xml | 4 ++++ .../org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java | 2 +- 7 files changed, 22 insertions(+), 2 deletions(-) diff --git a/inlong-sort/sort-connectors/elasticsearch-6/pom.xml b/inlong-sort/sort-connectors/elasticsearch-6/pom.xml index 100148a26..1402040e8 100644 --- a/inlong-sort/sort-connectors/elasticsearch-6/pom.xml +++ b/inlong-sort/sort-connectors/elasticsearch-6/pom.xml @@ -251,6 +251,10 @@ <pattern>com.fasterxml.jackson</pattern> <shadedPattern>org.apache.flink.elasticsearch6.shaded.com.fasterxml.jackson</shadedPattern> </relocation> + <relocation> + <pattern>org.apache.inlong.sort.elasticsearch</pattern> + <shadedPattern>org.apache.inlong.sort.elasticsearch6</shadedPattern> + </relocation> </relocations> </configuration> </execution> diff --git a/inlong-sort/sort-connectors/elasticsearch-7/pom.xml b/inlong-sort/sort-connectors/elasticsearch-7/pom.xml index 0cc1a86a2..6ad39307c 100644 --- a/inlong-sort/sort-connectors/elasticsearch-7/pom.xml +++ b/inlong-sort/sort-connectors/elasticsearch-7/pom.xml @@ -248,6 +248,10 @@ <pattern>com.github.mustachejava</pattern> <shadedPattern>org.apache.flink.elasticsearch7.shaded.com.github.mustachejava</shadedPattern> </relocation> + <relocation> + <pattern>org.apache.inlong.sort.elasticsearch</pattern> + <shadedPattern>org.apache.inlong.sort.elasticsearch7</shadedPattern> + </relocation> </relocations> </configuration> </execution> diff --git a/inlong-sort/sort-connectors/hbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/inlong-sort/sort-connectors/hbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 8f8cea02b..3ee47cd5e 100644 --- a/inlong-sort/sort-connectors/hbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/inlong-sort/sort-connectors/hbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.inlong.sort.hbase.HBase2DynamicTableFactory +org.apache.inlong.sort.hbase.HBase2DynamicTableFactory \ No newline at end of file diff --git a/inlong-sort/sort-connectors/mysql-cdc/pom.xml b/inlong-sort/sort-connectors/mysql-cdc/pom.xml index dc7793311..79a762a53 100644 --- a/inlong-sort/sort-connectors/mysql-cdc/pom.xml +++ b/inlong-sort/sort-connectors/mysql-cdc/pom.xml @@ -124,6 +124,10 @@ <pattern>org.apache.inlong.sort.base</pattern> <shadedPattern>org.apache.inlong.sort.cdc.mysql.shaded.org.apache.inlong.sort.base</shadedPattern> </relocation> + <relocation> + <pattern>org.apache.inlong.sort.cdc.base</pattern> + <shadedPattern>org.apache.inlong.sort.cdc.mysql.shaded.org.apache.inlong.sort.cdc.base</shadedPattern> + </relocation> <relocation> <pattern>org.apache.kafka</pattern> <shadedPattern>com.ververica.cdc.connectors.shaded.org.apache.kafka</shadedPattern> diff --git a/inlong-sort/sort-connectors/oracle-cdc/pom.xml b/inlong-sort/sort-connectors/oracle-cdc/pom.xml index d08f13e63..d06d3b8f2 100644 --- a/inlong-sort/sort-connectors/oracle-cdc/pom.xml +++ b/inlong-sort/sort-connectors/oracle-cdc/pom.xml @@ -144,6 +144,10 @@ <pattern>org.apache.inlong.sort.base</pattern> <shadedPattern>org.apache.inlong.sort.cdc.oracle.shaded.org.apache.inlong.sort.base</shadedPattern> </relocation> + <relocation> + <pattern>org.apache.inlong.sort.cdc.base</pattern> + <shadedPattern>org.apache.inlong.sort.cdc.oracle.shaded.org.apache.inlong.sort.cdc.base</shadedPattern> + </relocation> <relocation> <pattern>io.debezium</pattern> <shadedPattern>org.apache.inlong.sort.cdc.oracle.shaded.io.debezium</shadedPattern> diff --git a/inlong-sort/sort-connectors/postgres-cdc/pom.xml b/inlong-sort/sort-connectors/postgres-cdc/pom.xml index 5d4823b1e..8912a6fa1 100644 --- a/inlong-sort/sort-connectors/postgres-cdc/pom.xml +++ b/inlong-sort/sort-connectors/postgres-cdc/pom.xml @@ -138,6 +138,10 @@ <pattern>org.apache.inlong.sort.base</pattern> <shadedPattern>org.apache.inlong.sort.cdc.postgres.shaded.org.apache.inlong.sort.base</shadedPattern> </relocation> + <relocation> + <pattern>org.apache.inlong.sort.cdc.base</pattern> + <shadedPattern>org.apache.inlong.sort.cdc.postgres.shaded.org.apache.inlong.sort.cdc.base</shadedPattern> + </relocation> <relocation> <pattern>org.apache.kafka</pattern> <shadedPattern>com.ververica.cdc.connectors.shaded.org.apache.kafka</shadedPattern> diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java index 505f6f589..6046d10c8 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java @@ -74,7 +74,7 @@ public class HbaseLoadFlinkSqlParseTest extends AbstractTestBase { Map<String, String> properties = new LinkedHashMap<>(); properties.put("dirty.side-output.connector", "log"); properties.put("dirty.ignore", "true"); - properties.put("dirty.side-output.enable", "true"); + properties.put("dirty.side-output.enable", "false"); properties.put("dirty.side-output.format", "csv"); properties.put("dirty.side-output.labels", "SYSTEM_TIME=${SYSTEM_TIME}&DIRTY_TYPE=${DIRTY_TYPE}&database=default&table=mytable");
