Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace pcj primitive collections library #85

Merged
merged 114 commits into from
Apr 21, 2016
Merged

Replace pcj primitive collections library #85

merged 114 commits into from
Apr 21, 2016

Conversation

cmark
Copy link
Member

@cmark cmark commented Apr 15, 2016 •
edited by apeteri
Loading

This PR removes obsolete pcj based primitive collection library and adds a new com.b2international.collections.api primitive collection api module and an implementation module com.b2international.collections.fastutil using fastutil lib.
In certain scenarios (map, set) fastutil outperforms pcj (see below). Also koloboke seems to be even faster, so we can develop an implementation bundle using that, unfortunately there is no list support in that library, so I decided to stick with fastutil for now.

Creating a set or map with size 500_000:
Pcj map: 44.3 ms
Pcj set: 31.0 ms
FastUtil map: 28.8 ms
FastUtil set: 18.7 ms
Koloboke map: 24.7 ms
Koloboke set: 11.9 ms

Creating a set or map with size 5_000_000:
Pcj map: 865.0 ms
Pcj set: 646.0 ms
FastUtil map: 404.8 ms
FastUtil set: 287.0 ms
Koloboke map: 337.3 ms
Koloboke set: 182.4 ms

https://snowowl.atlassian.net/browse/SO-1686

apeteri and others added 30 commits February 5, 2016 18:07
@apeteri
[commons] Add mirror interfaces for pluggable primitive collections
9632147
@apeteri
[commons] Update classes in c.b.commons bundle
550f727
@apeteri
[commons] Update class in c.b.commons.test bundle
3565e40
@apeteri
[core] Update class in com.b2international.snowowl.core bundle
406944c
@apeteri
[core] Update classes in com.b2international.snowowl.datastore bundle
230af77
@apeteri
[core] Update classes in com.b2international.snowowl.datastore.server
b61d0bd
@apeteri
[core] Update classes in c.b.s.index.diff bundle
c56ffff
@apeteri
[snomed] Update class in c.b.s.snomed.api.impl bundle
32edb29
@apeteri
[snomed] Update classes in c.b.s.snomed.datastore bundle
b5acb78
@apeteri
[snomed] Update classes in c.b.s.snomed.datastore.server bundle
db70fc3
@apeteri
[snomed] Update classes in c.b.s.snomed.exporter.server bundle
875686a
@apeteri
[snomed] Update classes in c.b.s.snomed.importer.rf2 bundle
ac03489
@apeteri
[snomed] Update classes in c.b.s.snomed.mrcm.core bundle
f296d0b
@apeteri
[snomed] Update class in c.b.s.snomed.mrcm.core.server bundle
67ce790
@apeteri
[snomed] Update classes in c.b.s.snomed.reasoner bundle
059a37e
@apeteri
[snomed] Update classes in c.b.s.snomed.reasoner.server bundle
7e049d8
@apeteri
[snomed] Update classes in c.b.s.snomed.refset.core bundle
1311af0
@apeteri
[core] Update classes in c.b.s.index.diff.tests bundle
3b7ab84
@apeteri
[commons] Replace pcj with fastutil as the collection supplier library
fbbb9e2
@apeteri
[commons] Start wrapping fastutil collections
6aa480d
@cmark
Merge branch 'origin/develop' into feature-primitive-collections
4263c29 
Conflicts:
	core/com.b2international.snowowl.datastore.server/src/com/b2international/snowowl/datastore/server/version/PublishManager.java
	core/com.b2international.snowowl.datastore/src/com/b2international/snowowl/datastore/version/IVersioningManager.java
	core/com.b2international.snowowl.datastore/src/com/b2international/snowowl/datastore/version/NoopVersioningManager.java
	snomed/com.b2international.snowowl.snomed.datastore.server/src/com/b2international/snowowl/datastore/server/snomed/SnomedComponentService.java
	snomed/com.b2international.snowowl.snomed.datastore.server/src/com/b2international/snowowl/datastore/server/snomed/index/SnomedCDOChangeProcessor.java
	snomed/com.b2international.snowowl.snomed.datastore.server/src/com/b2international/snowowl/datastore/server/snomed/index/change/ConstraintChangeProcessor.java
	snomed/com.b2international.snowowl.snomed.datastore.server/src/com/b2international/snowowl/datastore/server/snomed/index/change/IconChangeProcessor.java
	snomed/com.b2international.snowowl.snomed.datastore.server/src/com/b2international/snowowl/datastore/server/snomed/index/change/TaxonomyChangeProcessor.java
	snomed/com.b2international.snowowl.snomed.datastore.server/src/com/b2international/snowowl/datastore/server/snomed/index/init/Rf2BasedSnomedTaxonomyBuilder.java
	snomed/com.b2international.snowowl.snomed.datastore.server/src/com/b2international/snowowl/datastore/server/snomed/version/SnomedVersioningManager.java
	snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/datastore/SnomedClientTerminologyBrowser.java
	snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/datastore/SnomedRefSetEditingContext.java
	snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/datastore/services/ClientSnomedComponentService.java
	snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/datastore/taxonomy/AbstractSnomedTaxonomyBuilder.java
	snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/datastore/taxonomy/SnomedTaxonomyBuilder.java
	snomed/com.b2international.snowowl.snomed.mrcm.core/src/com/b2international/snowowl/snomed/mrcm/core/concepteditor/CDOClientSnomedConceptEditorService.java
	snomed/com.b2international.snowowl.snomed.reasoner.server/src/com/b2international/snowowl/snomed/reasoner/server/ontology/DelegateOntology.java
	snomed/com.b2international.snowowl.snomed.reasoner/src/com/b2international/snowowl/snomed/reasoner/model/ConceptDefinitionBuilder.java
	snomed/com.b2international.snowowl.snomed.refset.core/src/com/b2international/snowowl/snomed/refset/core/compare/RelationTester.java
