diff --git a/.gitignore b/.gitignore index 93999af9b..36a656df5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ .setting/ bin/ target/ - +*/build +*/out +/.gradle # OS X .DS_Store @@ -24,3 +26,4 @@ pom.xml.releaseBackup pom.xml.next pom.xml.tag +*.bin diff --git a/.travis.yml b/.travis.yml index 22b0b5eca..fc9989ca9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,23 +11,33 @@ jdk: ############ -# We still support and test jdk8 for clients, but on travis we no longer build with jkd8, see +# We still support and test jdk8 for clients, but on travis we no longer build with jkd8, see # https://github.com/RoaringBitmap/RoaringBitmap/pull/290 for rationale. ########## # we removed oraclejdk7 as per https://github.com/RoaringBitmap/RoaringBitmap/pull/176#issuecomment-322257170 ######### +# from https://docs.travis-ci.com/user/languages/java/#caching +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ +cache: + directories: + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ + # Install silently to ensure all pom are installed and compilation is OK: actual checks will be processed by script: -install: "mvn -P ci clean install --quiet -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dgpg.skip=true" +# Including testClasses so tests will compile too. +install: "./gradlew assemble testClasses" branches: only: - master script: - - mvn javadoc:javadoc - - mvn checkstyle:check - - mvn test jacoco:report -Dgpg.skip=true -DBITMAP_TYPES=ROARING_ONLY + # run checkstyle, etc, without the tests to fail fast + - ./gradlew check -x test + - ./gradlew test jacocoTestReport -DBITMAP_TYPES=ROARING_ONLY after_success: - - mvn coveralls:report + - ./gradlew coveralls diff --git a/README.md b/README.md index a7712e7ea..a1c947630 100644 --- a/README.md +++ b/README.md @@ -184,7 +184,7 @@ public class Basic { } ``` -Please see the examples folder for more examples. +Please see the examples folder for more examples, which you can run with `./gradlew :examples:runAll`, or run a specific one with `./gradlew :examples:runExampleBitmap64`, etc. Unsigned integers @@ -440,11 +440,11 @@ Benchmark To run JMH benchmarks, use the following command: - $ ./jmh/run.sh + $ ./gradlew jmh You can also run specific benchmarks... - $ ./jmh/run.sh org.roaringbitmap.aggregation.and.identical.* + $ ./jmh/run.sh 'org.roaringbitmap.aggregation.and.identical.*' Mailing list/discussion group diff --git a/RoaringBitmap/build.gradle.kts b/RoaringBitmap/build.gradle.kts new file mode 100644 index 000000000..ae161ee3b --- /dev/null +++ b/RoaringBitmap/build.gradle.kts @@ -0,0 +1,10 @@ +val deps: Map by extra + +dependencies { + implementation(project(":shims")) + + testImplementation("junit:junit:${deps["junit"]}") + testImplementation("com.google.guava:guava:${deps["guava"]}") + testImplementation("org.apache.commons:commons-lang3:${deps["commons-lang"]}") + testImplementation("com.esotericsoftware:kryo:5.0.0-RC1") +} diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/AppendableStorage.java b/RoaringBitmap/src/main/java/org/roaringbitmap/AppendableStorage.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/AppendableStorage.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/AppendableStorage.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/ArrayBatchIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/ArrayBatchIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/ArrayBatchIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/ArrayBatchIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/ArrayContainer.java b/RoaringBitmap/src/main/java/org/roaringbitmap/ArrayContainer.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/ArrayContainer.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/ArrayContainer.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/BatchIntIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/BatchIntIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/BatchIntIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/BatchIntIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/BatchIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/BatchIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/BatchIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/BatchIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/BitSetUtil.java b/RoaringBitmap/src/main/java/org/roaringbitmap/BitSetUtil.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/BitSetUtil.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/BitSetUtil.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/BitmapBatchIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/BitmapBatchIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/BitmapBatchIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/BitmapBatchIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/BitmapContainer.java b/RoaringBitmap/src/main/java/org/roaringbitmap/BitmapContainer.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/BitmapContainer.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/BitmapContainer.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/BitmapDataProvider.java b/RoaringBitmap/src/main/java/org/roaringbitmap/BitmapDataProvider.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/BitmapDataProvider.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/BitmapDataProvider.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/BitmapDataProviderSupplier.java b/RoaringBitmap/src/main/java/org/roaringbitmap/BitmapDataProviderSupplier.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/BitmapDataProviderSupplier.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/BitmapDataProviderSupplier.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/ConstantMemoryContainerAppender.java b/RoaringBitmap/src/main/java/org/roaringbitmap/ConstantMemoryContainerAppender.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/ConstantMemoryContainerAppender.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/ConstantMemoryContainerAppender.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/Container.java b/RoaringBitmap/src/main/java/org/roaringbitmap/Container.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/Container.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/Container.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/ContainerAppender.java b/RoaringBitmap/src/main/java/org/roaringbitmap/ContainerAppender.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/ContainerAppender.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/ContainerAppender.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/ContainerBatchIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/ContainerBatchIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/ContainerBatchIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/ContainerBatchIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/ContainerPointer.java b/RoaringBitmap/src/main/java/org/roaringbitmap/ContainerPointer.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/ContainerPointer.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/ContainerPointer.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/FastAggregation.java b/RoaringBitmap/src/main/java/org/roaringbitmap/FastAggregation.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/FastAggregation.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/FastAggregation.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/FastRankRoaringBitmap.java b/RoaringBitmap/src/main/java/org/roaringbitmap/FastRankRoaringBitmap.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/FastRankRoaringBitmap.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/FastRankRoaringBitmap.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/ImmutableBitmapDataProvider.java b/RoaringBitmap/src/main/java/org/roaringbitmap/ImmutableBitmapDataProvider.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/ImmutableBitmapDataProvider.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/ImmutableBitmapDataProvider.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/IntConsumer.java b/RoaringBitmap/src/main/java/org/roaringbitmap/IntConsumer.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/IntConsumer.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/IntConsumer.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/IntIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/IntIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/IntIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/IntIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/IntIteratorFlyweight.java b/RoaringBitmap/src/main/java/org/roaringbitmap/IntIteratorFlyweight.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/IntIteratorFlyweight.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/IntIteratorFlyweight.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/InvalidRoaringFormat.java b/RoaringBitmap/src/main/java/org/roaringbitmap/InvalidRoaringFormat.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/InvalidRoaringFormat.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/InvalidRoaringFormat.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/ParallelAggregation.java b/RoaringBitmap/src/main/java/org/roaringbitmap/ParallelAggregation.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/ParallelAggregation.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/ParallelAggregation.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/PeekableIntIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/PeekableIntIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/PeekableIntIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/PeekableIntIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/PeekableIntRankIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/PeekableIntRankIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/PeekableIntRankIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/PeekableIntRankIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/PeekableShortIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/PeekableShortIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/PeekableShortIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/PeekableShortIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/PeekableShortRankIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/PeekableShortRankIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/PeekableShortRankIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/PeekableShortRankIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/ReverseIntIteratorFlyweight.java b/RoaringBitmap/src/main/java/org/roaringbitmap/ReverseIntIteratorFlyweight.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/ReverseIntIteratorFlyweight.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/ReverseIntIteratorFlyweight.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/RoaringArray.java b/RoaringBitmap/src/main/java/org/roaringbitmap/RoaringArray.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/RoaringArray.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/RoaringArray.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/RoaringBatchIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBatchIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/RoaringBatchIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBatchIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/RoaringBitmap.java b/RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBitmap.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/RoaringBitmap.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBitmap.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/RoaringBitmapSupplier.java b/RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBitmapSupplier.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/RoaringBitmapSupplier.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBitmapSupplier.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/RoaringBitmapWriter.java b/RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBitmapWriter.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/RoaringBitmapWriter.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBitmapWriter.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/RunBatchIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/RunBatchIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/RunBatchIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/RunBatchIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/RunContainer.java b/RoaringBitmap/src/main/java/org/roaringbitmap/RunContainer.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/RunContainer.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/RunContainer.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/ShortIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/ShortIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/ShortIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/ShortIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/Util.java b/RoaringBitmap/src/main/java/org/roaringbitmap/Util.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/Util.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/Util.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/WordStorage.java b/RoaringBitmap/src/main/java/org/roaringbitmap/WordStorage.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/WordStorage.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/WordStorage.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/ArrayBatchIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/ArrayBatchIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/ArrayBatchIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/ArrayBatchIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/BitmapBatchIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BitmapBatchIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/BitmapBatchIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BitmapBatchIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/BufferBitSetUtil.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BufferBitSetUtil.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/BufferBitSetUtil.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BufferBitSetUtil.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/BufferFastAggregation.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BufferFastAggregation.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/BufferFastAggregation.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BufferFastAggregation.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/BufferIntIteratorFlyweight.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BufferIntIteratorFlyweight.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/BufferIntIteratorFlyweight.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BufferIntIteratorFlyweight.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/BufferParallelAggregation.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BufferParallelAggregation.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/BufferParallelAggregation.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BufferParallelAggregation.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/BufferReverseIntIteratorFlyweight.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BufferReverseIntIteratorFlyweight.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/BufferReverseIntIteratorFlyweight.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BufferReverseIntIteratorFlyweight.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/BufferUtil.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BufferUtil.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/BufferUtil.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/BufferUtil.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/ImmutableRoaringArray.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/ImmutableRoaringArray.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/ImmutableRoaringArray.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/ImmutableRoaringArray.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/ImmutableRoaringBitmap.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/ImmutableRoaringBitmap.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/ImmutableRoaringBitmap.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/ImmutableRoaringBitmap.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/MappeableArrayContainer.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MappeableArrayContainer.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/MappeableArrayContainer.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MappeableArrayContainer.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/MappeableBitmapContainer.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MappeableBitmapContainer.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/MappeableBitmapContainer.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MappeableBitmapContainer.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/MappeableContainer.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MappeableContainer.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/MappeableContainer.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MappeableContainer.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/MappeableContainerPointer.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MappeableContainerPointer.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/MappeableContainerPointer.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MappeableContainerPointer.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/MappeableRunContainer.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MappeableRunContainer.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/MappeableRunContainer.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MappeableRunContainer.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringArray.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringArray.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringArray.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringArray.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmap.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmap.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmap.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmap.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmapSupplier.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmapSupplier.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmapSupplier.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmapSupplier.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/PointableRoaringArray.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/PointableRoaringArray.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/PointableRoaringArray.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/PointableRoaringArray.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/RoaringBatchIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/RoaringBatchIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/RoaringBatchIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/RoaringBatchIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/RunBatchIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/RunBatchIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/RunBatchIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/RunBatchIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/buffer/package-info.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/package-info.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/buffer/package-info.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/buffer/package-info.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/insights/BitmapAnalyser.java b/RoaringBitmap/src/main/java/org/roaringbitmap/insights/BitmapAnalyser.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/insights/BitmapAnalyser.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/insights/BitmapAnalyser.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/insights/BitmapStatistics.java b/RoaringBitmap/src/main/java/org/roaringbitmap/insights/BitmapStatistics.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/insights/BitmapStatistics.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/insights/BitmapStatistics.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/insights/NaiveWriterRecommender.java b/RoaringBitmap/src/main/java/org/roaringbitmap/insights/NaiveWriterRecommender.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/insights/NaiveWriterRecommender.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/insights/NaiveWriterRecommender.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/longlong/ImmutableLongBitmapDataProvider.java b/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/ImmutableLongBitmapDataProvider.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/longlong/ImmutableLongBitmapDataProvider.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/longlong/ImmutableLongBitmapDataProvider.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/longlong/LongBitmapDataProvider.java b/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/LongBitmapDataProvider.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/longlong/LongBitmapDataProvider.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/longlong/LongBitmapDataProvider.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/longlong/LongConsumer.java b/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/LongConsumer.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/longlong/LongConsumer.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/longlong/LongConsumer.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/longlong/LongIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/LongIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/longlong/LongIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/longlong/LongIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/longlong/PeekableLongIterator.java b/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/PeekableLongIterator.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/longlong/PeekableLongIterator.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/longlong/PeekableLongIterator.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/longlong/Roaring64NavigableMap.java b/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/Roaring64NavigableMap.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/longlong/Roaring64NavigableMap.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/longlong/Roaring64NavigableMap.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/longlong/RoaringIntPacking.java b/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/RoaringIntPacking.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/longlong/RoaringIntPacking.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/longlong/RoaringIntPacking.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/longlong/package-info.java b/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/package-info.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/longlong/package-info.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/longlong/package-info.java diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/package-info.java b/RoaringBitmap/src/main/java/org/roaringbitmap/package-info.java similarity index 100% rename from roaringbitmap/src/main/java/org/roaringbitmap/package-info.java rename to RoaringBitmap/src/main/java/org/roaringbitmap/package-info.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/CloneBatchIteratorTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/CloneBatchIteratorTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/CloneBatchIteratorTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/CloneBatchIteratorTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/ContainerBatchIteratorTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/ContainerBatchIteratorTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/ContainerBatchIteratorTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/ContainerBatchIteratorTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/KryoTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/KryoTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/KryoTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/KryoTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/ParallelAggregationTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/ParallelAggregationTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/ParallelAggregationTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/ParallelAggregationTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/RoaringArrayTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/RoaringArrayTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/RoaringArrayTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/RoaringArrayTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/RoaringBitmapBatchIteratorTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/RoaringBitmapBatchIteratorTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/RoaringBitmapBatchIteratorTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/RoaringBitmapBatchIteratorTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/RoaringBitmapIntervalIntersectionTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/RoaringBitmapIntervalIntersectionTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/RoaringBitmapIntervalIntersectionTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/RoaringBitmapIntervalIntersectionTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/RoaringBitmapSubsetTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/RoaringBitmapSubsetTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/RoaringBitmapSubsetTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/RoaringBitmapSubsetTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/RoaringBitmapWriterRandomisedTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/RoaringBitmapWriterRandomisedTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/RoaringBitmapWriterRandomisedTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/RoaringBitmapWriterRandomisedTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/SeededTestData.java b/RoaringBitmap/src/test/java/org/roaringbitmap/SeededTestData.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/SeededTestData.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/SeededTestData.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestAdversarialInputs.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestAdversarialInputs.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestAdversarialInputs.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestAdversarialInputs.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestArrayContainer.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestArrayContainer.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestArrayContainer.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestArrayContainer.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestBitSetUtil.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestBitSetUtil.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestBitSetUtil.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestBitSetUtil.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestBitmapContainer.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestBitmapContainer.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestBitmapContainer.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestBitmapContainer.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestConcatenation.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestConcatenation.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestConcatenation.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestConcatenation.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestContainer.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestContainer.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestContainer.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestContainer.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestFastAggregation.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestFastAggregation.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestFastAggregation.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestFastAggregation.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestForEach.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestForEach.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestForEach.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestForEach.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestImmutableRoaringBitmap.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestImmutableRoaringBitmap.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestImmutableRoaringBitmap.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestImmutableRoaringBitmap.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestIntIteratorFlyweight.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestIntIteratorFlyweight.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestIntIteratorFlyweight.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestIntIteratorFlyweight.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestIteratorMemory.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestIteratorMemory.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestIteratorMemory.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestIteratorMemory.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestIterators.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestIterators.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestIterators.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestIterators.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestMemory.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestMemory.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestMemory.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestMemory.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestRange.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestRange.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestRange.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestRange.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestRangeCardinality.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestRangeCardinality.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestRangeCardinality.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestRangeCardinality.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestRankIterator.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestRankIterator.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestRankIterator.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestRankIterator.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestRankIteratorsOfContainers.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestRankIteratorsOfContainers.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestRankIteratorsOfContainers.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestRankIteratorsOfContainers.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestRoaringBitmapWriter.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmapWriter.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestRoaringBitmapWriter.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmapWriter.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestRoaringBitmapWriterWizard.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmapWriterWizard.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestRoaringBitmapWriterWizard.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmapWriterWizard.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap_FastRank.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap_FastRank.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap_FastRank.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap_FastRank.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestRunContainer.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestRunContainer.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestRunContainer.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestRunContainer.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestSerialization.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestSerialization.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestSerialization.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestSerialization.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestSerializationViaByteBuffer.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestSerializationViaByteBuffer.java similarity index 94% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestSerializationViaByteBuffer.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestSerializationViaByteBuffer.java index 55faa80fc..4ca5ad9a3 100644 --- a/roaringbitmap/src/test/java/org/roaringbitmap/TestSerializationViaByteBuffer.java +++ b/RoaringBitmap/src/test/java/org/roaringbitmap/TestSerializationViaByteBuffer.java @@ -1,8 +1,10 @@ package org.roaringbitmap; import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -11,7 +13,6 @@ import java.nio.ByteOrder; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.UUID; import static java.nio.channels.FileChannel.MapMode.READ_WRITE; @@ -24,20 +25,19 @@ @RunWith(Parameterized.class) public class TestSerializationViaByteBuffer { - private static Path dir; + private Path dir; - @BeforeClass - public static void setup() throws IOException { - dir = Paths.get(System.getProperty("user.dir")).resolve("target").resolve(UUID.randomUUID().toString()); - Files.createDirectory(dir); + @Rule + public final TemporaryFolder tf = new TemporaryFolder(); + + @Before + public void setUp() throws IOException { + dir = tf.newFolder().toPath(); } @AfterClass - public static void cleanup() throws IOException { + public static void cleanup() { System.gc(); - try { - Files.walkFileTree(dir, new DirectoryCleanup()); - } catch (IOException e) { } } @Parameterized.Parameters(name = "{1}/{0} keys/runOptimise={2}") @@ -200,4 +200,4 @@ public void testSerializeToByteBufferDeserializeByteBuffer() throws IOException roundtrip.deserialize(buffer); assertEquals(input, roundtrip); } -} \ No newline at end of file +} diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestSerializedSize.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestSerializedSize.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestSerializedSize.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestSerializedSize.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestUtil.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestUtil.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestUtil.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestUtil.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/TestVeryLargeBitmap.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestVeryLargeBitmap.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/TestVeryLargeBitmap.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/TestVeryLargeBitmap.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/UnorderedRoaringBitmapWriterRandomisedTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/UnorderedRoaringBitmapWriterRandomisedTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/UnorderedRoaringBitmapWriterRandomisedTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/UnorderedRoaringBitmapWriterRandomisedTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/BufferContainerBatchIteratorTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/BufferContainerBatchIteratorTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/BufferContainerBatchIteratorTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/BufferContainerBatchIteratorTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/BufferParallelAggregationTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/BufferParallelAggregationTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/BufferParallelAggregationTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/BufferParallelAggregationTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/CloneBatchIteratorTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/CloneBatchIteratorTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/CloneBatchIteratorTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/CloneBatchIteratorTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/ImmutableRoaringBitmapBatchIteratorTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/ImmutableRoaringBitmapBatchIteratorTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/ImmutableRoaringBitmapBatchIteratorTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/ImmutableRoaringBitmapBatchIteratorTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/MutableRoaringArrayTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/MutableRoaringArrayTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/MutableRoaringArrayTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/MutableRoaringArrayTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/MutableRoaringBitmapSubsetTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/MutableRoaringBitmapSubsetTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/MutableRoaringBitmapSubsetTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/MutableRoaringBitmapSubsetTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/RoaringBitmapIntervalIntersectionTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/RoaringBitmapIntervalIntersectionTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/RoaringBitmapIntervalIntersectionTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/RoaringBitmapIntervalIntersectionTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestAdversarialInputs.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestAdversarialInputs.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestAdversarialInputs.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestAdversarialInputs.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestBitSetUtil.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestBitSetUtil.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestBitSetUtil.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestBitSetUtil.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestBufferRangeCardinality.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestBufferRangeCardinality.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestBufferRangeCardinality.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestBufferRangeCardinality.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestCompressionRates.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestCompressionRates.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestCompressionRates.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestCompressionRates.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestContainer.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestContainer.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestContainer.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestContainer.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestExamples.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestExamples.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestExamples.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestExamples.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestFastAggregation.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestFastAggregation.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestFastAggregation.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestFastAggregation.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestForEach.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestForEach.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestForEach.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestForEach.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestImmutableRoaringBitmap.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestImmutableRoaringBitmap.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestImmutableRoaringBitmap.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestImmutableRoaringBitmap.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestIntIteratorFlyweight.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestIntIteratorFlyweight.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestIntIteratorFlyweight.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestIntIteratorFlyweight.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestIterators.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestIterators.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestIterators.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestIterators.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableArrayContainer.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableArrayContainer.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableArrayContainer.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableArrayContainer.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableBitmapContainer.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableBitmapContainer.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableBitmapContainer.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableBitmapContainer.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableBitmapContainerShortIterator.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableBitmapContainerShortIterator.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableBitmapContainerShortIterator.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableBitmapContainerShortIterator.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableRunContainer.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableRunContainer.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableRunContainer.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestMappeableRunContainer.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestMemory.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestMemory.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestMemory.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestMemory.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestMemoryMapping.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestMemoryMapping.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestMemoryMapping.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestMemoryMapping.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestRange.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestRange.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestRange.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestRange.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestReverseMappeableRunContainer.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestReverseMappeableRunContainer.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestReverseMappeableRunContainer.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestReverseMappeableRunContainer.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestRoaringBitmap.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestRoaringBitmap.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestRoaringBitmap.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestRoaringBitmap.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestRunContainer.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestRunContainer.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestRunContainer.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestRunContainer.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestSerializationViaByteBuffer.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestSerializationViaByteBuffer.java similarity index 94% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestSerializationViaByteBuffer.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestSerializationViaByteBuffer.java index ae957b00a..b7f0c8321 100644 --- a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestSerializationViaByteBuffer.java +++ b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestSerializationViaByteBuffer.java @@ -1,11 +1,12 @@ package org.roaringbitmap.buffer; import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.roaringbitmap.DirectoryCleanup; import org.roaringbitmap.SeededTestData; import java.io.*; @@ -14,7 +15,6 @@ import java.nio.channels.FileChannel; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.UUID; import static java.nio.channels.FileChannel.MapMode.READ_WRITE; @@ -24,20 +24,19 @@ @RunWith(Parameterized.class) public class TestSerializationViaByteBuffer { - private static Path dir; + private Path dir; - @BeforeClass - public static void setup() throws IOException { - dir = Paths.get(System.getProperty("user.dir")).resolve("target").resolve(UUID.randomUUID().toString()); - Files.createDirectory(dir); + @Rule + public final TemporaryFolder tf = new TemporaryFolder(); + + @Before + public void setUp() throws IOException { + dir = tf.newFolder().toPath(); } @AfterClass - public static void cleanup() throws IOException { + public static void cleanup() { System.gc(); - try { - Files.walkFileTree(dir, new DirectoryCleanup()); - } catch (IOException e) { } } @Parameterized.Parameters(name = "{1}/{0} keys/runOptimise={2}") diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestSerializedSize.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestSerializedSize.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestSerializedSize.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestSerializedSize.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestUtil.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestUtil.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestUtil.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestUtil.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestVeryLargeBitmap.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestVeryLargeBitmap.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/buffer/TestVeryLargeBitmap.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestVeryLargeBitmap.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/insights/BitmapAnalyserTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/insights/BitmapAnalyserTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/insights/BitmapAnalyserTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/insights/BitmapAnalyserTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/insights/BitmapStatisticsTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/insights/BitmapStatisticsTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/insights/BitmapStatisticsTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/insights/BitmapStatisticsTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/insights/NaiveWriterRecommenderTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/insights/NaiveWriterRecommenderTest.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/insights/NaiveWriterRecommenderTest.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/insights/NaiveWriterRecommenderTest.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/longlong/Issue319.java b/RoaringBitmap/src/test/java/org/roaringbitmap/longlong/Issue319.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/longlong/Issue319.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/longlong/Issue319.java diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/longlong/TestRoaring64NavigableMap.java b/RoaringBitmap/src/test/java/org/roaringbitmap/longlong/TestRoaring64NavigableMap.java similarity index 100% rename from roaringbitmap/src/test/java/org/roaringbitmap/longlong/TestRoaring64NavigableMap.java rename to RoaringBitmap/src/test/java/org/roaringbitmap/longlong/TestRoaring64NavigableMap.java diff --git a/roaringbitmap/src/test/resources/testdata/bitmapwithoutruns.bin b/RoaringBitmap/src/test/resources/testdata/bitmapwithoutruns.bin similarity index 100% rename from roaringbitmap/src/test/resources/testdata/bitmapwithoutruns.bin rename to RoaringBitmap/src/test/resources/testdata/bitmapwithoutruns.bin diff --git a/roaringbitmap/src/test/resources/testdata/bitmapwithruns.bin b/RoaringBitmap/src/test/resources/testdata/bitmapwithruns.bin similarity index 100% rename from roaringbitmap/src/test/resources/testdata/bitmapwithruns.bin rename to RoaringBitmap/src/test/resources/testdata/bitmapwithruns.bin diff --git a/roaringbitmap/src/test/resources/testdata/crashproneinput1.bin b/RoaringBitmap/src/test/resources/testdata/crashproneinput1.bin similarity index 100% rename from roaringbitmap/src/test/resources/testdata/crashproneinput1.bin rename to RoaringBitmap/src/test/resources/testdata/crashproneinput1.bin diff --git a/roaringbitmap/src/test/resources/testdata/crashproneinput2.bin b/RoaringBitmap/src/test/resources/testdata/crashproneinput2.bin similarity index 100% rename from roaringbitmap/src/test/resources/testdata/crashproneinput2.bin rename to RoaringBitmap/src/test/resources/testdata/crashproneinput2.bin diff --git a/roaringbitmap/src/test/resources/testdata/crashproneinput3.bin b/RoaringBitmap/src/test/resources/testdata/crashproneinput3.bin similarity index 100% rename from roaringbitmap/src/test/resources/testdata/crashproneinput3.bin rename to RoaringBitmap/src/test/resources/testdata/crashproneinput3.bin diff --git a/roaringbitmap/src/test/resources/testdata/crashproneinput4.bin b/RoaringBitmap/src/test/resources/testdata/crashproneinput4.bin similarity index 100% rename from roaringbitmap/src/test/resources/testdata/crashproneinput4.bin rename to RoaringBitmap/src/test/resources/testdata/crashproneinput4.bin diff --git a/roaringbitmap/src/test/resources/testdata/crashproneinput5.bin b/RoaringBitmap/src/test/resources/testdata/crashproneinput5.bin similarity index 100% rename from roaringbitmap/src/test/resources/testdata/crashproneinput5.bin rename to RoaringBitmap/src/test/resources/testdata/crashproneinput5.bin diff --git a/roaringbitmap/src/test/resources/testdata/crashproneinput6.bin b/RoaringBitmap/src/test/resources/testdata/crashproneinput6.bin similarity index 100% rename from roaringbitmap/src/test/resources/testdata/crashproneinput6.bin rename to RoaringBitmap/src/test/resources/testdata/crashproneinput6.bin diff --git a/roaringbitmap/src/test/resources/testdata/crashproneinput7.bin b/RoaringBitmap/src/test/resources/testdata/crashproneinput7.bin similarity index 100% rename from roaringbitmap/src/test/resources/testdata/crashproneinput7.bin rename to RoaringBitmap/src/test/resources/testdata/crashproneinput7.bin diff --git a/roaringbitmap/src/test/resources/testdata/crashproneinput8.bin b/RoaringBitmap/src/test/resources/testdata/crashproneinput8.bin similarity index 100% rename from roaringbitmap/src/test/resources/testdata/crashproneinput8.bin rename to RoaringBitmap/src/test/resources/testdata/crashproneinput8.bin diff --git a/roaringbitmap/src/test/resources/testdata/offset_failure_case_1.txt b/RoaringBitmap/src/test/resources/testdata/offset_failure_case_1.txt similarity index 100% rename from roaringbitmap/src/test/resources/testdata/offset_failure_case_1.txt rename to RoaringBitmap/src/test/resources/testdata/offset_failure_case_1.txt diff --git a/roaringbitmap/src/test/resources/testdata/offset_failure_case_2.txt b/RoaringBitmap/src/test/resources/testdata/offset_failure_case_2.txt similarity index 100% rename from roaringbitmap/src/test/resources/testdata/offset_failure_case_2.txt rename to RoaringBitmap/src/test/resources/testdata/offset_failure_case_2.txt diff --git a/roaringbitmap/src/test/resources/testdata/offset_failure_case_3.txt b/RoaringBitmap/src/test/resources/testdata/offset_failure_case_3.txt similarity index 100% rename from roaringbitmap/src/test/resources/testdata/offset_failure_case_3.txt rename to RoaringBitmap/src/test/resources/testdata/offset_failure_case_3.txt diff --git a/roaringbitmap/src/test/resources/testdata/testIssue260.txt b/RoaringBitmap/src/test/resources/testdata/testIssue260.txt similarity index 100% rename from roaringbitmap/src/test/resources/testdata/testIssue260.txt rename to RoaringBitmap/src/test/resources/testdata/testIssue260.txt diff --git a/roaringbitmap/style/eclipse-java-google-style.xml b/RoaringBitmap/style/eclipse-java-google-style.xml similarity index 100% rename from roaringbitmap/style/eclipse-java-google-style.xml rename to RoaringBitmap/style/eclipse-java-google-style.xml diff --git a/roaringbitmap/style/roaring_google_checks.xml b/RoaringBitmap/style/roaring_google_checks.xml similarity index 100% rename from roaringbitmap/style/roaring_google_checks.xml rename to RoaringBitmap/style/roaring_google_checks.xml diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..0529d608a --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,168 @@ +import com.jfrog.bintray.gradle.BintrayExtension + +plugins { + id("net.researchgate.release") version "2.8.0" + id("com.jfrog.bintray") version "1.8.4" apply false + id("com.github.kt3k.coveralls") version "2.8.4" apply false +} + +// some parts of the Kotlin DSL don't work inside a `subprojects` block yet, so we do them the old way +// (without typesafe accessors) + +subprojects { + // used in per-subproject dependencies + @Suppress("UNUSED_VARIABLE") val deps by extra { + mapOf( + "junit" to "4.12", + "guava" to "20.0", + "commons-lang" to "3.4" + ) + } + + apply(plugin = "java-library") + apply(plugin = "jacoco") + apply(plugin = "com.github.kt3k.coveralls") + + repositories { + jcenter() + } + + tasks.withType { + options.isDeprecation = true + options.isWarnings = true + } + + configure { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + group = "org.roaringbitmap" + } + + tasks.named("jacocoTestReport") { + reports { + // used by coveralls + xml.isEnabled = true + } + } +} + +subprojects.filter { !listOf("jmh", "fuzz-tests", "examples", "simplebenchmark").contains(it.name) }.forEach { + it.run { + apply(plugin = "checkstyle") + + tasks.withType { + configFile = File(rootProject.projectDir, "RoaringBitmap/style/roaring_google_checks.xml") + isIgnoreFailures = false + isShowViolations = true + } + + // don't checkstyle source + tasks.named("checkstyleTest") { + exclude("**/**") + } + } +} + +subprojects.filter { listOf("RoaringBitmap", "shims").contains(it.name) }.forEach { project -> + project.run { + apply(plugin = "maven-publish") + apply(plugin = "com.jfrog.bintray") + + tasks { + register("sourceJar") { + from(project.the()["main"].allJava) + archiveClassifier.set("sources") + } + + register("docJar") { + from(project.tasks["javadoc"]) + archiveClassifier.set("javadoc") + } + } + + configure() { + publications { + register("bintray") { + groupId = project.group.toString() + artifactId = project.name + version = project.version.toString() + + from(components["java"]) + artifact(tasks["sourceJar"]) + artifact(tasks["docJar"]) + + // requirements for maven central + // https://central.sonatype.org/pages/requirements.html + pom { + name.set("${project.group}:${project.name}") + description.set("Roaring bitmaps are compressed bitmaps (also called bitsets) which tend to outperform conventional compressed bitmaps such as WAH or Concise.") + url.set("https://github.com/RoaringBitmap/RoaringBitmap") + issueManagement { + system.set("GitHub Issue Tracking") + url.set("https://github.com/RoaringBitmap/RoaringBitmap/issues") + } + licenses { + license { + name.set("Apache 2") + url.set("http://www.apache.org/licenses/LICENSE-2.0.txt") + distribution.set("repo") + } + } + developers { + developer { + id.set("lemire") + name.set("Daniel Lemire") + email.set("lemire@gmail.com") + url.set("http://lemire.me/en/") + roles.addAll("architect", "developer", "maintainer") + timezone.set("-5") + properties.put("picUrl", "http://lemire.me/fr/images/JPG/profile2011B_152.jpg") + } + } + scm { + connection.set("scm:git:https://github.com/RoaringBitmap/RoaringBitmap.git") + developerConnection.set("scm:git:https://github.com/RoaringBitmap/RoaringBitmap.git") + url.set("https://github.com/RoaringBitmap/RoaringBitmap") + } + } + } + } + } + + configure { + user = rootProject.findProperty("bintrayUser")?.toString() + key = rootProject.findProperty("bintrayApiKey")?.toString() + setPublications("bintray") + + with(pkg) { + repo = "maven" + setLicenses("Apache-2.0") + vcsUrl = "https://github.com/RoaringBitmap/RoaringBitmap" + // use "bintray package per artifact" to match the auto-gen'd pkg structure inherited from + // Maven Central's artifacts + name = "org.roaringbitmap:${project.name}" + userOrg = "roaringbitmap" + + with(version) { + name = project.version.toString() + released = java.util.Date().toString() + vcsTag = "RoaringBitmap-${project.version}" + } + } + } + } +} + +tasks { + create("build") { + // dummy build task to appease release plugin + } +} + +release { + tagTemplate = "RoaringBitmap-\$version" +} + +tasks.afterReleaseBuild { + dependsOn(tasks.named("bintrayUpload")) +} diff --git a/examples/README.md b/examples/README.md new file mode 100644 index 000000000..e8dba7cb0 --- /dev/null +++ b/examples/README.md @@ -0,0 +1,11 @@ +From the root dir, run: + +``` +./gradlew :examples:runAll +``` + +Or see tasks to run each one individually: + +``` +./gradlew :examples:tasks --all +``` diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts new file mode 100644 index 000000000..27402af6a --- /dev/null +++ b/examples/build.gradle.kts @@ -0,0 +1,18 @@ +dependencies { + implementation(project(":RoaringBitmap")) +} + +tasks { + val runAll by registering {} + + File(project.projectDir, "src/main/java").list().forEach { + val className = it.replace(".java", "") + val childTask = project.tasks.create("runExample$className", JavaExec::class) { + main = className + classpath = sourceSets.main.get().runtimeClasspath + dependsOn(compileJava) + } + + runAll.get().dependsOn(childTask) + } +} diff --git a/examples/run.sh b/examples/run.sh deleted file mode 100755 index 131561a88..000000000 --- a/examples/run.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" - -set -e -function cleanup { - echo "Something is wrong." -} -trap cleanup ERR - -cd $SCRIPTPATH/.. && mvn -Dcheckstyle.skip=true -Dmaven.test.skip=true -Dmaven.javadoc.skip=true package && cd $SCRIPTPATH - -ROARINGPATH=$SCRIPTPATH"/../roaringbitmap/target/*":$SCRIPTPATH"/../shims/target/*" -for filename in *.java; do - nonext="${filename%.*}" - echo $nonext - javac -cp "$ROARINGPATH" $filename && java -cp $ROARINGPATH:. $nonext - echo -done -echo "Everything works." diff --git a/examples/Basic.java b/examples/src/main/java/Basic.java similarity index 100% rename from examples/Basic.java rename to examples/src/main/java/Basic.java diff --git a/examples/Bitmap64.java b/examples/src/main/java/Bitmap64.java similarity index 100% rename from examples/Bitmap64.java rename to examples/src/main/java/Bitmap64.java diff --git a/examples/CompressionResults.java b/examples/src/main/java/CompressionResults.java similarity index 100% rename from examples/CompressionResults.java rename to examples/src/main/java/CompressionResults.java diff --git a/examples/ForEachExample.java b/examples/src/main/java/ForEachExample.java similarity index 100% rename from examples/ForEachExample.java rename to examples/src/main/java/ForEachExample.java diff --git a/examples/ImmutableRoaringBitmapExample.java b/examples/src/main/java/ImmutableRoaringBitmapExample.java similarity index 100% rename from examples/ImmutableRoaringBitmapExample.java rename to examples/src/main/java/ImmutableRoaringBitmapExample.java diff --git a/examples/IntervalCheck.java b/examples/src/main/java/IntervalCheck.java similarity index 100% rename from examples/IntervalCheck.java rename to examples/src/main/java/IntervalCheck.java diff --git a/examples/MemoryMappingExample.java b/examples/src/main/java/MemoryMappingExample.java similarity index 100% rename from examples/MemoryMappingExample.java rename to examples/src/main/java/MemoryMappingExample.java diff --git a/examples/PagedIterator.java b/examples/src/main/java/PagedIterator.java similarity index 100% rename from examples/PagedIterator.java rename to examples/src/main/java/PagedIterator.java diff --git a/examples/SerializeToByteArrayExample.java b/examples/src/main/java/SerializeToByteArrayExample.java similarity index 100% rename from examples/SerializeToByteArrayExample.java rename to examples/src/main/java/SerializeToByteArrayExample.java diff --git a/examples/SerializeToByteBufferExample.java b/examples/src/main/java/SerializeToByteBufferExample.java similarity index 100% rename from examples/SerializeToByteBufferExample.java rename to examples/src/main/java/SerializeToByteBufferExample.java diff --git a/examples/SerializeToDiskExample.java b/examples/src/main/java/SerializeToDiskExample.java similarity index 100% rename from examples/SerializeToDiskExample.java rename to examples/src/main/java/SerializeToDiskExample.java diff --git a/examples/SerializeToStringExample.java b/examples/src/main/java/SerializeToStringExample.java similarity index 100% rename from examples/SerializeToStringExample.java rename to examples/src/main/java/SerializeToStringExample.java diff --git a/examples/VeryLargeBitmap.java b/examples/src/main/java/VeryLargeBitmap.java similarity index 100% rename from examples/VeryLargeBitmap.java rename to examples/src/main/java/VeryLargeBitmap.java diff --git a/fuzz-tests/build.gradle.kts b/fuzz-tests/build.gradle.kts new file mode 100644 index 000000000..dab7b6c0b --- /dev/null +++ b/fuzz-tests/build.gradle.kts @@ -0,0 +1,15 @@ +val deps: Map by extra + +dependencies { + implementation(project(":RoaringBitmap")) + testImplementation("junit:junit:${deps["junit"]}") + testImplementation("com.google.guava:guava:${deps["guava"]}") + testImplementation("com.fasterxml.jackson.core:jackson-databind:2.9.9") +} + +tasks.test { + // set the property on the CLI with -P or add to gradle.properties to enable tests + if (!project.hasProperty("roaringbitmap.fuzz-tests")) { + exclude("**") + } +} diff --git a/fuzz-tests/pom.xml b/fuzz-tests/pom.xml deleted file mode 100644 index 95d69e6f7..000000000 --- a/fuzz-tests/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - RoaringBitmapParent - org.roaringbitmap - 0.8.7-SNAPSHOT - - 4.0.0 - - fuzz-tests - - - - true - true - true - - ${basedir}/../roaringbitmap/style/roaring_google_checks.xml - - - - - junit - junit - 4.12 - - - - org.roaringbitmap - RoaringBitmap - ${project.version} - - - - com.google.guava - guava - - - - com.fasterxml.jackson.core - jackson-databind - 2.9.9 - - - - - - - fuzz-test - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.0 - - ${javac.target} - ${javac.release} - true - true - true - true - true - true - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.version} - - * - false - 1 - false - -Xmx2g ${argLine} - - - - - - - - - diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..3c9779f0f --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +version = 0.8.10-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..5c2d1cf01 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..f4d7b2bf6 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..b0d6d0ab5 --- /dev/null +++ b/gradlew @@ -0,0 +1,188 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..9991c5032 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/jmh/build.gradle.kts b/jmh/build.gradle.kts new file mode 100644 index 000000000..1a3cc9a96 --- /dev/null +++ b/jmh/build.gradle.kts @@ -0,0 +1,76 @@ +import java.net.URI + +plugins { + id("me.champeau.gradle.jmh") version "0.4.8" + id("com.github.johnrengelman.shadow") version "5.0.0" +} + +val deps: Map by extra + +repositories { + maven { + url = URI("https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local") + } +} + +dependencies { + jmh(project(":real-roaring-dataset")) + jmh("junit:junit:${deps["junit"]}") + + // tests and benchmarks both need dependencies: javaEWAH, extendedset, etc. + listOf( + project(":RoaringBitmap"), + "com.google.guava:guava:${deps["guava"]}", + "com.googlecode.javaewah:JavaEWAH:1.0.8", + "it.uniroma3.mat:extendedset:1.3.4", + "com.zaxxer:SparseBitSet:1.0", + "me.lemire.integercompression:JavaFastPFOR:0.1.11" + ).forEach { + jmh(it) + testRuntime(it) + } + + testImplementation(project(":real-roaring-dataset")) + testImplementation("com.google.guava:guava:${deps["guava"]}") + testImplementation("junit:junit:${deps["junit"]}") + + // tests run benchmark classes, so need to depend on benchmark compile output + testImplementation(sourceSets.jmh.get().output) +} + +jmh { + jmhVersion = "1.21" + // tests depend on jmh, not the other way around + isIncludeTests = false + warmupIterations = 5 + iterations = 5 + fork = 1 +} + +tasks.assemble { + dependsOn(tasks.shadowJar) +} + + +// jmhJar task provided by jmh gradle plugin is currently broken +// https://github.com/melix/jmh-gradle-plugin/issues/97 +// so instead, we configure the shadowJar task to have JMH bits in it +tasks.shadowJar { + archiveBaseName.set("benchmarks") + archiveClassifier.set("") + + manifest { + attributes(Pair("Main-Class", "org.openjdk.jmh.Main")) + } + + // include dependencies + configurations.add(project.configurations.jmh.get()) + // include benchmark classes + from(project.sourceSets.jmh.get().output) + // include generated java source, BenchmarkList and other JMH resources + from(tasks.jmhRunBytecodeGenerator.get().outputs) + // include compiled generated classes + from(tasks.jmhCompileGeneratedClasses.get().outputs) + + dependsOn(tasks.jmhCompileGeneratedClasses) +} diff --git a/jmh/pom.xml b/jmh/pom.xml deleted file mode 100644 index da53de8b1..000000000 --- a/jmh/pom.xml +++ /dev/null @@ -1,154 +0,0 @@ - - 4.0.0 - - - org.roaringbitmap - RoaringBitmapParent - 0.8.7-SNAPSHOT - - jmh - jar - - JMH benchmark : RoaringBitmap - - - - org.openjdk.jmh - jmh-core - ${jmh.version} - - - org.openjdk.jmh - jmh-generator-annprocess - ${jmh.version} - provided - - - com.googlecode.javaewah - JavaEWAH - [1.0.8,) - - - it.uniroma3.mat - extendedset - 1.3.4 - - - org.roaringbitmap - RoaringBitmap - ${project.version} - - - org.roaringbitmap - real-roaring-dataset - ${project.version} - - - org.apache.commons - commons-math3 - 3.6.1 - - - com.zaxxer - SparseBitSet - 1.0 - - - me.lemire.integercompression - JavaFastPFOR - 0.1.11 - - - junit - junit - compile - - - com.google.guava - guava - - - - - - true - true - - 1.21 - benchmarks - - - - true - - ${basedir}/../roaringbitmap/style/roaring_google_checks.xml - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - 1 - false - -Xms2g -Xmx4g - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.3 - - - package - - shade - - - ${uberjar.name} - - - org.openjdk.jmh.Main - - true - - - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - - - - - pub-libs - pub-libs-local - https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local - - - - - - release - - true - - - - diff --git a/jmh/run.sh b/jmh/run.sh index 68ec56444..a47b66360 100755 --- a/jmh/run.sh +++ b/jmh/run.sh @@ -1,5 +1,9 @@ #!/bin/bash + +set -e + BASEDIR=$(dirname $0) +echo $BASEDIR CLEAN="" if [[ "$1" = "-clean" ]]; then @@ -10,27 +14,11 @@ fi echo "Building RoaringBitmap jar" if [[ "$CLEAN" = "clean" ]]; then - rm -f $BASEDIR/../target/RoaringBitmap*.jar -fi -mvn -f $BASEDIR/../pom.xml $CLEAN install -DskipTests -Dgpg.skip=true -Dcheckstyle.skip - -[[ $? -eq 0 ]] || exit - -echo "Building Real Roaring Dataset jar" -if [[ "$CLEAN" = "clean" ]]; then - rm -f $BASEDIR/../real-roaring-dataset/target/real-roaring-dataset*.jar + $BASEDIR/../gradlew clean fi -mvn -f $BASEDIR/../real-roaring-dataset/pom.xml $CLEAN install - -[[ $? -eq 0 ]] || exit echo "Building benchmarks jar" -if [[ "$CLEAN" = "clean" ]]; then - rm -f $BASEDIR/target/benchmarks.jar -fi -mvn -f $BASEDIR/pom.xml $CLEAN install -Dtest=*${@:$#}* -DfailIfNoTests=false -Dcheckstyle.skip - -[[ $? -eq 0 ]] || exit +$BASEDIR/../gradlew shadowJar echo "Running benchmarks" -java -jar $BASEDIR/target/benchmarks.jar true -wi 5 -i 5 -f 1 $@ +java -jar $BASEDIR/build/libs/benchmarks.jar true -wi 5 -i 5 -f 1 $@ diff --git a/jmh/src/main/java/org/roaringbitmap/AbstractBenchmarkState.java b/jmh/src/jmh/java/org/roaringbitmap/AbstractBenchmarkState.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/AbstractBenchmarkState.java rename to jmh/src/jmh/java/org/roaringbitmap/AbstractBenchmarkState.java diff --git a/jmh/src/main/java/org/roaringbitmap/BasicBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/BasicBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/BasicBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/BasicBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/BitSetUtilBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/BitSetUtilBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/BitSetUtilBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/BitSetUtilBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/RandomData.java b/jmh/src/jmh/java/org/roaringbitmap/RandomData.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/RandomData.java rename to jmh/src/jmh/java/org/roaringbitmap/RandomData.java diff --git a/jmh/src/main/java/org/roaringbitmap/RangeOperationBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/RangeOperationBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/RangeOperationBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/RangeOperationBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/RoaringOnlyBenchmarkState.java b/jmh/src/jmh/java/org/roaringbitmap/RoaringOnlyBenchmarkState.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/RoaringOnlyBenchmarkState.java rename to jmh/src/jmh/java/org/roaringbitmap/RoaringOnlyBenchmarkState.java diff --git a/jmh/src/main/java/org/roaringbitmap/UtilBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/UtilBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/UtilBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/UtilBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/aggregation/and/bestcase/RoaringBitmapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/aggregation/and/bestcase/RoaringBitmapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/aggregation/and/bestcase/RoaringBitmapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/aggregation/and/bestcase/RoaringBitmapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/aggregation/and/identical/RoaringBitmapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/aggregation/and/identical/RoaringBitmapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/aggregation/and/identical/RoaringBitmapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/aggregation/and/identical/RoaringBitmapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/aggregation/and/worstcase/RoaringBitmapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/aggregation/and/worstcase/RoaringBitmapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/aggregation/and/worstcase/RoaringBitmapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/aggregation/and/worstcase/RoaringBitmapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/aggregation/andnot/bestcase/RoaringBitmapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/aggregation/andnot/bestcase/RoaringBitmapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/aggregation/andnot/bestcase/RoaringBitmapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/aggregation/andnot/bestcase/RoaringBitmapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/aggregation/andnot/identical/RoaringBitmapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/aggregation/andnot/identical/RoaringBitmapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/aggregation/andnot/identical/RoaringBitmapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/aggregation/andnot/identical/RoaringBitmapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/aggregation/andnot/worstcase/RoaringBitmapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/aggregation/andnot/worstcase/RoaringBitmapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/aggregation/andnot/worstcase/RoaringBitmapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/aggregation/andnot/worstcase/RoaringBitmapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/arraycontainer/AddBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/arraycontainer/AddBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/arraycontainer/AddBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/arraycontainer/AddBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/bithacking/SelectBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/bithacking/SelectBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/bithacking/SelectBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/bithacking/SelectBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/bithacking/UnsignedVSFlip.java b/jmh/src/jmh/java/org/roaringbitmap/bithacking/UnsignedVSFlip.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/bithacking/UnsignedVSFlip.java rename to jmh/src/jmh/java/org/roaringbitmap/bithacking/UnsignedVSFlip.java diff --git a/jmh/src/main/java/org/roaringbitmap/buffer/BufferUtilBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/buffer/BufferUtilBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/buffer/BufferUtilBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/buffer/BufferUtilBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/buffer/aggregation/and/bestcase/MutableRoaringBitmapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/buffer/aggregation/and/bestcase/MutableRoaringBitmapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/buffer/aggregation/and/bestcase/MutableRoaringBitmapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/buffer/aggregation/and/bestcase/MutableRoaringBitmapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/buffer/aggregation/and/identical/MutableRoaringBitmapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/buffer/aggregation/and/identical/MutableRoaringBitmapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/buffer/aggregation/and/identical/MutableRoaringBitmapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/buffer/aggregation/and/identical/MutableRoaringBitmapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/buffer/aggregation/and/worstcase/MutableRoaringBitmapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/buffer/aggregation/and/worstcase/MutableRoaringBitmapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/buffer/aggregation/and/worstcase/MutableRoaringBitmapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/buffer/aggregation/and/worstcase/MutableRoaringBitmapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/buffer/aggregation/andnot/bestcase/MutableRoaringBitmapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/buffer/aggregation/andnot/bestcase/MutableRoaringBitmapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/buffer/aggregation/andnot/bestcase/MutableRoaringBitmapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/buffer/aggregation/andnot/bestcase/MutableRoaringBitmapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/buffer/aggregation/andnot/identical/MutableRoaringBitmapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/buffer/aggregation/andnot/identical/MutableRoaringBitmapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/buffer/aggregation/andnot/identical/MutableRoaringBitmapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/buffer/aggregation/andnot/identical/MutableRoaringBitmapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/buffer/aggregation/andnot/worstcase/MutableRoaringBitmapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/buffer/aggregation/andnot/worstcase/MutableRoaringBitmapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/buffer/aggregation/andnot/worstcase/MutableRoaringBitmapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/buffer/aggregation/andnot/worstcase/MutableRoaringBitmapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/cardinality64/Cardinality64Benchmark.java b/jmh/src/jmh/java/org/roaringbitmap/cardinality64/Cardinality64Benchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/cardinality64/Cardinality64Benchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/cardinality64/Cardinality64Benchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/equals/EqualsBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/equals/EqualsBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/equals/EqualsBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/equals/EqualsBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/iteration/BatchIteratorBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/iteration/BatchIteratorBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/iteration/BatchIteratorBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/iteration/BatchIteratorBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/iteration/BitmapIteratorBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/iteration/BitmapIteratorBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/iteration/BitmapIteratorBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/iteration/BitmapIteratorBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/iteration/BitmapNextBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/iteration/BitmapNextBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/iteration/BitmapNextBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/iteration/BitmapNextBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/iteration/Concatenation.java b/jmh/src/jmh/java/org/roaringbitmap/iteration/Concatenation.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/iteration/Concatenation.java rename to jmh/src/jmh/java/org/roaringbitmap/iteration/Concatenation.java diff --git a/jmh/src/main/java/org/roaringbitmap/iteration/IteratorsBenchmark32.java b/jmh/src/jmh/java/org/roaringbitmap/iteration/IteratorsBenchmark32.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/iteration/IteratorsBenchmark32.java rename to jmh/src/jmh/java/org/roaringbitmap/iteration/IteratorsBenchmark32.java diff --git a/jmh/src/main/java/org/roaringbitmap/iteration/IteratorsBenchmark64.java b/jmh/src/jmh/java/org/roaringbitmap/iteration/IteratorsBenchmark64.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/iteration/IteratorsBenchmark64.java rename to jmh/src/jmh/java/org/roaringbitmap/iteration/IteratorsBenchmark64.java diff --git a/jmh/src/main/java/org/roaringbitmap/map/MapBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/map/MapBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/map/MapBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/map/MapBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/needwork/RandomAccess.java b/jmh/src/jmh/java/org/roaringbitmap/needwork/RandomAccess.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/needwork/RandomAccess.java rename to jmh/src/jmh/java/org/roaringbitmap/needwork/RandomAccess.java diff --git a/jmh/src/main/java/org/roaringbitmap/needwork/SlowMappedORaggregate1.java b/jmh/src/jmh/java/org/roaringbitmap/needwork/SlowMappedORaggregate1.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/needwork/SlowMappedORaggregate1.java rename to jmh/src/jmh/java/org/roaringbitmap/needwork/SlowMappedORaggregate1.java diff --git a/jmh/src/main/java/org/roaringbitmap/needwork/SlowMappedORaggregate2.java b/jmh/src/jmh/java/org/roaringbitmap/needwork/SlowMappedORaggregate2.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/needwork/SlowMappedORaggregate2.java rename to jmh/src/jmh/java/org/roaringbitmap/needwork/SlowMappedORaggregate2.java diff --git a/jmh/src/main/java/org/roaringbitmap/needwork/SlowORaggregate1.java b/jmh/src/jmh/java/org/roaringbitmap/needwork/SlowORaggregate1.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/needwork/SlowORaggregate1.java rename to jmh/src/jmh/java/org/roaringbitmap/needwork/SlowORaggregate1.java diff --git a/jmh/src/main/java/org/roaringbitmap/needwork/SlowORaggregate2.java b/jmh/src/jmh/java/org/roaringbitmap/needwork/SlowORaggregate2.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/needwork/SlowORaggregate2.java rename to jmh/src/jmh/java/org/roaringbitmap/needwork/SlowORaggregate2.java diff --git a/jmh/src/main/java/org/roaringbitmap/needwork/SlowORaggregate3.java b/jmh/src/jmh/java/org/roaringbitmap/needwork/SlowORaggregate3.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/needwork/SlowORaggregate3.java rename to jmh/src/jmh/java/org/roaringbitmap/needwork/SlowORaggregate3.java diff --git a/jmh/src/main/java/org/roaringbitmap/needwork/state/NeedWorkBenchmarkState.java b/jmh/src/jmh/java/org/roaringbitmap/needwork/state/NeedWorkBenchmarkState.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/needwork/state/NeedWorkBenchmarkState.java rename to jmh/src/jmh/java/org/roaringbitmap/needwork/state/NeedWorkBenchmarkState.java diff --git a/jmh/src/main/java/org/roaringbitmap/range/ContainsRange.java b/jmh/src/jmh/java/org/roaringbitmap/range/ContainsRange.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/range/ContainsRange.java rename to jmh/src/jmh/java/org/roaringbitmap/range/ContainsRange.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/ParallelAggregatorBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/ParallelAggregatorBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/ParallelAggregatorBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/ParallelAggregatorBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkAnd.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkAnd.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkAnd.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkAnd.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkAndNot.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkAndNot.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkAndNot.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkAndNot.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkCardinality.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkCardinality.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkCardinality.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkCardinality.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkContains.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkContains.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkContains.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkContains.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkForEach.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkForEach.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkForEach.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkForEach.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkIOr.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkIOr.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkIOr.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkIOr.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkInot.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkInot.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkInot.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkInot.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkIterate.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkIterate.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkIterate.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkIterate.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkOr.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkOr.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkOr.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkOr.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkReverseIterate.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkReverseIterate.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkReverseIterate.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkReverseIterate.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkWideAndNaive.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkWideAndNaive.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkWideAndNaive.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkWideAndNaive.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkWideOrNaive.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkWideOrNaive.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkWideOrNaive.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkWideOrNaive.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkWideOrPq.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkWideOrPq.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkWideOrPq.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkWideOrPq.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkXor.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkXor.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataBenchmarkXor.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataBenchmarkXor.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/RealDataSerializationBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataSerializationBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/RealDataSerializationBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/RealDataSerializationBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/state/RealDataBenchmarkState.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/state/RealDataBenchmarkState.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/state/RealDataBenchmarkState.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/state/RealDataBenchmarkState.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/state/RealDataRoaringOnlyBenchmarkState.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/state/RealDataRoaringOnlyBenchmarkState.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/state/RealDataRoaringOnlyBenchmarkState.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/state/RealDataRoaringOnlyBenchmarkState.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/Bitmap.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/Bitmap.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/Bitmap.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/Bitmap.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/BitmapAggregator.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/BitmapAggregator.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/BitmapAggregator.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/BitmapAggregator.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/BitmapFactory.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/BitmapFactory.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/BitmapFactory.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/BitmapFactory.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/BitmapIterator.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/BitmapIterator.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/BitmapIterator.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/BitmapIterator.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/ConciseSetIteratorWrapper.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/ConciseSetIteratorWrapper.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/ConciseSetIteratorWrapper.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/ConciseSetIteratorWrapper.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/ConciseSetWrapper.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/ConciseSetWrapper.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/ConciseSetWrapper.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/ConciseSetWrapper.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/Ewah32BitmapWrapper.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/Ewah32BitmapWrapper.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/Ewah32BitmapWrapper.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/Ewah32BitmapWrapper.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/EwahBitmapWrapper.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/EwahBitmapWrapper.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/EwahBitmapWrapper.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/EwahBitmapWrapper.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/EwahIteratorWrapper.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/EwahIteratorWrapper.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/EwahIteratorWrapper.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/EwahIteratorWrapper.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/ImmutableConciseSetWrapper.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/ImmutableConciseSetWrapper.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/ImmutableConciseSetWrapper.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/ImmutableConciseSetWrapper.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/ImmutableRoaringBitmapWrapper.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/ImmutableRoaringBitmapWrapper.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/ImmutableRoaringBitmapWrapper.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/ImmutableRoaringBitmapWrapper.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/RoaringBitmapWrapper.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/RoaringBitmapWrapper.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/RoaringBitmapWrapper.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/RoaringBitmapWrapper.java diff --git a/jmh/src/main/java/org/roaringbitmap/realdata/wrapper/RoaringIteratorWrapper.java b/jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/RoaringIteratorWrapper.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/realdata/wrapper/RoaringIteratorWrapper.java rename to jmh/src/jmh/java/org/roaringbitmap/realdata/wrapper/RoaringIteratorWrapper.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/AllRunHorizontalOrBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/AllRunHorizontalOrBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/AllRunHorizontalOrBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/AllRunHorizontalOrBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/ArrayContainerAndNotRunContainerBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/ArrayContainerAndNotRunContainerBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/ArrayContainerAndNotRunContainerBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/ArrayContainerAndNotRunContainerBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/BasicAndContainerBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/BasicAndContainerBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/BasicAndContainerBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/BasicAndContainerBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/BasicAndNotContainerBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/BasicAndNotContainerBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/BasicAndNotContainerBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/BasicAndNotContainerBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/BasicHorizontalOrBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/BasicHorizontalOrBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/BasicHorizontalOrBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/BasicHorizontalOrBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/BasicIteratorBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/BasicIteratorBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/BasicIteratorBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/BasicIteratorBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/BasicOrContainerBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/BasicOrContainerBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/BasicOrContainerBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/BasicOrContainerBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/BasicXorContainerBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/BasicXorContainerBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/BasicXorContainerBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/BasicXorContainerBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/BitmapToRuncontainerConversions.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/BitmapToRuncontainerConversions.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/BitmapToRuncontainerConversions.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/BitmapToRuncontainerConversions.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/MappedRunContainerRealDataBenchmarkRunOptimize.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/MappedRunContainerRealDataBenchmarkRunOptimize.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/MappedRunContainerRealDataBenchmarkRunOptimize.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/MappedRunContainerRealDataBenchmarkRunOptimize.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/RandomUtil.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/RandomUtil.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/RandomUtil.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/RandomUtil.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/RunArrayAndBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/RunArrayAndBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/RunArrayAndBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/RunArrayAndBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/RunArrayAndNotBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/RunArrayAndNotBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/RunArrayAndNotBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/RunArrayAndNotBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/RunArrayOrBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/RunArrayOrBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/RunArrayOrBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/RunArrayOrBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/RunArrayXorBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/RunArrayXorBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/RunArrayXorBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/RunArrayXorBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/runcontainer/RunContainerRealDataBenchmarkRunOptimize.java b/jmh/src/jmh/java/org/roaringbitmap/runcontainer/RunContainerRealDataBenchmarkRunOptimize.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/runcontainer/RunContainerRealDataBenchmarkRunOptimize.java rename to jmh/src/jmh/java/org/roaringbitmap/runcontainer/RunContainerRealDataBenchmarkRunOptimize.java diff --git a/jmh/src/main/java/org/roaringbitmap/serialization/SerializationBenchmark.java b/jmh/src/jmh/java/org/roaringbitmap/serialization/SerializationBenchmark.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/serialization/SerializationBenchmark.java rename to jmh/src/jmh/java/org/roaringbitmap/serialization/SerializationBenchmark.java diff --git a/jmh/src/main/java/org/roaringbitmap/spe150271/roaring/RealDataBenchmarkAnd.java b/jmh/src/jmh/java/org/roaringbitmap/spe150271/roaring/RealDataBenchmarkAnd.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/spe150271/roaring/RealDataBenchmarkAnd.java rename to jmh/src/jmh/java/org/roaringbitmap/spe150271/roaring/RealDataBenchmarkAnd.java diff --git a/jmh/src/main/java/org/roaringbitmap/spe150271/roaring/RealDataBenchmarkOr.java b/jmh/src/jmh/java/org/roaringbitmap/spe150271/roaring/RealDataBenchmarkOr.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/spe150271/roaring/RealDataBenchmarkOr.java rename to jmh/src/jmh/java/org/roaringbitmap/spe150271/roaring/RealDataBenchmarkOr.java diff --git a/jmh/src/main/java/org/roaringbitmap/spe150271/roaring/RealDataBenchmarkWideOrNaive.java b/jmh/src/jmh/java/org/roaringbitmap/spe150271/roaring/RealDataBenchmarkWideOrNaive.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/spe150271/roaring/RealDataBenchmarkWideOrNaive.java rename to jmh/src/jmh/java/org/roaringbitmap/spe150271/roaring/RealDataBenchmarkWideOrNaive.java diff --git a/jmh/src/main/java/org/roaringbitmap/spe150271/roaring/state/RealDataBenchmarkState.java b/jmh/src/jmh/java/org/roaringbitmap/spe150271/roaring/state/RealDataBenchmarkState.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/spe150271/roaring/state/RealDataBenchmarkState.java rename to jmh/src/jmh/java/org/roaringbitmap/spe150271/roaring/state/RealDataBenchmarkState.java diff --git a/jmh/src/main/java/org/roaringbitmap/spe150271/runroaring/RealDataBenchmarkAnd.java b/jmh/src/jmh/java/org/roaringbitmap/spe150271/runroaring/RealDataBenchmarkAnd.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/spe150271/runroaring/RealDataBenchmarkAnd.java rename to jmh/src/jmh/java/org/roaringbitmap/spe150271/runroaring/RealDataBenchmarkAnd.java diff --git a/jmh/src/main/java/org/roaringbitmap/spe150271/runroaring/RealDataBenchmarkOr.java b/jmh/src/jmh/java/org/roaringbitmap/spe150271/runroaring/RealDataBenchmarkOr.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/spe150271/runroaring/RealDataBenchmarkOr.java rename to jmh/src/jmh/java/org/roaringbitmap/spe150271/runroaring/RealDataBenchmarkOr.java diff --git a/jmh/src/main/java/org/roaringbitmap/spe150271/runroaring/RealDataBenchmarkWideOrNaive.java b/jmh/src/jmh/java/org/roaringbitmap/spe150271/runroaring/RealDataBenchmarkWideOrNaive.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/spe150271/runroaring/RealDataBenchmarkWideOrNaive.java rename to jmh/src/jmh/java/org/roaringbitmap/spe150271/runroaring/RealDataBenchmarkWideOrNaive.java diff --git a/jmh/src/main/java/org/roaringbitmap/spe150271/runroaring/state/RealDataBenchmarkState.java b/jmh/src/jmh/java/org/roaringbitmap/spe150271/runroaring/state/RealDataBenchmarkState.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/spe150271/runroaring/state/RealDataBenchmarkState.java rename to jmh/src/jmh/java/org/roaringbitmap/spe150271/runroaring/state/RealDataBenchmarkState.java diff --git a/jmh/src/main/java/org/roaringbitmap/writer/WriteSequential.java b/jmh/src/jmh/java/org/roaringbitmap/writer/WriteSequential.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/writer/WriteSequential.java rename to jmh/src/jmh/java/org/roaringbitmap/writer/WriteSequential.java diff --git a/jmh/src/main/java/org/roaringbitmap/writer/WriteUnordered.java b/jmh/src/jmh/java/org/roaringbitmap/writer/WriteUnordered.java similarity index 100% rename from jmh/src/main/java/org/roaringbitmap/writer/WriteUnordered.java rename to jmh/src/jmh/java/org/roaringbitmap/writer/WriteUnordered.java diff --git a/pom.xml b/pom.xml deleted file mode 100644 index bb115650c..000000000 --- a/pom.xml +++ /dev/null @@ -1,342 +0,0 @@ - - 4.0.0 - org.roaringbitmap - RoaringBitmapParent - 0.8.7-SNAPSHOT - - - RoaringBitmapParent - https://github.com/RoaringBitmap/RoaringBitmap - Roaring bitmaps are compressed bitmaps (also called bitsets) which tend to outperform - conventional compressed bitmaps such as WAH or Concise. - - - lemire - Daniel Lemire - lemire@gmail.com - http://lemire.me/en/ - - architect - developer - maintainer - - -5 - - http://lemire.me/fr/images/JPG/profile2011B_152.jpg - - - - - GitHub Issue Tracking - https://github.com/RoaringBitmap/RoaringBitmap/issues - - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - - - pom - - - - roaringbitmap - shims - - - - - release - - - true - - - - - - - - - - - - - - - - sonatype-nexus-staging - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar - - - - - - - - - - allModules - - true - - - - - - - - - real-roaring-dataset - jmh - fuzz-tests - - - - - - UTF-8 - 1.8 - 8 - - - ${basedir}/roaringbitmap/style/roaring_google_checks.xml - 2.19.1 - - - - scm:git:git@github.com:RoaringBitmap/RoaringBitmap.git - scm:git:git@github.com:RoaringBitmap/RoaringBitmap.git - scm:git:git@github.com:RoaringBitmap/RoaringBitmap.git - RoaringBitmap-0.6.61 - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.0 - - ${javac.target} - ${javac.release} - - ${javac.target} - ${javac.target} - true - true - true - true - true - true - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - com.puppycrawl.tools - checkstyle - 8.18 - - - org.apache.maven.plugins - maven-jxr-plugin - 2.5 - - - - ${checkstyle.configLocation} - - false - true - true - true - 0 - warning - - - - ${project.build.sourceDirectory} - - - - checkstyle-check - - check - - compile - - true - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - - - release - - -DBITMAP_TYPES=ROARING_ONLY ${arguments} - RoaringBitmap-@{project.version} - - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - sonatype-nexus-staging - https://oss.sonatype.org/ - true - - - - org.jacoco - jacoco-maven-plugin - 0.8.2 - - - META-INF/** - - - - - prepare-agent - - prepare-agent - - - - - - org.eluder.coveralls - coveralls-maven-plugin - 4.3.0 - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.version} - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - true - lib/ - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.1 - - 8 - - - - - - - - - - junit - junit - 4.12 - test - - - com.google.guava - guava - - 20.0 - - - org.apache.commons - commons-lang3 - 3.4 - - - - - - - org.apache.maven.plugins - maven-jxr-plugin - ${maven-jxr-plugin-version} - - - - diff --git a/real-roaring-dataset/pom.xml b/real-roaring-dataset/pom.xml deleted file mode 100644 index 7e4741b8d..000000000 --- a/real-roaring-dataset/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - 4.0.0 - - - org.roaringbitmap - RoaringBitmapParent - 0.8.7-SNAPSHOT - - - real-roaring-dataset - jar - - Real Roaring Dataset - - - - true - true - true - - ${basedir}/../roaringbitmap/style/roaring_google_checks.xml - - diff --git a/roaringbitmap/pom.xml b/roaringbitmap/pom.xml deleted file mode 100644 index b861b3232..000000000 --- a/roaringbitmap/pom.xml +++ /dev/null @@ -1,109 +0,0 @@ - - 4.0.0 - - - org.roaringbitmap - RoaringBitmapParent - 0.8.7-SNAPSHOT - - RoaringBitmap - RoaringBitmap - https://github.com/RoaringBitmap/RoaringBitmap - Roaring bitmaps are compressed bitmaps (also called bitsets) which tend to outperform - conventional compressed bitmaps such as WAH or Concise. - jar - - - - lemire - Daniel Lemire - lemire@gmail.com - http://lemire.me/en/ - - architect - developer - maintainer - - -5 - - http://lemire.me/fr/images/JPG/profile2011B_152.jpg - - - - - GitHub Issue Tracking - https://github.com/RoaringBitmap/RoaringBitmap/issues - - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - - ${basedir}/style/roaring_google_checks.xml - - - - org.roaringbitmap - shims - ${project.version} - - - junit - junit - - - com.google.guava - guava - test - - - org.apache.commons - commons-lang3 - test - - - com.esotericsoftware - kryo - 5.0.0-RC1 - test - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.10 - - ${basedir} - ${basedir}/style/eclipse-java-google-style.xml - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - 1 - false - -Xmx2g ${argLine} - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - - - - - - - diff --git a/roaringbitmap/src/test/java/org/roaringbitmap/DirectoryCleanup.java b/roaringbitmap/src/test/java/org/roaringbitmap/DirectoryCleanup.java deleted file mode 100644 index 3af2f8d45..000000000 --- a/roaringbitmap/src/test/java/org/roaringbitmap/DirectoryCleanup.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.roaringbitmap; - -import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; - -public class DirectoryCleanup extends SimpleFileVisitor { - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - Files.delete(file); - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException { - Files.delete(file); - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { - Files.delete(dir); - return FileVisitResult.CONTINUE; - } -} diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 000000000..64644893a --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,9 @@ +include( + "RoaringBitmap", + "shims", + "fuzz-tests", + "jmh", + "real-roaring-dataset", + "examples", + "simplebenchmark" + ) diff --git a/shims/build.gradle.kts b/shims/build.gradle.kts new file mode 100644 index 000000000..c50ad40fc --- /dev/null +++ b/shims/build.gradle.kts @@ -0,0 +1,28 @@ +// See https://blog.gradle.org/mrjars and https://github.com/melix/mrjar-gradle for more on multi release jars + +sourceSets { + create("java11") { + java { + srcDir("src/java11/main") + } + } +} + +tasks.named("compileJava11Java") { + // Arrays.equals exists since JDK9, but we make it available for 11+ so we can test the shim by using Java 11 + // and the old way by using Java 10, which will compile the new code but not use it.. + sourceCompatibility = "9" + targetCompatibility = "9" +} + +tasks.named("jar") { + into("META-INF/versions/11") { + from(sourceSets.named("java11").get().output) + } + manifest.attributes( + Pair("Multi-Release", "true") + ) + + // normally jar is just main classes but we also have another sourceset + dependsOn(tasks.named("compileJava11Java")) +} diff --git a/shims/pom.xml b/shims/pom.xml deleted file mode 100644 index 664a2034f..000000000 --- a/shims/pom.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - RoaringBitmapParent - org.roaringbitmap - 0.8.7-SNAPSHOT - - 4.0.0 - - shims - jar - - - ${project.parent.basedir}/roaringbitmap/style/roaring_google_checks.xml - ${project.basedir}/src/main/java11 - ${project.build.directory}/classes-java11 - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - compile-java11 - compile - - - - - - - - run - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.1.0 - - - copy-resources - prepare-package - - copy-resources - - - ${project.build.outputDirectory}/META-INF/versions/11 - - - ${java11.build.outputDirectory} - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-antrun-plugin - [1.3,) - - run - - - - - - - - - - - - - - - - diff --git a/shims/src/main/java11/org/roaringbitmap/ArraysShim.java b/shims/src/java11/java/org/roaringbitmap/ArraysShim.java similarity index 100% rename from shims/src/main/java11/org/roaringbitmap/ArraysShim.java rename to shims/src/java11/java/org/roaringbitmap/ArraysShim.java diff --git a/simplebenchmark/README.md b/simplebenchmark/README.md index 40afb0d6b..e2fee1953 100644 --- a/simplebenchmark/README.md +++ b/simplebenchmark/README.md @@ -14,6 +14,11 @@ This little program is an attempt to do this. In under a minute, we get usable b numbers... Under Linux or macOS type: ```bash -mvn -f ../pom.xml package -DskipTests -Dgpg.skip=true -./run.sh +./gradlew :simplebenchmark:runAll +``` + +Or see the list of individual benchmarks: + +```bash +./gradlew :simplebenchmark:tasks --all ``` diff --git a/simplebenchmark/build.gradle.kts b/simplebenchmark/build.gradle.kts new file mode 100644 index 000000000..1e9fe497a --- /dev/null +++ b/simplebenchmark/build.gradle.kts @@ -0,0 +1,23 @@ +dependencies { + implementation(project(":RoaringBitmap")) +} + +tasks { + val runAll by registering {} + + val rootDir = File(rootProject.projectDir, "/real-roaring-dataset/src/main/resources/real-roaring-dataset/") + rootDir.list() + .sorted() + .filter { it.endsWith(".zip") } + .forEach { zipFile -> + val niceName = zipFile.replace(".zip", "") + val childTask = project.tasks.create("runBenchmark${niceName.capitalize()}", JavaExec::class) { + main = "simplebenchmark" + classpath = sourceSets.main.get().runtimeClasspath + dependsOn(compileJava) + args = listOf(File(rootDir, zipFile).toString()) + } + + runAll.get().dependsOn(childTask) + } +} diff --git a/simplebenchmark/run.sh b/simplebenchmark/run.sh deleted file mode 100755 index 126e027f8..000000000 --- a/simplebenchmark/run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/bash -trap 'exit' INT -javac -cp ../target/*:. simplebenchmark.java -echo "# bitspervalue nanotimefor2by2and nanotimefor2by2or nanotimeforwideor nanotimeforcontains (first normal then buffer)" -for file in ../real-roaring-dataset/src/main/resources/real-roaring-dataset/*.zip -do -java -cp ../target/*:. simplebenchmark $file -done diff --git a/simplebenchmark/simplebenchmark.java b/simplebenchmark/src/main/java/simplebenchmark.java similarity index 100% rename from simplebenchmark/simplebenchmark.java rename to simplebenchmark/src/main/java/simplebenchmark.java