Skip to content

Commit 3e7eb0f

Browse files
thomasmuellerthomasmueller
authored
Merge pull request #11 from richardstartin/benchmarks
Benchmarks
2 parents d5eb085 + c69c92b commit 3e7eb0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+663
-407
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
.idea/*
3030

3131
target/*
32-
32+
*/target/*
3333
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
3434
hs_err_pid*
3535
/bin/

‎fastfilter/pom.xml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>fastfilter_java</artifactId>
7+
<groupId>org.fastfilter</groupId>
8+
<version>1.0-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>fastfilter</artifactId>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>junit</groupId>
17+
<artifactId>junit</artifactId>
18+
</dependency>
19+
</dependencies>
20+
21+
22+
<build>
23+
<plugins>
24+
<plugin>
25+
<groupId>org.apache.maven.plugins</groupId>
26+
<artifactId>maven-compiler-plugin</artifactId>
27+
<version>3.6.1</version>
28+
<configuration>
29+
<fork>true</fork>
30+
<source>${maven.compiler.source}</source>
31+
<target>${maven.compiler.target}</target>
32+
<showDeprecation>true</showDeprecation>
33+
<failOnError>true</failOnError>
34+
<showWarnings>true</showWarnings>
35+
<showDeprecation>true</showDeprecation>
36+
</configuration>
37+
</plugin>
38+
39+
<plugin>
40+
<groupId>org.apache.maven.plugins</groupId>
41+
<artifactId>maven-surefire-plugin</artifactId>
42+
<version>${maven.surefire.version}</version>
43+
<configuration>
44+
<includes>*</includes>
45+
<skipTests>false</skipTests>
46+
<forkCount>1</forkCount>
47+
<reuseForks>false</reuseForks>
48+
</configuration>
49+
</plugin>
50+
<plugin>
51+
<!-- mvn org.pitest:pitest-maven:mutationCoverage -->
52+
<groupId>org.pitest</groupId>
53+
<artifactId>pitest-maven</artifactId>
54+
<version>1.4.3</version>
55+
<configuration>
56+
<targetClasses>
57+
<param>org.fastfilter.gcs.Sort</param>
58+
</targetClasses>
59+
<targetTests>
60+
<param>org.fastfilter.gcs.SortTest</param>
61+
</targetTests>
62+
</configuration>
63+
</plugin>
64+
</plugins>
65+
</build>
66+
67+
68+
</project>

src/main/java/org/fastfilter/Filter.java renamed to fastfilter/src/main/java/org/fastfilter/Filter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ default void remove(long key) {
5959
/**
6060
* Get the number of set bits. This should be 0 for an empty filter.
6161
*
62-
* @param the number of set bits, or -1 if unknown
6362
*/
6463
default long cardinality() {
6564
return -1;

src/main/java/org/fastfilter/FilterType.java renamed to fastfilter/src/main/java/org/fastfilter/FilterType.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22

33
import org.fastfilter.bloom.BlockedBloom;
44
import org.fastfilter.bloom.Bloom;
5-
import org.fastfilter.bloom.count.CountingBloom;
6-
import org.fastfilter.bloom.count.SuccinctCountingBlockedBloom;
7-
import org.fastfilter.bloom.count.SuccinctCountingBlockedBloomRanked;
8-
import org.fastfilter.bloom.count.SuccinctCountingBloom;
9-
import org.fastfilter.bloom.count.SuccinctCountingBloomRanked;
5+
import org.fastfilter.bloom.count.*;
106
import org.fastfilter.cuckoo.Cuckoo16;
117
import org.fastfilter.cuckoo.Cuckoo8;
128
import org.fastfilter.cuckoo.CuckooPlus16;

src/main/java/org/fastfilter/bloom/BlockedBloom.java renamed to fastfilter/src/main/java/org/fastfilter/bloom/BlockedBloom.java

File renamed without changes.

src/main/java/org/fastfilter/bloom/Bloom.java renamed to fastfilter/src/main/java/org/fastfilter/bloom/Bloom.java

File renamed without changes.

src/main/java/org/fastfilter/bloom/count/CountingBloom.java renamed to fastfilter/src/main/java/org/fastfilter/bloom/count/CountingBloom.java

File renamed without changes.

src/main/java/org/fastfilter/bloom/count/Select.java renamed to fastfilter/src/main/java/org/fastfilter/bloom/count/Select.java

File renamed without changes.

src/main/java/org/fastfilter/bloom/count/SuccinctCountingBlockedBloom.java renamed to fastfilter/src/main/java/org/fastfilter/bloom/count/SuccinctCountingBlockedBloom.java

File renamed without changes.

src/main/java/org/fastfilter/bloom/count/SuccinctCountingBlockedBloomRanked.java renamed to fastfilter/src/main/java/org/fastfilter/bloom/count/SuccinctCountingBlockedBloomRanked.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public long getBitCount() {
6363
this.seed = Hash.randomSeed();
6464
long bits = (long) entryCount * bitsPerKey;
6565
this.buckets = (int) bits / 64;
66-
int arrayLength = (int) (buckets + 16);
66+
int arrayLength = buckets + 16;
6767
data = new long[arrayLength];
6868
counts = new long[arrayLength];
6969
overflow = new long[100 + arrayLength * 10 / 100];

0 commit comments

Comments
 (0)