Skip to content

Commit 89d70d4

Browse files
authored
IGNITE-24101 Remove SEPARATE_CACHE_PER_NON_COLLOCATED_SET_SINCE (#11810)
1 parent 1db1b7a commit 89d70d4

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
import org.apache.ignite.internal.util.typedef.internal.S;
9494
import org.apache.ignite.internal.util.typedef.internal.U;
9595
import org.apache.ignite.lang.IgnitePredicate;
96-
import org.apache.ignite.lang.IgniteProductVersion;
9796
import org.apache.ignite.spi.systemview.view.datastructures.AtomicLongView;
9897
import org.apache.ignite.spi.systemview.view.datastructures.AtomicReferenceView;
9998
import org.apache.ignite.spi.systemview.view.datastructures.AtomicSequenceView;
@@ -197,10 +196,6 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen
197196
/** */
198197
private static final String SEQUENCES_VIEW_DESC = "Data structure atomic sequences";
199198

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-
204199
/** Initial capacity. */
205200
private static final int INITIAL_CAPACITY = 10;
206201

@@ -1775,14 +1770,12 @@ else if (reentrantLock != null) {
17751770

17761771
final boolean create = cfg != null;
17771772
final boolean collocated = isCollocated(cfg);
1778-
final boolean separated = !collocated &&
1779-
U.isOldestNodeVersionAtLeast(SEPARATE_CACHE_PER_NON_COLLOCATED_SET_SINCE, ctx.grid().cluster().nodes());
17801773

17811774
return getCollection(new CX1<GridCacheContext, IgniteSet<T>>() {
17821775
@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);
17841777
}
1785-
}, cfg, name, grpName, SET, create, separated);
1778+
}, cfg, name, grpName, SET, create, !collocated);
17861779
}
17871780

17881781
/**

0 commit comments

Comments
 (0)