Skip to content

Commit d41e8a3

Browse files
improve(syncmap): rename SyncMap to BucketSyncMap
1 parent a0bfac9 commit d41e8a3

File tree

8 files changed

+340
-487
lines changed

8 files changed

+340
-487
lines changed

collections-fastutil/src/jmh/java/space/vectrix/sync/collections/fastutil/Int2ObjectSyncMapBenchmark.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void setup() {
7171
final boolean prepopulate = "prepopulate".equalsIgnoreCase(this.mode);
7272

7373
switch(this.implementation) {
74-
case "SyncMap" -> this.map = presized ? new Int2ObjectSyncMap<>(Int2ObjectSyncMap.FASTEST_SPREAD, this.size) : new Int2ObjectSyncMap<>(Int2ObjectSyncMap.FASTEST_SPREAD);
74+
case "SyncMap" -> this.map = presized ? new Int2ObjectBucketSyncMap<>(Int2ObjectBucketSyncMap.FASTEST_SPREAD, this.size) : new Int2ObjectBucketSyncMap<>(Int2ObjectBucketSyncMap.FASTEST_SPREAD);
7575
case "SynchronizedMap" -> this.map = presized
7676
? Int2ObjectMaps.synchronize(new Int2ObjectOpenHashMap<>(this.size))
7777
: Int2ObjectMaps.synchronize(new Int2ObjectOpenHashMap<>());
@@ -85,7 +85,7 @@ public void setup() {
8585
}
8686

8787
if(this.prime) {
88-
if(this.map instanceof final Int2ObjectSyncMap<Integer> syncMap) {
88+
if(this.map instanceof final Int2ObjectBucketSyncMap<Integer> syncMap) {
8989
syncMap.promote(true);
9090
} else {
9191
for(int i = 0; i < this.size; i++) {

collections-fastutil/src/main/java-templates/space/vectrix/sync/collections/fastutil/{{key}}2ObjectSyncMap.java.peb renamed to collections-fastutil/src/main/java-templates/space/vectrix/sync/collections/fastutil/{{key}}2ObjectBucketSyncMap.java.peb

Lines changed: 166 additions & 166 deletions
Large diffs are not rendered by default.

collections-fastutil/src/main/java/space/vectrix/sync/collections/fastutil/Hashing.java

Lines changed: 0 additions & 147 deletions
This file was deleted.

collections-fastutil/src/templateData/template-variables.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@ variants:
55
keyPrimitive: double
66
keyObject: Double
77
keyJava: Double
8-
mix: FAST_SPREAD
8+
spread: FAST_SPREAD
99
float:
1010
key: Float
1111
group: floats
1212
keyPrimitive: float
1313
keyObject: Float
1414
keyJava: Double
15-
mix: FASTEST_SPREAD
15+
spread: FASTEST_SPREAD
1616
int:
1717
key: Int
1818
group: ints
1919
keyPrimitive: int
2020
keyObject: Integer
2121
keyJava: Int
22-
mix: FASTEST_SPREAD
22+
spread: FASTEST_SPREAD
2323
short:
2424
key: Short
2525
group: shorts
2626
keyPrimitive: short
2727
keyObject: Short
2828
keyJava: Int
29-
mix: FASTEST_SPREAD
29+
spread: FASTEST_SPREAD
3030
long:
3131
key: Long
3232
group: longs
3333
keyPrimitive: long
3434
keyObject: Long
3535
keyJava: Long
36-
mix: FAST_SPREAD
36+
spread: FAST_SPREAD

collections-fastutil/src/test/java-templates/space/vectrix/sync/collections/fastutil/{{key}}2ObjectSyncMapTest.java.peb renamed to collections-fastutil/src/test/java-templates/space/vectrix/sync/collections/fastutil/{{key}}2ObjectBucketSyncMapTest.java.peb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import it.unimi.dsi.fastutil.{{ group }}.{{ key }}2ObjectMap;
88
* @since 1.0.0
99
*/
1010
@SuppressWarnings({"deprecation"})
11-
public class {{ key }}2ObjectSyncMapTest extends {{ key }}2ObjectAbstractMapTest<String> {
11+
public class {{ key }}2ObjectBucketSyncMapTest extends {{ key }}2ObjectAbstractMapTest<String> {
1212
@Override
1313
protected {{ key }}2ObjectMap<String> createMap() {
14-
return new {{ key }}2ObjectSyncMap<>();
14+
return new {{ key }}2ObjectBucketSyncMap<>();
1515
}
1616

1717
@Override

collections/src/jmh/java/space/vectrix/sync/collections/SyncMapBenchmark.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void setup() {
7272
final boolean prepopulate = "prepopulate".equalsIgnoreCase(this.mode);
7373

7474
switch(this.implementation) {
75-
case "SyncMap" -> this.map = presized ? new SyncMap<>(SyncMap.FASTEST_SPREAD, this.size) : new SyncMap<>(SyncMap.FASTEST_SPREAD);
75+
case "SyncMap" -> this.map = presized ? new BucketSyncMap<>(BucketSyncMap.FASTEST_SPREAD, this.size) : new BucketSyncMap<>(BucketSyncMap.FASTEST_SPREAD);
7676
case "ConcurrentHashMap" -> this.map = presized ? new ConcurrentHashMap<>(this.size) : new ConcurrentHashMap<>();
7777
case "SynchronizedMap" -> this.map = presized
7878
? Collections.synchronizedMap(new HashMap<>(this.size))
@@ -87,8 +87,8 @@ public void setup() {
8787
}
8888

8989
if(this.prime) {
90-
if(this.map instanceof final SyncMap<Integer, Integer> syncMap) {
91-
syncMap.promote(true);
90+
if(this.map instanceof final BucketSyncMap<Integer, Integer> bucketSyncMap) {
91+
bucketSyncMap.promote(true);
9292
} else {
9393
for(int i = 0; i < this.size; i++) {
9494
this.map.get(i);

0 commit comments

Comments
 (0)