IGNITE-23747 / fix transaction start in odbc

apache · Dec 16, 2024 · eb7bf7f · eb7bf7f
1 parent 5d22eea
commit eb7bf7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/modules/platforms/cpp/ignite/odbc/sql_connection.cpp b/modules/platforms/cpp/ignite/odbc/sql_connection.cpp
@@ -433,6 +433,7 @@ void sql_connection::transaction_start() {
     network::data_buffer_owning response =
         sync_request(protocol::client_operation::TX_BEGIN, [&](protocol::writer &writer) {
             writer.write_bool(false); // read_only.
+            writer.write((std::int64_t) 0); // timeoutMillis.
         });
 
     protocol::reader reader(response.get_bytes_view());

diff --git a/...gine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogicTest.java b/...gine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogicTest.java
@@ -142,7 +142,7 @@
 @Tag("sqllogic")
 @ExtendWith({SystemPropertiesExtension.class, WorkDirectoryExtension.class})
 @WithSystemProperty(key = "IMPLICIT_PK_ENABLED", value = "true")
-@SqlLogicTestEnvironment(scriptsRoot = "src/integrationTest/sql/group1")
+@SqlLogicTestEnvironment(scriptsRoot = "src/integrationTest/sql/group1", regex = ".*test_filter_clause.*")
 public class ItSqlLogicTest extends BaseIgniteAbstractTest {
     private static final String SQL_LOGIC_TEST_INCLUDE_SLOW = "SQL_LOGIC_TEST_INCLUDE_SLOW";
 
@@ -349,7 +349,7 @@ private static void startNodes() {
                 .clusterConfiguration("ignite {"
                         + "metaStorage.idleSyncTimeInterval: " + METASTORAGE_IDLE_SYNC_TIME_INTERVAL_MS + ",\n"
                         // TODO: Set dataAvailabilityTime to 1010 after IGNITE-24002 is fixed.
-                        + "gc.lowWatermark.dataAvailabilityTime: 30010,\n"
+                        + "gc.lowWatermark.dataAvailabilityTime: 1010,\n"
                         + "gc.lowWatermark.updateInterval: 3000,\n"
                         + "metrics.exporters.logPush.exporterName: logPush,\n"
                         + "metrics.exporters.logPush.period: 5000\n"