Changeset 31207 for other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com

Timestamp:

2016-12-12T15:10:24+13:00 (7 years ago)

Author:

davidb

Message:

And some more tweaking

Location:

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com/google/common/hash

Files:

• BloomFilterAdvanced.java (modified) (2 diffs)
• BloomFilterAdvancedStrategies.java (modified) (4 diffs)

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com/google/common/hash/BloomFilterAdvanced.java

@@ -22 +22 @@
 import com.google.common.base.Objects;
 import com.google.common.base.Predicate;
-import com.google.common.hash.BloomFilterStrategies.BitArray;
+import com.google.common.hash.BloomFilterAdvancedStrategies.BitArray;
 import com.google.common.primitives.SignedBytes;
 import com.google.common.primitives.UnsignedBytes;
@@ -34 +34 @@
 import javax.annotation.Nullable;
 
-import com.google.common.hash.BloomFilter;
+//import com.google.common.hash.BloomFilter;
 
 

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com/google/common/hash/BloomFilterAdvancedStrategies.java

@@ -45 +45 @@
     @Override
     public <T> boolean put(
-        T object, Funnel<? super T> funnel, int numHashFunctions, BloomFilterStrategies.BitArray bits) {
+        T object, Funnel<? super T> funnel, int numHashFunctions, BloomFilterAdvancedStrategies.BitArray bits) {
       long bitSize = bits.bitSize();
       long hash64 = Hashing.murmur3_128().hashObject(object, funnel).asLong();
@@ -65 +65 @@
     @Override
     public <T> boolean mightContain(
-        T object, Funnel<? super T> funnel, int numHashFunctions, BloomFilterStrategies.BitArray bits) {
+        T object, Funnel<? super T> funnel, int numHashFunctions, BloomFilterAdvancedStrategies.BitArray bits) {
       long bitSize = bits.bitSize();
       long hash64 = Hashing.murmur3_128().hashObject(object, funnel).asLong();
@@ -93 +93 @@
     @Override
     public <T> boolean put(
-        T object, Funnel<? super T> funnel, int numHashFunctions, BloomFilterStrategies.BitArray bits) {
+        T object, Funnel<? super T> funnel, int numHashFunctions, BloomFilterAdvancedStrategies.BitArray bits) {
       long bitSize = bits.bitSize();
       byte[] bytes = Hashing.murmur3_128().hashObject(object, funnel).getBytesInternal();
@@ -111 +111 @@
     @Override
     public <T> boolean mightContain(
-        T object, Funnel<? super T> funnel, int numHashFunctions, BloomFilterStrategies.BitArray bits) {
+        T object, Funnel<? super T> funnel, int numHashFunctions, BloomFilterAdvancedStrategies.BitArray bits) {
       long bitSize = bits.bitSize();
       byte[] bytes = Hashing.murmur3_128().hashObject(object, funnel).getBytesInternal();