alex-plekhanov commented on code in PR #11584:
URL: https://github.com/apache/ignite/pull/11584#discussion_r1801214209
##########
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/TableDmlIntegrationTest.java:
##########
@@ -153,12 +150,7 @@ public void testInsertPrimitiveKey() {
QueryEngine engine = Commons.lookupComponent(grid(1).context(),
QueryEngine.class);
Review Comment:
Variable can be removed.
##########
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/jdbc/JdbcThinTransactionalSelfTest.java:
##########
@@ -0,0 +1,295 @@
+/*
+ * 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.ignite.internal.processors.query.calcite.jdbc;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.ignite.calcite.CalciteQueryEngineConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.testframework.GridTestUtils;
+import
org.apache.ignite.testframework.junits.IgniteConfigVariationsAbstractTest.TestRunnable;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.junit.Test;
+
+import static java.sql.Connection.TRANSACTION_NONE;
+import static java.sql.Connection.TRANSACTION_READ_COMMITTED;
+import static java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+import static java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+import static java.sql.Connection.TRANSACTION_SERIALIZABLE;
+import static java.sql.ResultSet.CLOSE_CURSORS_AT_COMMIT;
+import static java.sql.ResultSet.CONCUR_READ_ONLY;
+import static java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT;
+import static java.sql.ResultSet.TYPE_FORWARD_ONLY;
+import static org.apache.ignite.testframework.GridTestUtils.assertThrows;
+
+/** */
+public class JdbcThinTransactionalSelfTest extends GridCommonAbstractTest {
+ /** URL. */
+ private static final String URL = "jdbc:ignite:thin://127.0.0.1";
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+ cfg.getTransactionConfiguration().setTxAwareQueriesEnabled(true);
+ cfg.getSqlConfiguration().setQueryEnginesConfiguration(new
CalciteQueryEngineConfiguration());
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ startGrid();
+ }
+
+ /** */
+ @Test
+ public void testDatabaseMetadata() throws Exception {
+ try (Connection conn = DriverManager.getConnection(URL)) {
+ DatabaseMetaData meta = conn.getMetaData();
+
+ assertTrue(meta.supportsTransactions());
+ assertEquals(TRANSACTION_READ_COMMITTED,
meta.getDefaultTransactionIsolation());
+ assertTrue(meta.supportsDataManipulationTransactionsOnly());
+
+
assertTrue(meta.supportsTransactionIsolationLevel(TRANSACTION_NONE));
+
assertTrue(meta.supportsTransactionIsolationLevel(TRANSACTION_READ_COMMITTED));
+
assertFalse(meta.supportsTransactionIsolationLevel(TRANSACTION_REPEATABLE_READ));
+
assertFalse(meta.supportsTransactionIsolationLevel(TRANSACTION_SERIALIZABLE));
+
assertFalse(meta.supportsTransactionIsolationLevel(TRANSACTION_READ_UNCOMMITTED));
+ }
+ }
+
+ /** */
+ @Test
+ public void testInvalidHoldability() throws Exception {
+ try (Connection conn = DriverManager.getConnection(URL)) {
+ List<TestRunnable> checks = Arrays.asList(
+ () -> conn.setHoldability(HOLD_CURSORS_OVER_COMMIT),
+ () -> conn.createStatement(TYPE_FORWARD_ONLY,
CONCUR_READ_ONLY, HOLD_CURSORS_OVER_COMMIT),
+ () -> conn.prepareStatement("SELECT * FROM T",
TYPE_FORWARD_ONLY, CONCUR_READ_ONLY, HOLD_CURSORS_OVER_COMMIT)
+ );
+
+ assertEquals(CLOSE_CURSORS_AT_COMMIT, conn.getHoldability());
+
+ for (TestRunnable check : checks) {
+ assertThrows(
+ null,
+ () -> {
+ check.run();
+ return null;
+ },
+ SQLException.class,
+ "Invalid holdability (can't hold cursor over commit)."
+ );
+ }
+ }
+ }
+
+ /** */
+ @Test
+ public void testTransactionConcurrencyProperty() throws Exception {
+ for (TransactionConcurrency txConcurrency :
TransactionConcurrency.values()) {
+ String url = URL + "?transactionConcurrency=" + txConcurrency;
+
+ try (Connection conn = DriverManager.getConnection(url)) {
+ conn.setAutoCommit(false);
+
+ try (ResultSet rs = conn.prepareStatement("SELECT
1").executeQuery()) {
+ assertEquals(1,
F.size(grid().context().cache().context().tm().activeTransactions()));
+ assertEquals(txConcurrency,
F.first(grid().context().cache().context().tm().activeTransactions()).concurrency());
+ }
+ }
+ }
+ }
+
+ /** */
+ @Test
+ public void testTransactionIsolation() throws Exception {
+ try (Connection conn = DriverManager.getConnection(URL)) {
+ assertEquals(TRANSACTION_READ_COMMITTED,
conn.getTransactionIsolation());
+
+ conn.setTransactionIsolation(TRANSACTION_NONE);
+
+ assertEquals(TRANSACTION_NONE, conn.getTransactionIsolation());
+
+ for (int invalidIsolation : new
int[]{TRANSACTION_READ_UNCOMMITTED, TRANSACTION_REPEATABLE_READ,
TRANSACTION_SERIALIZABLE}) {
+ assertThrows(
+ null,
+ () -> {
+ conn.setTransactionIsolation(invalidIsolation);
+ return null;
+ },
+ SQLException.class,
+ "Requested isolation level not supported by the server: "
+ invalidIsolation
+ );
+ }
+ }
+ }
+
+ /** */
+ @Test
+ public void testChangeStreamInsideTransactionThrows() throws Exception {
+ try (Connection conn = DriverManager.getConnection(URL)) {
+ conn.setAutoCommit(false);
+
+ conn.prepareStatement("SELECT 1").executeQuery();
+
+ assertThrows(
+ null,
+ () -> {
+ conn.prepareStatement("SET STREAMING ON").executeUpdate();
+ return null;
+ },
+ SQLException.class,
+ "Can't change stream mode inside transaction"
+ );
+ }
+ }
+
+ /** */
+ @Test
+ public void testNoTxInNoTxIsolation() throws Exception {
+ try (Connection conn = DriverManager.getConnection(URL)) {
+ conn.setTransactionIsolation(TRANSACTION_NONE);
+
+ ResultSet rs = conn.prepareStatement("SELECT 1").executeQuery();
Review Comment:
`rs` is not used
##########
modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java:
##########
@@ -319,6 +335,13 @@ private HandshakeResult
handshake(ClientListenerProtocolVersion ver) throws IOEx
if (ver.compareTo(VER_2_13_0) >= 0)
writer.writeString(connProps.getQueryEngine());
+ if (ver.compareTo(VER_2_14_0) >= 0) {
+ writer.writeByte(connProps.getTransactionConcurrency().ordinal());
Review Comment:
Why not reuse JdbcSetTxParametersRequest message (and send it only when
TX_AWARE_QUERIES is enabled) without changing handshake and protocol version?
##########
modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java:
##########
@@ -103,8 +108,11 @@ public class JdbcThinTcpIo {
/** Version 2.13.0. */
private static final ClientListenerProtocolVersion VER_2_13_0 =
ClientListenerProtocolVersion.create(2, 13, 0);
+ /** Version 2.14.0. */
+ private static final ClientListenerProtocolVersion VER_2_14_0 =
ClientListenerProtocolVersion.create(2, 14, 0);
Review Comment:
VER_2_17_0?
--
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: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
