Index: other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com/google/common/hash/BloomFilterAdvanced.java
===================================================================
--- other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com/google/common/hash/BloomFilterAdvanced.java (revision 31205)
+++ other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com/google/common/hash/BloomFilterAdvanced.java (revision 31206)
@@ -68,5 +68,5 @@
*
Implementations should be collections of pure functions (i.e. stateless).
*/
- interface xxStrategy extends java.io.Serializable {
+ interface Strategy extends java.io.Serializable {
/**
@@ -106,5 +106,5 @@
* The strategy we employ to map an element T to {@code numHashFunctions} bit indexes.
*/
- private final BloomFilter.Strategy strategy;
+ private final Strategy strategy;
/**
@@ -112,5 +112,5 @@
*/
private BloomFilterAdvanced(
- BitArray bits, int numHashFunctions, Funnel super T> funnel, BloomFilter.Strategy strategy) {
+ BitArray bits, int numHashFunctions, Funnel super T> funnel, Strategy strategy) {
checkArgument(numHashFunctions > 0, "numHashFunctions (%s) must be > 0", numHashFunctions);
checkArgument(
@@ -323,5 +323,5 @@
@VisibleForTesting
static BloomFilterAdvanced create(
- Funnel super T> funnel, long expectedInsertions, double fpp, BloomFilter.Strategy strategy) {
+ Funnel super T> funnel, long expectedInsertions, double fpp, Strategy strategy) {
checkNotNull(funnel);
checkArgument(
@@ -447,5 +447,5 @@
final int numHashFunctions;
final Funnel super T> funnel;
- final BloomFilter.Strategy strategy;
+ final Strategy strategy;
SerialForm(BloomFilterAdvanced bf) {
@@ -511,5 +511,5 @@
dataLength = din.readInt();
- BloomFilter.Strategy strategy = BloomFilterAdvancedStrategies.values()[strategyOrdinal];
+ Strategy strategy = BloomFilterAdvancedStrategies.values()[strategyOrdinal];
long[] data = new long[dataLength];
for (int i = 0; i < data.length; i++) {
Index: other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com/google/common/hash/BloomFilterAdvancedStrategies.java
===================================================================
--- other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com/google/common/hash/BloomFilterAdvancedStrategies.java (revision 31205)
+++ other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com/google/common/hash/BloomFilterAdvancedStrategies.java (revision 31206)
@@ -36,5 +36,5 @@
* @author Kurt Alfred Kluever
*/
-enum BloomFilterAdvancedStrategies implements BloomFilter.Strategy {
+enum BloomFilterAdvancedStrategies implements BloomFilterAdvanced.Strategy {
/**
* See "Less Hashing, Same Performance: Building a Better Bloom Filter" by Adam Kirsch and Michael