@cmark
[snomed] fix compile errors after merge of develop branch
8399231
@cmark
[commons] share c.b.collections.api module
4753606
@cmark
[commons] move collections api to collections.api bundle
22c79e8
@cmark
[commons] fix package names and references in moved collection classes
2f224ae
@cmark
[commons] remove collections.primitive packages
5e1ed14
@cmark
[commons] fix references to moved collection api classes, interfaces
cad91ce
@cmark
[commons] share c.b.collections.fastutil module
9aa9894
@cmark
[commons] move fastutil implementations to collections.fastutil bundle
3e6a907
@cmark
[commons] fix references to moved collection.fastutil implementations
5ceb5d9
cmark added 23 commits April 14, 2016 16:21
@cmark
[commons] inline trim implementations in sets and lists
cffcea2
@cmark
[tests] update test launch config with new bundles
0a07c2d
@cmark
[commons] add temporary trimToSize empty method to AbstractLongSet
1ad94be
@cmark
[commons] fix serialization issue of new PrimitiveCollection impls
cc47371
@cmark
[commons] remove unnecessary collection API methods from LongSets
1ed500e
@cmark
[commons] remove unnecessary newLongSetWithExpectedSize from LongSets
d729a51
@cmark
[commons] remove unnecessary factory methods from LongSets
659ac73
@cmark
[snomed] deprecate old refset filter API
4cc4997
@cmark
[commons] remove unnecessary LongSets.isEmpty() method
84137e3
@cmark
[commons] implement toString in abstract primitive collection classes
0820836
@cmark
[commons] move LongSets to collect package
377b317
@cmark
[common] fix references to moved LongSets class
91134d9
@cmark
[commons] move LongIterator class to collections.api bundle
0fd9404
@cmark
[commons] fix references to moved LongIterators
134d420
@cmark
[commons] move ArrayIntIterator and BitSetIntIterator to collect package
8d23856
@cmark
[commons] fix refs to ArrayIntIterator and BitSetIntIterator
403a3dd
@cmark
[commons] move LongCollections to collections.api bundle
5e5e43f
@cmark
[commons] fix refs to LongCollections
b3bc305
@cmark
[commons] remove unnecessary methods from ByteCollections
d9c0baa
@cmark
[commons] move ByteCollections to collect package
1a63f5e
@cmark
[commons] fix refs to ByteCollections
00217fb
@cmark
[commons] move remaining classes from pcj package to collect package
5a013c5
@cmark
[commons] fix refs to IntKeySetMultimap, LongKeyLongSetMultimap and...
37d56d5 
...LongListIteratorWrapper.
apeteri and others added 4 commits April 20, 2016 13:39
@apeteri
Merge remote-tracking branch 'origin/develop' into
b97f6f7 
feature-primitive-collections

Conflicts:
	snomed/com.b2international.snowowl.snomed.datastore.server/src/com/b2international/snowowl/datastore/server/snomed/escg/QueryEvaluator.java
@apeteri
[commons] Delete home-grown LongSet and LongLongMap classes
28a4b00
@apeteri
[snomed] Update references to removed LongSet
ce3bc43
@cmark
[commons] implemented newByteKeyLongOpenHashMap() factory methods
ac93f95
@cmark cmark merged commit 92aaf49 into develop Apr 21, 2016
@cmark cmark deleted the feature-primitive-collections branch June 19, 2017 10:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@apeteri apeteri

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@cmark @apeteri