Skip to content

Commit c93822a

Browse files
committed
Bug 37154754 - [37154549->25.03] Update BinaryMap. isPartitionedQueryCompatible to match versions that support PartitionedQuery (main->ce-main)
[git-p4: depot-paths = "//dev/coherence-ce/main/": change = 111854]
1 parent 4f3bfbd commit c93822a

File tree

2 files changed

+4
-13
lines changed
  • prj
    • coherence-core-components/src/main/java/com/tangosol/coherence/component/util/daemon/queueProcessor/service/grid/partitionedService/partitionedCache
    • test/unit/coherence-tests/src/test/java/com/tangosol/coherence/component/util/daemon/queueProcessor/service/grid/partitionedService/partitionedCache

2 files changed

+4
-13
lines changed

prj/coherence-core-components/src/main/java/com/tangosol/coherence/component/util/daemon/queueProcessor/service/grid/partitionedService/partitionedCache/BinaryMap.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@
6060
import java.util.Set;
6161
import java.util.function.BiFunction;
6262

63-
import static com.tangosol.internal.util.VersionHelper.VERSION_12_2_1_4_20;
64-
import static com.tangosol.internal.util.VersionHelper.VERSION_12_2_1_6_6;
65-
import static com.tangosol.internal.util.VersionHelper.VERSION_14_1_1_0_16;
6663
import static com.tangosol.internal.util.VersionHelper.VERSION_14_1_1_2206_7;
6764
import static com.tangosol.internal.util.VersionHelper.VERSION_23_09;
6865
import static com.tangosol.internal.util.VersionHelper.VERSION_23_09_1;
@@ -2344,10 +2341,7 @@ protected static boolean isPartitionedQueryCompatible(int nVersion)
23442341
{
23452342
return (isVersionCompatible(VERSION_14_1_2_0, nVersion) && nVersion != VERSION_23_09)
23462343
|| isPatchCompatible(VERSION_23_09_1, nVersion)
2347-
|| isPatchCompatible(VERSION_14_1_1_2206_7, nVersion)
2348-
|| isPatchCompatible(VERSION_14_1_1_0_16, nVersion)
2349-
|| isPatchCompatible(VERSION_12_2_1_4_20, nVersion)
2350-
|| isPatchCompatible(VERSION_12_2_1_6_6, nVersion);
2344+
|| isPatchCompatible(VERSION_14_1_1_2206_7, nVersion);
23512345
}
23522346

23532347
// From interface: com.tangosol.net.NamedCache

prj/test/unit/coherence-tests/src/test/java/com/tangosol/coherence/component/util/daemon/queueProcessor/service/grid/partitionedService/partitionedCache/BinaryMapIsPartitionedQueryCompatibleTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ public class BinaryMapIsPartitionedQueryCompatibleTest
3232
* - 23.09.1
3333
* - 14.1.1.2206.7
3434
* - 22.06.7
35-
* - 14.1.1.0.16
36-
* - 12.2.1.4.20
37-
* - 12.2.1.6.6
3835
*/
3936
@Test
4037
public void testIsPartitionedQueryCompatible()
@@ -50,10 +47,10 @@ public void testIsPartitionedQueryCompatible()
5047
assertFalse(BinaryMap.isPartitionedQueryCompatible(VersionHelper.encodeVersion(22, 6, 6)));
5148
assertTrue(BinaryMap.isPartitionedQueryCompatible(VersionHelper.encodeVersion(22, 6, 7)));
5249
assertFalse(BinaryMap.isPartitionedQueryCompatible(VersionHelper.encodeVersion(14, 1, 1, 0, 15)));
53-
assertTrue(BinaryMap.isPartitionedQueryCompatible(VersionHelper.encodeVersion(14, 1, 1, 0, 16)));
50+
assertFalse(BinaryMap.isPartitionedQueryCompatible(VersionHelper.encodeVersion(14, 1, 1, 0, 16)));
5451
assertFalse(BinaryMap.isPartitionedQueryCompatible(VersionHelper.encodeVersion(12, 2, 1, 4, 19)));
55-
assertTrue(BinaryMap.isPartitionedQueryCompatible(VersionHelper.encodeVersion(12, 2, 1, 4, 20)));
52+
assertFalse(BinaryMap.isPartitionedQueryCompatible(VersionHelper.encodeVersion(12, 2, 1, 4, 20)));
5653
assertFalse(BinaryMap.isPartitionedQueryCompatible(VersionHelper.encodeVersion(12, 2, 1, 6, 5)));
57-
assertTrue(BinaryMap.isPartitionedQueryCompatible(VersionHelper.encodeVersion(12, 2, 1, 6, 7)));
54+
assertFalse(BinaryMap.isPartitionedQueryCompatible(VersionHelper.encodeVersion(12, 2, 1, 6, 7)));
5855
}
5956
}

0 commit comments

Comments
 (0)