This is an automated email from the ASF dual-hosted git repository.
zstan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 0f9bfffce0b IGNITE-28434 Update IgniteReleasedVersion for
compatibility tests to 2.18.0 (#12969)
0f9bfffce0b is described below
commit 0f9bfffce0b85ea456da54576c9983754a579995
Author: Evgeniy Stanilovskiy <[email protected]>
AuthorDate: Thu May 14 15:54:18 2026 +0300
IGNITE-28434 Update IgniteReleasedVersion for compatibility tests to 2.18.0
(#12969)
---
.../apache/ignite/compatibility/IgniteReleasedVersion.java | 5 ++++-
.../clients/JavaThinCompatibilityStoragePathTest.java | 13 +++++++++++--
.../org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 8 ++++++--
.../processors/odbc/jdbc/JdbcConnectionContext.java | 6 +++++-
4 files changed, 26 insertions(+), 6 deletions(-)
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/IgniteReleasedVersion.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/IgniteReleasedVersion.java
index 4e5a47e906b..37fb7a09cda 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/IgniteReleasedVersion.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/IgniteReleasedVersion.java
@@ -86,7 +86,10 @@ public enum IgniteReleasedVersion {
VER_2_16_0("2.16.0"),
/** */
- VER_2_17_0("2.17.0");
+ VER_2_17_0("2.17.0"),
+
+ /** */
+ VER_2_18_0("2.18.0");
/** Ignite version. */
private final IgniteProductVersion ver;
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityStoragePathTest.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityStoragePathTest.java
index 76e9fae9160..911e2a151f4 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityStoragePathTest.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityStoragePathTest.java
@@ -59,9 +59,18 @@ public class JavaThinCompatibilityStoragePathTest extends
AbstractClientCompatib
@Override protected void processRemoteConfiguration(IgniteConfiguration
cfg) {
super.processRemoteConfiguration(cfg);
- cfg.setCacheConfiguration(new CacheConfiguration<>("nodeCache"))
- .setDataStorageConfiguration(new DataStorageConfiguration()
+ CacheConfiguration<?, ?> ccfg = new CacheConfiguration<>("nodeCache");
+
+ cfg.setDataStorageConfiguration(new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(new
DataRegionConfiguration().setPersistenceEnabled(true)));
+
+ if (ver.compareTo(VER_2_18_0) >= 0) {
+ ccfg.setIndexPath("one").setStoragePaths(STORAGE_PATH);
+
+ cfg.getDataStorageConfiguration().setExtraStoragePaths("one",
"two", "three");
+ }
+
+ cfg.setCacheConfiguration(ccfg);
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
index 970f9102e8e..8cad60ec143 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
@@ -106,8 +106,11 @@ public class JdbcThinTcpIo {
/** Version 2.17.0. */
private static final ClientListenerProtocolVersion VER_2_17_0 =
ClientListenerProtocolVersion.create(2, 17, 0);
+ /** Version 2.18.0. */
+ private static final ClientListenerProtocolVersion VER_2_18_0 =
ClientListenerProtocolVersion.create(2, 18, 0);
+
/** Current version. */
- private static final ClientListenerProtocolVersion CURRENT_VER =
VER_2_17_0;
+ private static final ClientListenerProtocolVersion CURRENT_VER =
VER_2_18_0;
/** Initial output stream capacity for handshake. */
private static final int HANDSHAKE_MSG_SIZE = 13;
@@ -406,7 +409,8 @@ public class JdbcThinTcpIo {
+ ", url=" + connProps.getUrl() + " address=" + sockAddr +
']', SqlStateCode.CONNECTION_REJECTED);
}
- if (VER_2_13_0.equals(srvProtoVer0)
+ if (VER_2_17_0.equals(srvProtoVer0)
+ || VER_2_13_0.equals(srvProtoVer0)
|| VER_2_9_0.equals(srvProtoVer0)
|| VER_2_8_0.equals(srvProtoVer0)
|| VER_2_7_0.equals(srvProtoVer0)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
index 5e17a76212e..8750fc71db3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
@@ -82,8 +82,11 @@ public class JdbcConnectionContext extends
ClientListenerAbstractConnectionConte
/** Version 2.17.0: adds transaction default parameters. */
static final ClientListenerProtocolVersion VER_2_17_0 =
ClientListenerProtocolVersion.create(2, 17, 0);
+ /** Version 2.18.0. */
+ static final ClientListenerProtocolVersion VER_2_18_0 =
ClientListenerProtocolVersion.create(2, 18, 0);
+
/** Current version. */
- public static final ClientListenerProtocolVersion CURRENT_VER = VER_2_17_0;
+ public static final ClientListenerProtocolVersion CURRENT_VER = VER_2_18_0;
/** Supported versions. */
private static final Set<ClientListenerProtocolVersion> SUPPORTED_VERS =
new HashSet<>();
@@ -117,6 +120,7 @@ public class JdbcConnectionContext extends
ClientListenerAbstractConnectionConte
static {
SUPPORTED_VERS.add(CURRENT_VER);
+ SUPPORTED_VERS.add(VER_2_17_0);
SUPPORTED_VERS.add(VER_2_13_0);
SUPPORTED_VERS.add(VER_2_9_0);
SUPPORTED_VERS.add(VER_2_8_0);
