This is an automated email from the ASF dual-hosted git repository. fanrui pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit e9d7c321fb8097d7f61b0451a0cbbe7a941c9072 Author: Joao Boto <[email protected]> AuthorDate: Mon Jul 8 18:49:34 2024 +0200 [FLINK-35788] Deprecate JdbcXaSinkFunction --- .../sink/committer/JdbcCommitableSerializer.java | 2 +- .../xa/exceptions/EmptyTransactionXaException.java | 9 ++++--- .../transactions/xa/xid}/XidImpl.java | 6 ++--- .../transactions/xa/xid}/XidSerializer.java | 2 +- .../transactions/xa/xid}/XaXidTest.java | 7 +++--- .../transactions/xa/xid}/XidSerializersTest.java | 2 +- .../jdbc/derby/xa/DerbyExactlyOnceSinkE2eTest.java | 28 --------------------- .../jdbc/db2/xa/Db2ExactlyOnceSinkE2eTest.java | 25 ------------------- .../jdbc/mysql/xa/MySqlExactlyOnceSinkE2eTest.java | 28 --------------------- .../oracle/xa/OracleExactlyOnceSinkE2eTest.java | 25 ------------------- .../xa/PostgresExactlyOnceSinkE2eTest.java | 29 ---------------------- .../xa/SqlServerExactlyOnceSinkE2eTest.java | 29 ---------------------- .../flink/connector/jdbc/xa/CheckpointAndXid.java | 1 + .../jdbc/xa/CheckpointAndXidSerializer.java | 2 ++ .../connector/jdbc/xa/JdbcXaSinkFunction.java | 1 + .../connector/jdbc/xa/JdbcXaSinkFunctionState.java | 1 + .../apache/flink/connector/jdbc/xa/JobSubtask.java | 1 + .../connector/jdbc/xa/SemanticXidGenerator.java | 2 ++ .../apache/flink/connector/jdbc/xa/XaFacade.java | 1 + .../flink/connector/jdbc/xa/XaFacadeImpl.java | 1 + .../connector/jdbc/xa/XaFacadePoolingImpl.java | 1 + .../apache/flink/connector/jdbc/xa/XaGroupOps.java | 1 + .../flink/connector/jdbc/xa/XaGroupOpsImpl.java | 1 + .../connector/jdbc/xa/XaSinkStateHandler.java | 1 + .../connector/jdbc/xa/XaSinkStateHandlerImpl.java | 1 + .../connector/jdbc/xa/XaSinkStateSerializer.java | 2 ++ .../flink/connector/jdbc/xa/XidGenerator.java | 1 + .../flink/connector/jdbc/xa/package-info.java | 1 + .../jdbc/xa/CheckpointAndXidSerializersTest.java | 1 + .../jdbc/xa/JdbcExactlyOnceSinkE2eTest.java | 0 .../connector/jdbc/xa/JdbcXaFacadeImplTest.java | 0 .../connector/jdbc/xa/JdbcXaFacadeTestHelper.java | 0 .../connector/jdbc/xa/JdbcXaSinkDerbyTest.java | 0 .../flink/connector/jdbc/xa/JdbcXaSinkH2Test.java | 0 .../connector/jdbc/xa/JdbcXaSinkMigrationTest.java | 0 .../jdbc/xa/JdbcXaSinkNoInsertionTest.java | 0 .../connector/jdbc/xa/JdbcXaSinkTestBase.java | 0 .../connector/jdbc/xa/JdbcXaSinkTestHelper.java | 0 .../jdbc/xa/SemanticXidGeneratorTest.java | 1 + 39 files changed, 36 insertions(+), 177 deletions(-) diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitableSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitableSerializer.java index 56a4a21f..a26eea8d 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitableSerializer.java +++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitableSerializer.java @@ -2,7 +2,7 @@ package org.apache.flink.connector.jdbc.core.datastream.sink.committer; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.connector.jdbc.xa.XidSerializer; +import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XidSerializer; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java index ae3374a3..52e36abe 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java +++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java @@ -1,16 +1,17 @@ package org.apache.flink.connector.jdbc.datasource.transactions.xa.exceptions; import org.apache.flink.annotation.PublicEvolving; -import org.apache.flink.connector.jdbc.xa.XaFacade; +import org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction; import org.apache.flink.util.FlinkRuntimeException; import javax.transaction.xa.XAException; import javax.transaction.xa.Xid; /** - * Thrown by {@link XaFacade} when RM responds with {@link javax.transaction.xa.XAResource#XA_RDONLY - * XA_RDONLY} indicating that the transaction doesn't include any changes. When such a transaction - * is committed RM may return an error (usually, {@link XAException#XAER_NOTA XAER_NOTA}). + * Thrown by {@link XaTransaction} when RM responds with {@link + * javax.transaction.xa.XAResource#XA_RDONLY XA_RDONLY} indicating that the transaction doesn't + * include any changes. When such a transaction is committed RM may return an error (usually, {@link + * XAException#XAER_NOTA XAER_NOTA}). */ @PublicEvolving public class EmptyTransactionXaException extends FlinkRuntimeException { diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidImpl.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidImpl.java similarity index 93% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidImpl.java rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidImpl.java index 4135f1bc..1e5b26b2 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidImpl.java +++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.flink.connector.jdbc.xa; +package org.apache.flink.connector.jdbc.datasource.transactions.xa.xid; import org.apache.flink.annotation.Internal; import org.apache.flink.util.Preconditions; @@ -34,7 +34,7 @@ import static org.apache.flink.util.StringUtils.byteToHexString; * arrays. */ @Internal -final class XidImpl implements Xid, Serializable { +public final class XidImpl implements Xid, Serializable { private static final long serialVersionUID = 1L; @@ -42,7 +42,7 @@ final class XidImpl implements Xid, Serializable { @Nonnull private final byte[] globalTransactionId; @Nonnull private final byte[] branchQualifier; - XidImpl(int formatId, byte[] globalTransactionId, byte[] branchQualifier) { + public XidImpl(int formatId, byte[] globalTransactionId, byte[] branchQualifier) { Preconditions.checkArgument(globalTransactionId.length <= Xid.MAXGTRIDSIZE); Preconditions.checkArgument(branchQualifier.length <= Xid.MAXBQUALSIZE); this.formatId = formatId; diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidSerializer.java similarity index 98% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidSerializer.java rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidSerializer.java index 9f4d6d31..8082a809 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidSerializer.java +++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.flink.connector.jdbc.xa; +package org.apache.flink.connector.jdbc.datasource.transactions.xa.xid; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XaXidTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XaXidTest.java similarity index 91% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XaXidTest.java rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XaXidTest.java index 332aa06b..decd06d4 100644 --- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XaXidTest.java +++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XaXidTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.flink.connector.jdbc.xa; +package org.apache.flink.connector.jdbc.datasource.transactions.xa.xid; import org.junit.jupiter.api.Test; @@ -26,8 +26,9 @@ import static javax.transaction.xa.Xid.MAXGTRIDSIZE; import static org.assertj.core.api.Assertions.assertThat; /** Test for {@link XidImpl}. */ -class XaXidTest { - static final XidImpl XID = new XidImpl(1, randomBytes(MAXGTRIDSIZE), randomBytes(MAXBQUALSIZE)); +public class XaXidTest { + public static final XidImpl XID = + new XidImpl(1, randomBytes(MAXGTRIDSIZE), randomBytes(MAXBQUALSIZE)); @Test void testXidsEqual() { diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XidSerializersTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidSerializersTest.java similarity index 95% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XidSerializersTest.java rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidSerializersTest.java index 55118fea..c35793ad 100644 --- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XidSerializersTest.java +++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidSerializersTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.flink.connector.jdbc.xa; +package org.apache.flink.connector.jdbc.datasource.transactions.xa.xid; import org.apache.flink.api.common.typeutils.SerializerTestBase; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/xa/DerbyExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/xa/DerbyExactlyOnceSinkE2eTest.java deleted file mode 100644 index 2cf93981..00000000 --- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/xa/DerbyExactlyOnceSinkE2eTest.java +++ /dev/null @@ -1,28 +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.flink.connector.jdbc.derby.xa; - -import org.apache.flink.connector.jdbc.derby.DerbyTestBase; -import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest; - -/** - * A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. Check for issues with errors on - * closing connections. - */ -class DerbyExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest implements DerbyTestBase {} diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/xa/Db2ExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/xa/Db2ExactlyOnceSinkE2eTest.java deleted file mode 100644 index bfce4eb2..00000000 --- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/xa/Db2ExactlyOnceSinkE2eTest.java +++ /dev/null @@ -1,25 +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.flink.connector.jdbc.db2.xa; - -import org.apache.flink.connector.jdbc.db2.Db2TestBase; -import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest; - -/** A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. */ -class Db2ExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest implements Db2TestBase {} diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/xa/MySqlExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/xa/MySqlExactlyOnceSinkE2eTest.java deleted file mode 100644 index 56010465..00000000 --- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/xa/MySqlExactlyOnceSinkE2eTest.java +++ /dev/null @@ -1,28 +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.flink.connector.jdbc.mysql.xa; - -import org.apache.flink.connector.jdbc.mysql.MySqlTestBase; -import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest; - -/** - * A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. Check for issues with errors on - * closing connections. - */ -class MySqlExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest implements MySqlTestBase {} diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/xa/OracleExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/xa/OracleExactlyOnceSinkE2eTest.java deleted file mode 100644 index 4d5d4d17..00000000 --- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/xa/OracleExactlyOnceSinkE2eTest.java +++ /dev/null @@ -1,25 +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.flink.connector.jdbc.oracle.xa; - -import org.apache.flink.connector.jdbc.oracle.OracleTestBase; -import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest; - -/** A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. */ -class OracleExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest implements OracleTestBase {} diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/xa/PostgresExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/xa/PostgresExactlyOnceSinkE2eTest.java deleted file mode 100644 index 67210a51..00000000 --- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/xa/PostgresExactlyOnceSinkE2eTest.java +++ /dev/null @@ -1,29 +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.flink.connector.jdbc.postgres.xa; - -import org.apache.flink.connector.jdbc.postgres.PostgresTestBase; -import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest; - -/** - * A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. Check for issues with suspending - * connections (requires pooling) and honoring limits (properly closing connections). - */ -class PostgresExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest - implements PostgresTestBase {} diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java deleted file mode 100644 index 8117ea53..00000000 --- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java +++ /dev/null @@ -1,29 +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.flink.connector.jdbc.sqlserver.xa; - -import org.apache.flink.connector.jdbc.sqlserver.SqlServerTestBase; -import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest; - -/** - * A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. Check for issues with errors on - * closing connections. - */ -class SqlServerExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest - implements SqlServerTestBase {} diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java similarity index 99% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java index da851fb1..6ce59738 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java @@ -31,6 +31,7 @@ import java.util.Objects; */ @ThreadSafe @Internal +@Deprecated public final class CheckpointAndXid { final long checkpointId; final Xid xid; diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java similarity index 97% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java index 18f0130e..a7125750 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java @@ -21,6 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XidSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; @@ -31,6 +32,7 @@ import java.util.Objects; /** {@link CheckpointAndXid} serializer. */ @Internal +@Deprecated public final class CheckpointAndXidSerializer extends TypeSerializer<CheckpointAndXid> { private static final long serialVersionUID = 1L; diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java similarity index 99% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java index 417f6328..b88eddb5 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java @@ -127,6 +127,7 @@ import static org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunctionState.of; * @since 1.13 */ @Internal +@Deprecated public class JdbcXaSinkFunction<T> extends AbstractRichFunction implements CheckpointedFunction, CheckpointListener, diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java similarity index 99% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java index 8bcde5c5..e859647f 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java @@ -31,6 +31,7 @@ import static java.util.Collections.unmodifiableCollection; /** Thread-safe (assuming immutable {@link Xid} implementation). */ @ThreadSafe @Internal +@Deprecated class JdbcXaSinkFunctionState { private final Collection<CheckpointAndXid> prepared; private final Collection<Xid> hanging; diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java similarity index 99% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java index 92ef029f..ad335b6c 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java @@ -8,6 +8,7 @@ import java.io.Serializable; /** Job identifier. */ @Internal +@Deprecated class JobSubtask implements Serializable { private final byte[] jobId; diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java similarity index 97% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java index f134b325..5acd7af5 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java @@ -19,6 +19,7 @@ package org.apache.flink.connector.jdbc.xa; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.JobID; +import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XidImpl; import javax.transaction.xa.Xid; @@ -41,6 +42,7 @@ import java.util.Arrays; * collide). */ @Internal +@Deprecated class SemanticXidGenerator implements XidGenerator { private static final long serialVersionUID = 1L; diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java similarity index 99% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java index b6d1e995..b7616600 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java @@ -47,6 +47,7 @@ import java.util.function.Supplier; * {@link #recover} can be used to get abandoned prepared transactions for cleanup. */ @Internal +@Deprecated public interface XaFacade extends JdbcConnectionProvider, Serializable, AutoCloseable { /** @return a non-serializable instance. */ diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java similarity index 99% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java index 24dc127b..606f6c2f 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java @@ -64,6 +64,7 @@ import static javax.transaction.xa.XAResource.TMSTARTRSCAN; /** Default {@link XaFacade} implementation. */ @NotThreadSafe @Internal +@Deprecated class XaFacadeImpl implements XaFacade { private static final long serialVersionUID = 1L; diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java similarity index 99% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java index 04d4855e..2dbb6936 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java @@ -45,6 +45,7 @@ import static org.apache.flink.util.Preconditions.checkState; * XA resource after each xa_start call is made (and associates it with the xid to commit later). */ @Internal +@Deprecated class XaFacadePoolingImpl implements XaFacade { private static final long serialVersionUID = 1L; diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java similarity index 99% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java index 455f5574..b355f11a 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Optional; @Internal +@Deprecated interface XaGroupOps extends Serializable { GroupXaOperationResult<CheckpointAndXid> commit( diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java similarity index 99% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java index 16a6816c..b1ace009 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java @@ -31,6 +31,7 @@ import java.util.Iterator; import java.util.List; @Internal +@Deprecated class XaGroupOpsImpl implements XaGroupOps { private static final long serialVersionUID = 1L; diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java similarity index 99% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java index 90c6e6e8..8c2df29b 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java @@ -23,6 +23,7 @@ import org.apache.flink.runtime.state.FunctionInitializationContext; import java.io.Serializable; @Internal +@Deprecated interface XaSinkStateHandler extends Serializable { JdbcXaSinkFunctionState load(FunctionInitializationContext context) throws Exception; diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java similarity index 99% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java index 148abf4d..c293162d 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java @@ -34,6 +34,7 @@ import java.util.Collections; import java.util.List; @Internal +@Deprecated class XaSinkStateHandlerImpl implements XaSinkStateHandler { private static final long serialVersionUID = 1L; diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java similarity index 98% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java index d6687f3b..0111e105 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java @@ -21,6 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XidSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; @@ -32,6 +33,7 @@ import java.util.List; /** XaSinkStateSerializer. */ @Internal +@Deprecated public final class XaSinkStateSerializer extends TypeSerializer<JdbcXaSinkFunctionState> { private static final TypeSerializerSnapshot<JdbcXaSinkFunctionState> SNAPSHOT = diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java similarity index 99% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java index 3a15fab4..e3920235 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java @@ -26,6 +26,7 @@ import java.security.SecureRandom; /** {@link Xid} generator. */ @Internal +@Deprecated public interface XidGenerator extends Serializable, AutoCloseable { /** diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java similarity index 98% rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java index fb12c036..41ae010b 100644 --- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java +++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java @@ -20,4 +20,5 @@ * * @see org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction JdbcXaExactlyOnceSinkFunction */ +@Deprecated package org.apache.flink.connector.jdbc.xa; diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java similarity index 95% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java index 940e8df3..b736dddb 100644 --- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java @@ -19,6 +19,7 @@ package org.apache.flink.connector.jdbc.xa; import org.apache.flink.api.common.typeutils.SerializerTestBase; import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XaXidTest; /** XaSerializersTest. */ class CheckpointAndXidSerializersTest extends SerializerTestBase<CheckpointAndXid> { diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java similarity index 100% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java similarity index 100% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java similarity index 100% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java similarity index 100% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java similarity index 100% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java similarity index 100% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java similarity index 100% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java similarity index 100% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java similarity index 100% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java similarity index 97% rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java index e82ffdac..03b9f8dd 100644 --- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java @@ -19,6 +19,7 @@ package org.apache.flink.connector.jdbc.xa; import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.functions.RuntimeContext; +import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XidImpl; import org.junit.jupiter.api.Test;
