Skip to content

Commit 9efd43e

Browse files
s1cks1ck
committed
Rename HugeAtomicPagedBitSet -> HugeAtomicGrowingBitSet
1 parent 1383a05 commit 9efd43e

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎core/src/main/java/org/neo4j/gds/core/loading/MultiLabelInformation.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.neo4j.gds.NodeLabel;
2626
import org.neo4j.gds.api.BatchNodeIterable;
2727
import org.neo4j.gds.api.IdMap;
28-
import org.neo4j.gds.core.utils.paged.HugeAtomicPagedBitSet;
28+
import org.neo4j.gds.core.utils.paged.HugeAtomicGrowingBitSet;
2929

3030
import java.util.ArrayList;
3131
import java.util.Collection;
@@ -155,12 +155,12 @@ public PrimitiveIterator.OfLong nodeIterator(Collection<NodeLabel> labels, long
155155

156156
public static final class Builder implements LabelInformation.Builder {
157157
private final long expectedCapacity;
158-
private final Map<NodeLabel, HugeAtomicPagedBitSet> labelInformation;
158+
private final Map<NodeLabel, HugeAtomicGrowingBitSet> labelInformation;
159159
private final List<NodeLabel> starNodeLabelMappings;
160160

161161
private Builder(
162162
long expectedCapacity,
163-
Map<NodeLabel, HugeAtomicPagedBitSet> labelInformation,
163+
Map<NodeLabel, HugeAtomicGrowingBitSet> labelInformation,
164164
List<NodeLabel> starNodeLabelMappings
165165
) {
166166
this.expectedCapacity = expectedCapacity;
@@ -180,7 +180,7 @@ static Builder of(
180180

181181
var nodeLabelBitSetMap = prepareLabelMap(
182182
labelTokenNodeLabelMapping,
183-
() -> HugeAtomicPagedBitSet.create(expectedCapacity)
183+
() -> HugeAtomicGrowingBitSet.create(expectedCapacity)
184184
);
185185

186186
return new Builder(expectedCapacity, nodeLabelBitSetMap, starNodeLabelMappings);
@@ -207,7 +207,7 @@ public void addNodeIdToLabel(NodeLabel nodeLabel, long nodeId) {
207207
labelInformation
208208
.computeIfAbsent(
209209
nodeLabel,
210-
(ignored) -> HugeAtomicPagedBitSet.create(expectedCapacity)
210+
(ignored) -> HugeAtomicGrowingBitSet.create(expectedCapacity)
211211
).set(nodeId);
212212
}
213213

‎core/src/main/java/org/neo4j/gds/core/loading/construction/NodesBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.neo4j.gds.core.loading.nodeproperties.NodePropertiesFromStoreBuilder;
3838
import org.neo4j.gds.core.utils.RawValues;
3939
import org.neo4j.gds.core.utils.paged.HugeAtomicBitSet;
40-
import org.neo4j.gds.core.utils.paged.HugeAtomicPagedBitSet;
40+
import org.neo4j.gds.core.utils.paged.HugeAtomicGrowingBitSet;
4141
import org.neo4j.gds.utils.AutoCloseableThreadLocal;
4242
import org.neo4j.values.storable.Value;
4343

@@ -142,7 +142,7 @@ private static LongPredicate seenNodesPredicate(
142142
) {
143143
if (deduplicateIds) {
144144
if (maxOriginalId == UNKNOWN_MAX_ID) {
145-
var seenIds = HugeAtomicPagedBitSet.create(0);
145+
var seenIds = HugeAtomicGrowingBitSet.create(0);
146146
return seenIds::getAndSet;
147147
} else {
148148
var seenIds = HugeAtomicBitSet.create(maxOriginalId + 1);

core/src/main/java/org/neo4j/gds/core/utils/paged/HugeAtomicPagedBitSet.java renamed to core/src/main/java/org/neo4j/gds/core/utils/paged/HugeAtomicGrowingBitSet.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.concurrent.atomic.AtomicReference;
2727
import java.util.function.LongConsumer;
2828

29-
public final class HugeAtomicPagedBitSet {
29+
public final class HugeAtomicGrowingBitSet {
3030

3131
// Each page stores 2^PAGE_SHIFT_BITS entries.
3232
// Word-size is 64 bit (long), which means we
@@ -45,7 +45,7 @@ public final class HugeAtomicPagedBitSet {
4545
// new page at the same time and only once must succeed.
4646
private final AtomicReference<Pages> pages;
4747

48-
public static HugeAtomicPagedBitSet create(long bitSize) {
48+
public static HugeAtomicGrowingBitSet create(long bitSize) {
4949
// Number of words required to represent the bit size.
5050
long wordSize = BitUtil.ceilDiv(bitSize, NUM_BITS);
5151

@@ -59,10 +59,10 @@ public static HugeAtomicPagedBitSet create(long bitSize) {
5959
// larger than the specified size.
6060
int pageCount = HugeArrays.numberOfPages(wordSize, pageShift, pageMask);
6161

62-
return new HugeAtomicPagedBitSet(pageCount, pageSize, pageShift, pageMask);
62+
return new HugeAtomicGrowingBitSet(pageCount, pageSize, pageShift, pageMask);
6363
}
6464

65-
private HugeAtomicPagedBitSet(int pageCount, int pageSize, int pageShift, long pageMask) {
65+
private HugeAtomicGrowingBitSet(int pageCount, int pageSize, int pageShift, long pageMask) {
6666
this.pageSize = pageSize;
6767
this.pageShift = pageShift;
6868
this.pageMask = pageMask;
@@ -230,7 +230,7 @@ public void clear(long index) {
230230
* The current capacity of the bit set. Setting a bit at an index
231231
* exceeding the capacity, leads to a resize operation.
232232
* The cardinality is a multiple of the underling page size:
233-
* 2^{@link org.neo4j.gds.core.utils.paged.HugeAtomicPagedBitSet#PAGE_SHIFT_BITS}.
233+
* 2^{@link HugeAtomicGrowingBitSet#PAGE_SHIFT_BITS}.
234234
*/
235235
public long capacity() {
236236
return pages.get().length() * (1L << pageShift);

‎core/src/test/java/org/neo4j/gds/core/utils/paged/HugeAtomicBitSetTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ void getAndSetSetsTheBit(HabsSupplier supplier) {
263263
/**
264264
* Represents shared methods from
265265
* {@link org.neo4j.gds.core.utils.paged.HugeAtomicBitSet} and
266-
* {@link org.neo4j.gds.core.utils.paged.HugeAtomicPagedBitSet}.
266+
* {@link HugeAtomicGrowingBitSet}.
267267
*/
268268
interface CommonHabsOps {
269269
boolean get(long index);
@@ -320,7 +320,7 @@ public void clear(long index) {
320320
};
321321
},
322322
(size) -> {
323-
var habs = HugeAtomicPagedBitSet.create(size);
323+
var habs = HugeAtomicGrowingBitSet.create(size);
324324
return new CommonHabsOps() {
325325
@Override
326326
public boolean get(long index) {

core/src/test/java/org/neo4j/gds/core/utils/paged/HugeAtomicPagedBitSetTest.java renamed to core/src/test/java/org/neo4j/gds/core/utils/paged/HugeAtomicGrowingBitSetTest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,42 +34,42 @@
3434
import java.util.stream.Stream;
3535

3636
import static org.assertj.core.api.Assertions.assertThat;
37-
import static org.neo4j.gds.core.utils.paged.HugeAtomicPagedBitSet.PAGE_SHIFT_BITS;
37+
import static org.neo4j.gds.core.utils.paged.HugeAtomicGrowingBitSet.PAGE_SHIFT_BITS;
3838

39-
class HugeAtomicPagedBitSetTest {
39+
class HugeAtomicGrowingBitSetTest {
4040

4141
static Stream<Arguments> bitsets() {
4242
return Stream.of(
4343
// empty bit set
44-
Arguments.of(HugeAtomicPagedBitSet.create(0)),
44+
Arguments.of(HugeAtomicGrowingBitSet.create(0)),
4545
// bit set of 3 pages
46-
Arguments.of(HugeAtomicPagedBitSet.create(2 * (1L << PAGE_SHIFT_BITS) + 42))
46+
Arguments.of(HugeAtomicGrowingBitSet.create(2 * (1L << PAGE_SHIFT_BITS) + 42))
4747
);
4848
}
4949

5050
@ParameterizedTest
5151
@MethodSource("bitsets")
52-
void testSet(HugeAtomicPagedBitSet bitSet) {
52+
void testSet(HugeAtomicGrowingBitSet bitSet) {
5353
testSetAssert(bitSet, 23); // page 0
5454
testSetAssert(bitSet, (1L << PAGE_SHIFT_BITS) + 23); // page 1
5555
testSetAssert(bitSet, 2 * (1L << PAGE_SHIFT_BITS) + 23); // page 2
5656
}
5757

58-
private static void testSetAssert(HugeAtomicPagedBitSet bitSet, long index) {
58+
private static void testSetAssert(HugeAtomicGrowingBitSet bitSet, long index) {
5959
assertThat(bitSet.get(index)).isFalse();
6060
bitSet.set(index);
6161
assertThat(bitSet.get(index)).isTrue();
6262
}
6363

6464
@ParameterizedTest
6565
@MethodSource("bitsets")
66-
void testGetAndSet(HugeAtomicPagedBitSet bitSet) {
66+
void testGetAndSet(HugeAtomicGrowingBitSet bitSet) {
6767
testGetAndSetAssert(bitSet, 23, 42); // page 0
6868
testGetAndSetAssert(bitSet, (1L << PAGE_SHIFT_BITS) + 23, (1L << PAGE_SHIFT_BITS) + 42); // page 1
6969
testGetAndSetAssert(bitSet, 2 * (1L << PAGE_SHIFT_BITS) + 23, 2 * (1L << PAGE_SHIFT_BITS) + 42); // page 2
7070
}
7171

72-
private static void testGetAndSetAssert(HugeAtomicPagedBitSet bitSet, long idx0, long idx1) {
72+
private static void testGetAndSetAssert(HugeAtomicGrowingBitSet bitSet, long idx0, long idx1) {
7373
// getAndSet a bit that is currently false
7474
assertThat(bitSet.get(idx0)).isFalse();
7575
assertThat(bitSet.getAndSet(idx0)).isFalse();
@@ -83,7 +83,7 @@ private static void testGetAndSetAssert(HugeAtomicPagedBitSet bitSet, long idx0,
8383

8484
@ParameterizedTest
8585
@MethodSource("bitsets")
86-
void testCardinality(HugeAtomicPagedBitSet bitSet) {
86+
void testCardinality(HugeAtomicGrowingBitSet bitSet) {
8787
assertThat(bitSet.cardinality()).isEqualTo(0);
8888
bitSet.set(23); // page 0
8989
assertThat(bitSet.cardinality()).isEqualTo(1);
@@ -95,14 +95,14 @@ void testCardinality(HugeAtomicPagedBitSet bitSet) {
9595

9696
@ParameterizedTest
9797
@MethodSource("bitsets")
98-
void testClearAtIndex(HugeAtomicPagedBitSet bitSet) {
98+
void testClearAtIndex(HugeAtomicGrowingBitSet bitSet) {
9999
assertThat(bitSet.cardinality()).isEqualTo(0);
100100
testClearAtIndexAssert(bitSet, 23); // page 0
101101
testClearAtIndexAssert(bitSet, (1L << PAGE_SHIFT_BITS) + 23); // page 1
102102
testClearAtIndexAssert(bitSet, 2 * (1L << PAGE_SHIFT_BITS) + 23); // page 2
103103
}
104104

105-
private static void testClearAtIndexAssert(HugeAtomicPagedBitSet bitSet, long index) {
105+
private static void testClearAtIndexAssert(HugeAtomicGrowingBitSet bitSet, long index) {
106106
bitSet.set(index);
107107
assertThat(bitSet.cardinality()).isEqualTo(1);
108108
bitSet.clear(index);
@@ -111,7 +111,7 @@ private static void testClearAtIndexAssert(HugeAtomicPagedBitSet bitSet, long in
111111

112112
@ParameterizedTest
113113
@MethodSource("bitsets")
114-
void testForEachSetBit(HugeAtomicPagedBitSet bitSet) {
114+
void testForEachSetBit(HugeAtomicGrowingBitSet bitSet) {
115115
var rng = ThreadLocalRandom.current();
116116
long bound = 42 * (1L << PAGE_SHIFT_BITS) + 42;
117117

@@ -129,7 +129,7 @@ void testForEachSetBit(HugeAtomicPagedBitSet bitSet) {
129129

130130
@ParameterizedTest
131131
@MethodSource("bitsets")
132-
void testSetParallel(HugeAtomicPagedBitSet bitSet) {
132+
void testSetParallel(HugeAtomicGrowingBitSet bitSet) {
133133
int concurrency = 8;
134134
int nodeCount = 1_000_000;
135135

0 commit comments

Comments
 (0)