|
93 | 93 | import org.apache.ignite.internal.util.typedef.internal.S; |
94 | 94 | import org.apache.ignite.internal.util.typedef.internal.U; |
95 | 95 | import org.apache.ignite.lang.IgnitePredicate; |
96 | | -import org.apache.ignite.lang.IgniteProductVersion; |
97 | 96 | import org.apache.ignite.spi.systemview.view.datastructures.AtomicLongView; |
98 | 97 | import org.apache.ignite.spi.systemview.view.datastructures.AtomicReferenceView; |
99 | 98 | import org.apache.ignite.spi.systemview.view.datastructures.AtomicSequenceView; |
@@ -197,10 +196,6 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen |
197 | 196 | /** */ |
198 | 197 | private static final String SEQUENCES_VIEW_DESC = "Data structure atomic sequences"; |
199 | 198 |
|
200 | | - /** Non collocated IgniteSet will use separate cache if all nodes in cluster is not older then specified version. */ |
201 | | - private static final IgniteProductVersion SEPARATE_CACHE_PER_NON_COLLOCATED_SET_SINCE = |
202 | | - IgniteProductVersion.fromString("2.7.0"); |
203 | | - |
204 | 199 | /** Initial capacity. */ |
205 | 200 | private static final int INITIAL_CAPACITY = 10; |
206 | 201 |
|
@@ -1775,14 +1770,12 @@ else if (reentrantLock != null) { |
1775 | 1770 |
|
1776 | 1771 | final boolean create = cfg != null; |
1777 | 1772 | final boolean collocated = isCollocated(cfg); |
1778 | | - final boolean separated = !collocated && |
1779 | | - U.isOldestNodeVersionAtLeast(SEPARATE_CACHE_PER_NON_COLLOCATED_SET_SINCE, ctx.grid().cluster().nodes()); |
1780 | 1773 |
|
1781 | 1774 | return getCollection(new CX1<GridCacheContext, IgniteSet<T>>() { |
1782 | 1775 | @Override public IgniteSet<T> applyx(GridCacheContext cctx) throws IgniteCheckedException { |
1783 | | - return cctx.dataStructures().set(name, collocated, create, separated); |
| 1776 | + return cctx.dataStructures().set(name, collocated, create, !collocated); |
1784 | 1777 | } |
1785 | | - }, cfg, name, grpName, SET, create, separated); |
| 1778 | + }, cfg, name, grpName, SET, create, !collocated); |
1786 | 1779 | } |
1787 | 1780 |
|
1788 | 1781 | /** |
|
0 commit comments